Initial foray into Swing UI DI.

Add a SwingManager to manage the injected content - eventually
this will become the SwingController.

Change-Id: Ie923301c00e0166792326f48beff25b5e59c42fa
Reviewed-on: http://gerrit.dmdirc.com/2913
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -37,6 +37,8 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowEvent;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 import javax.swing.MenuSelectionManager;
@@ -46,6 +48,7 @@ import javax.swing.text.JTextComponent;
 /**
  * Custom event queue to add common functionality to certain components.
  */
+@Singleton
 public class DMDircEventQueue extends EventQueue {
 
     /** Swing Controller. */
@@ -56,6 +59,7 @@ public class DMDircEventQueue extends EventQueue {
      *
      * @param controller Swing controller
      */
+    @Inject
     public DMDircEventQueue(final SwingController controller) {
         super();
 

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

@@ -86,6 +86,8 @@ public class MainFrame extends JFrame implements WindowListener,
     private final SwingController controller;
     /** Controller to use to end the program. */
     private final LifecycleController lifecycleController;
+    /** The window factory to use to create and listen for windows. */
+    private final SwingWindowFactory windowFactory;
     /** Client Version. */
     private final String version;
     /** Frame manager used for ctrl tab frame switching. */
@@ -122,16 +124,19 @@ public class MainFrame extends JFrame implements WindowListener,
      * Creates new form MainFrame.
      *
      * @param controller Swing controller
+     * @param windowFactory The window factory to use to create and listen for windows.
      * @param lifecycleController Controller to use to end the application.
      * @param windowManager Window management
      */
     public MainFrame(
             final SwingController controller,
+            final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
             final WindowManager windowManager) {
         super();
 
         this.controller = controller;
+        this.windowFactory = windowFactory;
         this.lifecycleController = lifecycleController;
         this.windowManager = windowManager;
 
@@ -180,10 +185,10 @@ public class MainFrame extends JFrame implements WindowListener,
             }
         });
 
-        controller.getWindowFactory().addWindowListener(this);
+        windowFactory.addWindowListener(this);
 
         setTitle(getTitlePrefix());
-        frameManager = new CtrlTabWindowManager(controller, this, rootPane);
+        frameManager = new CtrlTabWindowManager(controller, windowFactory, this, rootPane);
     }
 
     /**
@@ -329,8 +334,7 @@ public class MainFrame extends JFrame implements WindowListener,
             public void run() {
                 frameManagerPanel.removeAll();
                 if (mainFrameManager != null) {
-                    controller.getWindowFactory().removeWindowListener(
-                            mainFrameManager);
+                    windowFactory.removeWindowListener(mainFrameManager);
                 }
                 final String manager = controller.getGlobalConfig()
                         .getOption("ui", "framemanager");
@@ -348,8 +352,7 @@ public class MainFrame extends JFrame implements WindowListener,
                 mainFrameManager.setController(controller);
                 mainFrameManager.setParent(frameManagerPanel);
                 addSelectionListener(mainFrameManager);
-                controller.getWindowFactory().addWindowListener(
-                        mainFrameManager);
+                windowFactory.addWindowListener(mainFrameManager);
             }
         });
     }
@@ -365,7 +368,7 @@ public class MainFrame extends JFrame implements WindowListener,
         initFrameManagers();
         mainSplitPane = initSplitPane();
 
-        final MenuBar menu = new MenuBar(controller, this);
+        final MenuBar menu = new MenuBar(controller, windowFactory, this);
         controller.getApple().setMenuBar(menu);
         setJMenuBar(menu);
 

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

@@ -82,7 +82,6 @@ import com.dmdirc.util.validators.OptionalValidator;
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
 import java.awt.KeyboardFocusManager;
-import java.awt.Toolkit;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -109,18 +108,10 @@ import dagger.ObjectGraph;
  */
 @SuppressWarnings("PMD.UnusedPrivateField")
 public class SwingController extends BaseCommandPlugin implements UIController {
-    /** Window factory. */
-    @Getter
-    private final SwingWindowFactory windowFactory =
-            new SwingWindowFactory(this);
-    /** Waiting on mainframe creation. */
-    private final AtomicBoolean mainFrameCreated = new AtomicBoolean(false);
+
     /** URL Handler to use. */
     @Getter
     private final URLHandler urlHandler;
-    /** Singleton instance of MainFrame. */
-    @Getter
-    private MainFrame mainFrame;
     /** Status bar. */
     @Getter
     private SwingStatusBar swingStatusBar;
@@ -128,8 +119,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final List<java.awt.Window> windows;
     /** Error dialog. */
     private ErrorListDialog errorDialog;
-    /** DMDirc event queue. */
-    private DMDircEventQueue eventQueue;
     /** Key listener to handle dialog key events. */
     private DialogKeyListener keyListener;
     /** This plugin's plugin info object. */
@@ -198,6 +187,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     @Getter
     private final ActionSubstitutorFactory actionSubstitutorFactory;
 
+    /** The manager we're using for dependencies. */
+    private SwingManager swingManager;
+
     /**
      * Instantiates a new SwingController.
      *
@@ -207,7 +199,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @param pluginManager Plugin manager
      * @param actionManager Action manager
      * @param actionFactory The factory to use to create actions.
-     * @param commandController Command controller to register commands
      * @param serverManager Server manager to use for server information.
      * @param lifecycleController Controller to use to close the application.
      * @param corePluginExtractor Extractor to use for core plugins.
@@ -226,7 +217,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final PluginManager pluginManager,
             final ActionManager actionManager,
             final ActionFactory actionFactory,
-            final CommandController commandController,
             final ServerManager serverManager,
             final LifecycleController lifecycleController,
             final CorePluginExtractor corePluginExtractor,
@@ -237,7 +227,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final WindowManager windowManager,
             final ColourManager colourManager,
             final ActionSubstitutorFactory actionSubstitutorFactory) {
-        super(commandController);
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
         this.identityFactory = identityFactory;
@@ -266,11 +255,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
                 StatusBarManager.getStatusBarManager());
         setAntiAlias();
         windows = new ArrayList<>();
-        registerCommand(new ServerSettings(this), ServerSettings.INFO);
-        registerCommand(new ChannelSettings(this), ChannelSettings.INFO);
-        registerCommand(new Input(windowFactory, commandController), Input.INFO);
-        registerCommand(new PopOutCommand(this), PopOutCommand.INFO);
-        registerCommand(new PopInCommand(this), PopInCommand.INFO);
     }
 
     /**
@@ -291,7 +275,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @return true iif mainframe exists
      */
     protected boolean hasMainFrame() {
-        return mainFrameCreated.get();
+        return swingManager != null;
     }
 
     /** {@inheritDoc} */
@@ -434,35 +418,42 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * Initialises the global UI settings for the Swing UI.
      */
     private void initUISettings() {
-        // This will do nothing on non OS X Systems
-        if (Apple.isApple()) {
-            apple.setUISettings();
-            apple.setListener();
-        }
+        UIUtilities.invokeAndWait(new Runnable() {
 
-        final Font defaultFont = new Font(Font.DIALOG, Font.TRUETYPE_FONT, 12);
-        if (UIManager.getFont("TextField.font") == null) {
-            UIManager.put("TextField.font", defaultFont);
-        }
-        if (UIManager.getFont("TextPane.font") == null) {
-            UIManager.put("TextPane.font", defaultFont);
-        }
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                // This will do nothing on non OS X Systems
+                if (Apple.isApple()) {
+                    apple.setUISettings();
+                    apple.setListener();
+                }
 
-        try {
-            UIUtilities.initUISettings();
-            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
-                    getGlobalConfig().getOption("ui", "lookandfeel")));
-            UIUtilities.setUIFont(new Font(getGlobalConfig()
-                    .getOption("ui", "textPaneFontName"), Font.PLAIN, 12));
-        } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
-                IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
-        }
+                final Font defaultFont = new Font(Font.DIALOG, Font.TRUETYPE_FONT, 12);
+                if (UIManager.getFont("TextField.font") == null) {
+                    UIManager.put("TextField.font", defaultFont);
+                }
+                if (UIManager.getFont("TextPane.font") == null) {
+                    UIManager.put("TextPane.font", defaultFont);
+                }
 
-        if ("Metal".equals(UIManager.getLookAndFeel().getName())
-                || Apple.isAppleUI()) {
-            PlatformDefaults.setPlatform(PlatformDefaults.WINDOWS_XP);
-        }
+                try {
+                    UIUtilities.initUISettings();
+                    UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
+                            getGlobalConfig().getOption("ui", "lookandfeel")));
+                    UIUtilities.setUIFont(new Font(getGlobalConfig()
+                            .getOption("ui", "textPaneFontName"), Font.PLAIN, 12));
+                } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
+                        IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
+                    Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
+                }
+
+                if ("Metal".equals(UIManager.getLookAndFeel().getName())
+                        || Apple.isAppleUI()) {
+                    PlatformDefaults.setPlatform(PlatformDefaults.WINDOWS_XP);
+                }
+            }
+        });
     }
 
     /** {@inheritDoc} */
