Inject Apple into things

Change-Id: Ie1a76a811cfbdc03422c45c81c466cc46cfa19ce
Reviewed-on: http://gerrit.dmdirc.com/3243
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/osx_integration/OsxIntegrationModule.java

@@ -22,19 +22,11 @@
 
 package com.dmdirc.addons.osx_integration;
 
-import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 
 import dagger.Module;
-import dagger.Provides;
 
 @Module(injects = DockBounceCommand.class, addsTo = SwingModule.class)
 public class OsxIntegrationModule {
 
-    @Provides
-    public Apple getApple(final SwingController controller) {
-        return controller.getApple();
-    }
-
 }

src/com/dmdirc/addons/ui_swing/Apple.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.events.ClientOpenedEvent;
@@ -46,6 +47,8 @@ import java.util.ArrayList;
 import java.util.EventObject;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
@@ -54,6 +57,7 @@ import javax.swing.UIManager;
 /**
  * Integrate DMDirc with OS X better.
  */
+@Singleton
 public class Apple implements InvocationHandler {
 
     /** Store any addresses that are opened before CLIENT_OPENED. */
@@ -81,8 +85,9 @@ public class Apple implements InvocationHandler {
      * @param serverManager The server manager to use to connect to URLs.
      * @param eventBus      The bus to listen for events on.
      */
+    @Inject
     public Apple(
-            final AggregateConfigProvider configManager,
+            @GlobalConfig final AggregateConfigProvider configManager,
             final ServerManager serverManager,
             final EventBus eventBus) {
         this.configManager = configManager;

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -83,6 +83,8 @@ public class MainFrame extends JFrame implements WindowListener,
     private static final long serialVersionUID = 9;
     /** Focus queue. */
     private final QueuedLinkedHashSet<TextFrame> focusOrder;
+    /** Apple instance. */
+    private final Apple apple;
     /** Swing Controller. */
     private final SwingController controller;
     /** Controller to use to end the program. */
@@ -130,6 +132,7 @@ public class MainFrame extends JFrame implements WindowListener,
      * Creates new form MainFrame.
      *
      * @param controller          Swing controller
+     * @param apple               Apple instance
      * @param windowFactory       The window factory to use to create and listen for windows.
      * @param lifecycleController Controller to use to end the application.
      * @param globalConfig        The config to read settings from.
@@ -138,6 +141,7 @@ public class MainFrame extends JFrame implements WindowListener,
      * @param windowManager       Window management
      */
     public MainFrame(
+            final Apple apple,
             final SwingController controller,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
@@ -147,6 +151,7 @@ public class MainFrame extends JFrame implements WindowListener,
             final WindowManager windowManager) {
         super();
 
+        this.apple = apple;
         this.controller = controller;
         this.windowFactory = windowFactory;
         this.lifecycleController = lifecycleController;
@@ -389,7 +394,8 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Sets the menu bar that this frame will use.
      *
-     * <p>Must be called prior to {@link #initComponents()}.
+     * <p>
+     * Must be called prior to {@link #initComponents()}.
      *
      * @param menuBar The menu bar to use.
      */
@@ -398,7 +404,7 @@ public class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                controller.getApple().setMenuBar(menuBar);
+                apple.setMenuBar(menuBar);
                 setJMenuBar(menuBar);
             }
         });
@@ -407,7 +413,8 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Sets the window manager that this frame will use.
      *
-     * <p>Must be called prior to {@link #initComponents()}.
+     * <p>
+     * Must be called prior to {@link #initComponents()}.
      *
      * @param windowManager The window manager to use.
      */
@@ -418,7 +425,8 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Sets the status bar that will be used.
      *
-     * <p>Must be called prior to {@link #initComponents()}.
+     * <p>
+     * Must be called prior to {@link #initComponents()}.
      *
      * @param statusBar The status bar to be used.
      */

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -155,11 +155,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return pluginManager;
     }
 
-    @Deprecated
-    public Apple getApple() {
-        return apple;
-    }
-
     @Deprecated
     public ColourManager getColourManager() {
         return colourManager;

src/com/dmdirc/addons/ui_swing/components/frames/AppleJFrame.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
 
 import javax.swing.JFrame;
 
@@ -38,14 +38,14 @@ public class AppleJFrame extends JFrame {
     /**
      * Create a new Apple JFrame
      *
+     * @param apple        Apple instance
      * @param parentWindow Main Window
-     * @param controller   Parent swing controller
      */
     public AppleJFrame(
-            final MainFrame parentWindow,
-            final SwingController controller) {
+            final Apple apple,
+            final MainFrame parentWindow) {
         super();
-        controller.getApple().setMenuBar(parentWindow.getJMenuBar());
+        apple.setMenuBar(parentWindow.getJMenuBar());
         setJMenuBar(parentWindow.getJMenuBar());
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -111,6 +111,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     /**
      * Creates a new instance of ActionsManagerDialog.
      *
+     * @param apple             Apple instance
      * @param parentWindow      Parent window
      * @param controller        Parent controller
      * @param config            Config to save dialog state to
@@ -120,14 +121,14 @@ public class ActionsManagerDialog extends StandardDialog implements
      */
     @Inject
     public ActionsManagerDialog(
+            final Apple apple,
             final MainFrame parentWindow,
             final SwingController controller,
             @UserConfig final ConfigProvider config,
             final PrefsComponentFactory compFactory,
             @GlobalConfig final IconManager iconManager,
             final ActionsGroupPanelFactory groupPanelFactory) {
-        super(Apple.isAppleUI()
-                ? new AppleJFrame(parentWindow, controller)
+        super(Apple.isAppleUI() ? new AppleJFrame(apple, parentWindow)
                 : parentWindow, ModalityType.MODELESS);
         this.config = config;
         this.compFactory = compFactory;

src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -27,6 +27,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.QuitWorker;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -119,6 +120,7 @@ public class SwingModule {
     /**
      * Gets the main DMDirc window.
      *
+     * @param apple               Apple instance
      * @param swingController     The controller that will own the frame.
      * @param windowFactory       The window factory to use to create and listen for windows.
      * @param lifecycleController The controller to use to quit the application.
@@ -132,6 +134,7 @@ public class SwingModule {
     @Provides
     @Singleton
     public MainFrame getMainFrame(
+            final Apple apple,
             final SwingController swingController,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
@@ -144,7 +147,8 @@ public class SwingModule {
             @Override
             public MainFrame call() {
                 return new MainFrame(
-                        swingController,
+                        apple,
+                        controller,
                         windowFactory,
                         lifecycleController,
                         globalConfig,