@@ -512,7 +503,17 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
+        // Init the UI settings before we start any DI, as we might create frames etc.
+        initUISettings();
+
         setObjectGraph(graph.plus(new SwingModule(this)));
+        swingManager = getObjectGraph().get(SwingManager.class);
+
+        registerCommand(ServerSettings.class, ServerSettings.INFO);
+        registerCommand(ChannelSettings.class, ChannelSettings.INFO);
+        registerCommand(Input.class, Input.INFO);
+        registerCommand(PopOutCommand.class, PopOutCommand.INFO);
+        registerCommand(PopInCommand.class, PopInCommand.INFO);
     }
 
     /** {@inheritDoc} */
@@ -522,17 +523,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             throw new IllegalStateException(
                     "Swing UI can't be run in a headless environment");
         }
-        eventQueue = new DMDircEventQueue(this);
-        keyListener = new DialogKeyListener();
-        UIUtilities.invokeAndWait(new Runnable() {
 
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                Toolkit.getDefaultToolkit().getSystemEventQueue()
-                        .push(eventQueue);
-            }
-        });
+        swingManager.load();
+        keyListener = new DialogKeyListener();
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
@@ -548,10 +541,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                initUISettings();
-                mainFrame = new MainFrame(SwingController.this, lifecycleController, windowManager);
                 getMainFrame().setVisible(true);
-                mainFrameCreated.set(true);
                 swingStatusBar = getMainFrame().getStatusBar();
                 errorDialog = new ErrorListDialog(SwingController.this);
                 StatusBarManager.getStatusBarManager().registerStatusBar(
@@ -559,25 +549,17 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             }
         });
 
-        if (!mainFrameCreated.get()) {
-            throw new IllegalStateException(
-                    "Main frame not created. Unable to continue.");
-        }
-        windowManager.addListenerAndSync(windowFactory);
         super.onLoad();
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
+        swingManager.unload();
+
         errorDialog.dispose();
-        windowManager.removeListener(windowFactory);
-        mainFrameCreated.set(false);
-        getMainFrame().dispose();
-        windowFactory.dispose();
         StatusBarManager.getStatusBarManager()
                 .registerStatusBar(getSwingStatusBar());
-        eventQueue.pop();
         KeyboardFocusManager.getCurrentKeyboardFocusManager().
                 removeKeyEventDispatcher(keyListener);
         for (final java.awt.Window window : getTopLevelWindows()) {
@@ -908,4 +890,26 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     public CommandController getCommandController() {
         return super.getCommandController();
     }
+
+    /**
+     * Retrieves the window factory to use.
+     *
+     * @return The window factory to use.
+     * @deprecated Should be injected where needed.
+     */
+    @Deprecated
+    public SwingWindowFactory getWindowFactory() {
+        return swingManager.getWindowFactory();
+    }
+
+    /**
+     * Retrieves the main frame to use.
+     *
+     * @return The main frame to use.
+     * @deprecated Should be injected where needed.
+     */
+    @Deprecated
+    public MainFrame getMainFrame() {
+        return swingManager.getMainFrame();
+    }
 }

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

@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2006-2013 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing;
+
+import com.dmdirc.ui.WindowManager;
+
+import java.awt.Toolkit;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Manages swing components and dependencies.
+ */
+@Singleton
+public class SwingManager {
+
+    /** The event queue to use. */
+    private final DMDircEventQueue eventQueue;
+
+    /** The window factory in use. */
+    private final SwingWindowFactory windowFactory;
+
+    /** The window manager to listen on for events. */
+    private final WindowManager windowManager;
+
+    /** The main frame of the Swing UI. */
+    private final MainFrame mainFrame;
+
+    /**
+     * Creates a new instance of {@link SwingManager}.
+     *
+     * @param eventQueue The event queue to use.
+     * @param windowFactory The window factory in use.
+     * @param windowManager The window manager to listen on for events.
+     * @param mainFrame The main frame of the Swing UI.
+     */
+    @Inject
+    public SwingManager(
+            final DMDircEventQueue eventQueue,
+            final SwingWindowFactory windowFactory,
+            final WindowManager windowManager,
+            final MainFrame mainFrame) {
+        this.eventQueue = eventQueue;
+        this.windowFactory = windowFactory;
+        this.windowManager = windowManager;
+        this.mainFrame = mainFrame;
+    }
+
+    /**
+     * Handles loading of the UI.
+     */
+    public void load() {
+        installEventQueue();
+        windowManager.addListenerAndSync(windowFactory);
+    }
+
+    /**
+     * Handles unloading of the UI.
+     */
+    public void unload() {
+        uninstallEventQueue();
+        windowManager.removeListener(windowFactory);
+        windowFactory.dispose();
+        mainFrame.dispose();
+    }
+
+    /**
+     * Retrieves the window factory to use.
+     *
+     * @return A swing window factory instance.
+     * @deprecated Should be injected.
+     */
+    @Deprecated
+    public SwingWindowFactory getWindowFactory() {
+        return windowFactory;
+    }
+
+    /**
+     * Retrieves the main frame.
+     *
+     * @return A main frame instance.
+     * @deprecated Should be injected.
+     */
+    @Deprecated
+    public MainFrame getMainFrame() {
+        return mainFrame;
+    }
+
+    /**
+     * Installs the DMDirc event queue.
+     */
+    private void installEventQueue() {
+        UIUtilities.invokeAndWait(new Runnable() {
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                Toolkit.getDefaultToolkit().getSystemEventQueue().push(eventQueue);
+            }
+        });
+    }
+
+    /**
+     * Removes the DMDirc event queue.
+     */
+    private void uninstallEventQueue() {
+        eventQueue.pop();
+    }
+
+}

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

@@ -23,6 +23,17 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule;
+import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
+import com.dmdirc.addons.ui_swing.commands.Input;
+import com.dmdirc.addons.ui_swing.commands.PopInCommand;
+import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
+import com.dmdirc.addons.ui_swing.commands.ServerSettings;
+import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.ui.WindowManager;
+
+import java.util.concurrent.Callable;
+
+import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
@@ -30,7 +41,18 @@ import dagger.Provides;
 /**
  * Dagger module that provides Swing-specific dependencies.
  */
-@Module(addsTo = ClientModule.class, library = true)
+@Module(
+        addsTo = ClientModule.class,
+        injects = {
+            SwingManager.class,
+            PopInCommand.class,
+            PopOutCommand.class,
+            Input.class,
+            ServerSettings.class,
+            ChannelSettings.class,
+        },
+        library = true
+)
 public class SwingModule {
 
     /** The controller to return to clients. */
@@ -59,11 +81,30 @@ public class SwingModule {
     /**
      * Gets the main DMDirc window.
      *
+     * @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.
+     * @param windowManager The core window manager to use to find windows.
      * @return The main window.
      */
     @Provides
-    public MainFrame getMainFrame() {
-        return controller.getMainFrame();
+    @Singleton
+    public MainFrame getMainFrame(
+            final SwingController swingController,
+            final SwingWindowFactory windowFactory,
+            final LifecycleController lifecycleController,
+            final WindowManager windowManager) {
+        return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
+            /** {@inheritDoc} */
+            @Override
+            public MainFrame call() {
+                return new MainFrame(
+                        swingController,
+                        windowFactory,
+                        lifecycleController,
+                        windowManager);
+            }
+        });
     }
 
 }

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

@@ -42,11 +42,15 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 /**
  * Handles creation of windows in the Swing UI.
  *
  * @since 0.6.4
  */
+@Singleton
 public class SwingWindowFactory implements FrameListener {
 
     /** A map of known implementations of window interfaces. */
@@ -63,6 +67,7 @@ public class SwingWindowFactory implements FrameListener {
      *
      * @param controller The controller this factory is for
      */
+    @Inject
     public SwingWindowFactory(final SwingController controller) {
         this.controller = controller;
 
@@ -215,8 +220,7 @@ public class SwingWindowFactory implements FrameListener {
 
     /** Disposes of this window factory, removing all listeners. */
     public void dispose() {
-        for (SwingWindowListener listener : listeners.get(
-                SwingWindowListener.class)) {
+        for (SwingWindowListener listener : listeners.get(SwingWindowListener.class)) {
             listeners.remove(SwingWindowListener.class, listener);
         }
         for (TextFrame frame : windows.values()) {

src/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java

@@ -33,8 +33,11 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Opens the channel settings window for the channel.
  */
@@ -53,9 +56,13 @@ public class ChannelSettings extends Command implements IntelligentCommand {
      * Creates a new instance of the {@link ChannelSettings} command.
      *
      * @param controller The controller to use to show the settings window.
+     * @param commandController The command controller to use for command info.
      */
-    public ChannelSettings(final SwingController controller) {
-        super(controller.getCommandController());
+    @Inject
+    public ChannelSettings(
+            final SwingController controller,
+            final CommandController commandController) {
+        super(commandController);
         this.controller = controller;
     }
 

src/com/dmdirc/addons/ui_swing/commands/Input.java

@@ -35,6 +35,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * The input command allows you to manipulate text in a windows inputField.
  *
@@ -56,6 +58,7 @@ public class Input extends Command implements IntelligentCommand {
      * @param windowFactory Window factory to get windows from
      * @param commandController The controller to use for command information.
      */
+    @Inject
     public Input(final SwingWindowFactory windowFactory, final CommandController commandController) {
         super(commandController);
         this.windowFactory = windowFactory;

src/com/dmdirc/addons/ui_swing/commands/PopInCommand.java

@@ -32,6 +32,9 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
+
+import javax.inject.Inject;
 
 /**
  * Command to pop in windows.
@@ -50,9 +53,13 @@ public class PopInCommand extends Command {
      * Create a new instance of PopInCommand.
      *
      * @param controller SwingWindowController associated with this command
+     * @param commandController The command controller to use for command info.
      */
-    public PopInCommand(final SwingController controller) {
-        super(controller.getCommandController());
+    @Inject
+    public PopInCommand(
+            final SwingController controller,
+            final CommandController commandController) {
+        super(commandController);
         this.controller = controller;
     }
 

src/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java

@@ -32,6 +32,9 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
+
+import javax.inject.Inject;
 
 /**
  * Command to pop out windows.
@@ -50,9 +53,13 @@ public class PopOutCommand extends Command {
      * Create a new instance of PopOutCommand.
      *
      * @param controller SwingWindowController associated with this command
+     * @param commandController The command controller to use for command info.
      */
-    public PopOutCommand(final SwingController controller) {
-        super(controller.getCommandController());
+    @Inject
+    public PopOutCommand(
+            final SwingController controller,
+            final CommandController commandController) {
+        super(commandController);
         this.controller = controller;
     }
 

src/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

@@ -32,8 +32,11 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import javax.inject.Inject;
+
 /**
  * Opens the server settings window for the server.
  *
@@ -54,9 +57,13 @@ public class ServerSettings extends Command implements IntelligentCommand {
      * Creates a new instance of the {@link ServerSettings} command.
      *
      * @param controller The controller to use to show the settings window.
+     * @param commandController The command controller to use for command info.
      */
-    public ServerSettings(final SwingController controller) {
-        super(controller.getCommandController());
+    @Inject
+    public ServerSettings(
+            final SwingController controller,
+            final CommandController commandController) {
+        super(commandController);
         this.controller = controller;
     }
 

src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.components;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -67,9 +68,13 @@ public class MDIBar extends JPanel implements SwingWindowListener,
      * Instantiates a new MDI bar.
      *
      * @param controller The controller that owns this MDI bar
+     * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame Main frame instance
      */
-    public MDIBar(final SwingController controller, final MainFrame mainFrame) {
+    public MDIBar(
+            final SwingController controller,
+            final SwingWindowFactory windowFactory,
+            final MainFrame mainFrame) {
         super();
 
         this.mainFrame = mainFrame;
@@ -84,7 +89,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
         setLayout(new MigLayout("hmax 17, ins 1 0 0 0, fill"));
         add(closeButton, "w 17!, h 17!, right");
 
-        controller.getWindowFactory().addWindowListener(this);
+        windowFactory.addWindowListener(this);
 
         mainFrame.addSelectionListener(this);
         closeButton.addActionListener(this);

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 
 import javax.swing.JFrame;
@@ -41,12 +42,15 @@ public class AppleJFrame extends JFrame {
      * Create a new Apple JFrame
      *
      * @param parentWindow Main Window
+     * @param windowFactory The window factory to use to create and listen for windows.
      * @param controller Parent swing controller
      */
-    public AppleJFrame(final MainFrame parentWindow,
+    public AppleJFrame(
+            final MainFrame parentWindow,
+            final SwingWindowFactory windowFactory,
             final SwingController controller) {
         super();
-        final MenuBar menu = new MenuBar(controller, parentWindow);
+        final MenuBar menu = new MenuBar(controller, windowFactory, parentWindow);
         controller.getApple().setMenuBar(menu);
         setJMenuBar(menu);
     }

src/com/dmdirc/addons/ui_swing/components/menubar/MenuBar.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.MDIBar;
 import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
 
@@ -55,9 +56,12 @@ public class MenuBar extends JMenuBar {
      * Instantiates a new menu bar.
      *
      * @param controller Swing controller
+     * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame Main frame
      */
-    public MenuBar(final SwingController controller,
+    public MenuBar(
+            final SwingController controller,
+            final SwingWindowFactory windowFactory,
             final MainFrame mainFrame) {
         super();
 
@@ -66,11 +70,11 @@ public class MenuBar extends JMenuBar {
         add(new ServerMenu(controller, mainFrame));
         add(new ChannelMenu(controller, mainFrame));
         add(new SettingsMenu(controller));
-        add(new WindowMenuFrameManager(controller, mainFrame));
+        add(new WindowMenuFrameManager(controller, windowFactory, mainFrame));
         add(new HelpMenu(controller));
         final int tempCount = getComponentCount();
         add(Box.createHorizontalGlue(), "growx, pushx");
-        add(new MDIBar(controller, mainFrame));
+        add(new MDIBar(controller, windowFactory, mainFrame));
         add(Box.createHorizontalStrut(PlatformDefaults.getPanelInsets(1)
                 .getUnit()));
         menuItemCount = getComponentCount() - tempCount;

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

@@ -110,7 +110,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
             final SwingController controller) {
         super(controller, Apple.isAppleUI() ?
                 new AppleJFrame((MainFrame) parentWindow,
-                controller) : null, ModalityType.MODELESS);
+                controller.getWindowFactory(), controller) : null, ModalityType.MODELESS);
 
         initComponents();
         validator = new ValidatorChain<>(

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -70,10 +70,13 @@ public class CtrlTabWindowManager implements SwingWindowListener,
      * Creates a new ctrl tab window manager.
      *
      * @param controller Parent controller
+     * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame The main frame that owns this window manager
      * @param component Component to add listen to events on
      */
-    public CtrlTabWindowManager(final SwingController controller,
+    public CtrlTabWindowManager(
+            final SwingController controller,
+            final SwingWindowFactory windowFactory,
             final MainFrame mainFrame,
             final JComponent component) {
         nodes = new HashMap<>();
@@ -85,13 +88,12 @@ public class CtrlTabWindowManager implements SwingWindowListener,
             @Override
             protected void setPath(final TreePath path) {
                 super.setPath(path);
-                controller.getMainFrame().setActiveFrame(
-                        controller.getWindowFactory().getSwingWindow(
+                mainFrame.setActiveFrame(windowFactory.getSwingWindow(
                         ((TreeViewNode) path.getLastPathComponent()).getWindow()));
             }
         };
 
-        windowFactory = controller.getWindowFactory();
+        this.windowFactory = windowFactory;
         windowFactory.addWindowListener(this);
 
         mainFrame.addSelectionListener(this);

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -27,6 +27,7 @@ import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -82,9 +83,12 @@ public final class WindowMenuFrameManager extends JMenu implements
      * Creates a new instance of WindowMenuFrameManager.
      *
      * @param controller Swing controller
+     * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame The frame that owns this manager
      */
-    public WindowMenuFrameManager(final SwingController controller,
+    public WindowMenuFrameManager(
+            final SwingController controller,
+            final SwingWindowFactory windowFactory,
             final MainFrame mainFrame) {
         super();
         this.controller = controller;
@@ -98,7 +102,7 @@ public final class WindowMenuFrameManager extends JMenu implements
 
         setText("Window");
         setMnemonic('w');
-        controller.getWindowFactory().addWindowListener(this);
+        windowFactory.addWindowListener(this);
 
         closeMenuItem = new JMenuItem(controller
                 .getIconManager().getIcon("close"));