Make MainFrame dependencies more explicit.

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

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
@@ -39,11 +38,13 @@ import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
@@ -54,6 +55,7 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
 import java.awt.event.WindowListener;
 
+import javax.inject.Provider;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -88,6 +90,12 @@ public class MainFrame extends JFrame implements WindowListener,
     private final LifecycleController lifecycleController;
     /** The window factory to use to create and listen for windows. */
     private final SwingWindowFactory windowFactory;
+    /** The global config to read settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** The icon manager to use to get icons. */
+    private final IconManager iconManager;
+    /** The quit worker to use when quitting the app. */
+    private final Provider<QuitWorker> quitWorker;
     /** Client Version. */
     private final String version;
     /** Frame manager used for ctrl tab frame switching. */
@@ -126,47 +134,47 @@ public class MainFrame extends JFrame implements WindowListener,
      * @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 globalConfig The config to read settings from.
+     * @param quitWorker The quit worker to use when quitting the app.
+     * @param iconManager The icon manager to use to get icons.
      * @param windowManager Window management
      */
     public MainFrame(
             final SwingController controller,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
+            final AggregateConfigProvider globalConfig,
+            final Provider<QuitWorker> quitWorker,
+            final IconManager iconManager,
             final WindowManager windowManager) {
         super();
 
         this.controller = controller;
         this.windowFactory = windowFactory;
         this.lifecycleController = lifecycleController;
+        this.globalConfig = globalConfig;
+        this.quitWorker = quitWorker;
+        this.iconManager = iconManager;
         this.windowManager = windowManager;
 
         focusOrder = new QueuedLinkedHashSet<>();
         initComponents();
 
-        imageIcon = new ImageIcon(controller.getIconManager().getImage("icon"));
+        imageIcon = new ImageIcon(iconManager.getImage("icon"));
         setIconImage(imageIcon.getImage());
 
         CoreUIUtils.centreWindow(this);
 
         addWindowListener(this);
 
-        showVersion = controller.getGlobalConfig().getOptionBool("ui",
-                "showversion");
-        version = controller.getGlobalConfig().getOption("version",
-                "version");
-        controller.getGlobalConfig().addChangeListener("ui", "lookandfeel",
-                this);
-        controller.getGlobalConfig().addChangeListener("ui", "showversion",
-                this);
-        controller.getGlobalConfig().addChangeListener("ui",
-                "framemanager", this);
-        controller.getGlobalConfig().addChangeListener("ui",
-                "framemanagerPosition", this);
-        controller.getGlobalConfig().addChangeListener("ui",
-                "textPaneFontName", this);
-        controller.getGlobalConfig().addChangeListener("icon", "icon",
-                this);
-
+        showVersion = globalConfig.getOptionBool("ui", "showversion");
+        version = globalConfig.getOption("version", "version");
+        globalConfig.addChangeListener("ui", "lookandfeel", this);
+        globalConfig.addChangeListener("ui", "showversion", this);
+        globalConfig.addChangeListener("ui", "framemanager", this);
+        globalConfig.addChangeListener("ui", "framemanagerPosition", this);
+        globalConfig.addChangeListener("ui", "textPaneFontName", this);
+        globalConfig.addChangeListener("icon", "icon", this);
 
         addWindowFocusListener(new WindowFocusListener() {
 
@@ -220,7 +228,7 @@ public class MainFrame extends JFrame implements WindowListener,
         return (MenuBar) super.getJMenuBar();
     }
 
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     @Override
     public void setTitle(final String title) {
         UIUtilities.invokeLater(new Runnable() {
@@ -247,7 +255,7 @@ public class MainFrame extends JFrame implements WindowListener,
     }
 
     /**
-     * {@inheritDoc}.
+     * {@inheritDoc}
      *
      * @param windowEvent Window event
      */
@@ -257,7 +265,7 @@ public class MainFrame extends JFrame implements WindowListener,
     }
 
     /**
-     * {@inheritDoc}.
+     * {@inheritDoc}
      *
      * @param windowEvent Window event
      */
@@ -267,7 +275,7 @@ public class MainFrame extends JFrame implements WindowListener,
     }
 
     /**
-     * {@inheritDoc}.
+     * {@inheritDoc}
      *
      * @param windowEvent Window event
      */
@@ -284,7 +292,7 @@ public class MainFrame extends JFrame implements WindowListener,
     }
 
     /**
-     * {@inheritDoc}.
+     * {@inheritDoc}
      *
      * @param windowEvent Window event
      */
@@ -336,8 +344,7 @@ public class MainFrame extends JFrame implements WindowListener,
                 if (mainFrameManager != null) {
                     windowFactory.removeWindowListener(mainFrameManager);
                 }
-                final String manager = controller.getGlobalConfig()
-                        .getOption("ui", "framemanager");
+                final String manager = globalConfig.getOption("ui", "framemanager");
                 try {
                     mainFrameManager = (FrameManager) Class.forName(manager)
                             .getConstructor(WindowManager.class).newInstance(windowManager);
@@ -398,10 +405,9 @@ public class MainFrame extends JFrame implements WindowListener,
      * @return Returns the initialised split pane
      */
     private SplitPane initSplitPane() {
-        final SplitPane splitPane = new SplitPane(controller.getGlobalConfig(),
-                SplitPane.Orientation.HORIZONTAL);
-        position = FramemanagerPosition.getPosition(controller
-                .getGlobalConfig().getOption("ui", "framemanagerPosition"));
+        final SplitPane splitPane = new SplitPane(globalConfig, SplitPane.Orientation.HORIZONTAL);
+        position = FramemanagerPosition.getPosition(
+                globalConfig.getOption("ui", "framemanagerPosition"));
 
         if (position == FramemanagerPosition.UNKNOWN) {
             position = FramemanagerPosition.LEFT;
@@ -425,8 +431,7 @@ public class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(0.0);
                 splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        Integer.MAX_VALUE, controller.getGlobalConfig().
-                        getOptionInt("ui", "frameManagerSize")));
+                        Integer.MAX_VALUE, globalConfig.getOptionInt("ui", "frameManagerSize")));
                 break;
             case LEFT:
                 splitPane.setLeftComponent(frameManagerPanel);
@@ -434,8 +439,7 @@ public class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(0.0);
                 splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        controller.getGlobalConfig().getOptionInt("ui",
-                        "frameManagerSize"), Integer.MAX_VALUE));
+                        globalConfig.getOptionInt("ui", "frameManagerSize"), Integer.MAX_VALUE));
                 break;
             case BOTTOM:
                 splitPane.setTopComponent(framePanel);
@@ -443,8 +447,7 @@ public class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(1.0);
                 splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        Integer.MAX_VALUE, controller.getGlobalConfig().
-                        getOptionInt("ui", "frameManagerSize")));
+                        Integer.MAX_VALUE, globalConfig.getOptionInt("ui", "frameManagerSize")));
                 break;
             case RIGHT:
                 splitPane.setLeftComponent(framePanel);
@@ -452,8 +455,7 @@ public class MainFrame extends JFrame implements WindowListener,
                 splitPane.setResizeWeight(1.0);
                 splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        controller.getGlobalConfig().getOptionInt("ui",
-                        "frameManagerSize"), Integer.MAX_VALUE));
+                        globalConfig.getOptionInt("ui", "frameManagerSize"), Integer.MAX_VALUE));
                 break;
             default:
                 break;
@@ -475,8 +477,7 @@ public class MainFrame extends JFrame implements WindowListener,
      * @param exitCode Exit code
      */
     public void quit(final int exitCode) {
-        if (exitCode == 0 && controller.getGlobalConfig().getOptionBool(
-                "ui", "confirmQuit")) {
+        if (exitCode == 0 && globalConfig.getOptionBool("ui", "confirmQuit")) {
             final StandardQuestionDialog dialog = new ConfirmQuitDialog(controller) {
 
                 /** Serial version UID. */
@@ -503,28 +504,7 @@ public class MainFrame extends JFrame implements WindowListener,
         this.exitCode = exitCode;
         quitting = true;
 
-        new LoggingSwingWorker<Void, Void>() {
-
-            /** {@inheritDoc} */
-            @Override
-            protected Void doInBackground() {
-                ActionManager.getActionManager().triggerEvent(
-                        CoreActionType.CLIENT_CLOSING, null);
-                controller.getServerManager().closeAll(controller
-                        .getGlobalConfig().getOption("general", "closemessage"));
-                controller.getGlobalIdentity().setOption("ui",
-                        "frameManagerSize",
-                        String.valueOf(getFrameManagerSize()));
-                return null;
-            }
-
-            /** {@inheritDoc} */
-            @Override
-            protected void done() {
-                super.done();
-                dispose();
-            }
-        }.executeInExecutor();
+        quitWorker.get().executeInExecutor();
     }
 
     /** {@inheritDoc} */
@@ -552,19 +532,17 @@ public class MainFrame extends JFrame implements WindowListener,
                     });
                     break;
                 case "textPaneFontName":
-                    final String font = controller.getGlobalConfig()
-                            .getOptionString("ui", "textPaneFontName");
+                    final String font = globalConfig.getOptionString("ui", "textPaneFontName");
                     log.debug("Changing textpane font: {}", font);
                     UIUtilities.setUIFont(new Font(font, Font.PLAIN, 12));
                     controller.updateComponentTrees();
                     break;
                 default:
-                    showVersion = controller.getGlobalConfig().getOptionBool(
-                            "ui", "showversion");
+                    showVersion = globalConfig.getOptionBool("ui", "showversion");
                     break;
             }
         } else {
-            imageIcon = new ImageIcon(controller.getIconManager().getImage("icon"));
+            imageIcon = new ImageIcon(iconManager.getImage("icon"));
             UIUtilities.invokeLater(new Runnable() {
 
                 /** {@inheritDoc} */
@@ -721,7 +699,8 @@ public class MainFrame extends JFrame implements WindowListener,
         if (!quitting) {
             removeWindowListener(this);
         }
-        controller.getGlobalConfig().removeListener(this);
+
+        globalConfig.removeListener(this);
         super.dispose();
     }
 }

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

@@ -0,0 +1,92 @@
+/*
+ * 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.ServerManager;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
+
+import javax.inject.Inject;
+import javax.swing.SwingWorker;
+
+/**
+ * Worker which handles quitting the application on behalf of a {@link MainFrame}.
+ */
+public class QuitWorker extends SwingWorker<Void, Void> {
+
+    /** The identity to write settings to. */
+    private final ConfigProvider globalIdentity;
+    /** The config to read settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** The server manager to use to disconnect all servers. */
+    private final ServerManager serverManager;
+    /** The main frame to interact with. */
+    private final MainFrame mainFrame;
+
+    /**
+     * Creates a new {@link QuitWorker}.
+     *
+     * @param identityController The identity controller to use to read/write settings.
+     * @param serverManager The server manager to use to disconnect all servers.
+     * @param mainFrame The main frame to interact with.
+     */
+    @Inject
+    public QuitWorker(
+            final IdentityController identityController,
+            final ServerManager serverManager,
+            final MainFrame mainFrame) {
+        this.globalIdentity = identityController.getUserSettings();
+        this.globalConfig = identityController.getGlobalConfiguration();
+        this.serverManager = serverManager;
+        this.mainFrame = mainFrame;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Void doInBackground() {
+        ActionManager.getActionManager().triggerEvent(
+                CoreActionType.CLIENT_CLOSING, null);
+        serverManager.closeAll(globalConfig.getOption("general", "closemessage"));
+        globalIdentity.setOption("ui", "frameManagerSize",
+                String.valueOf(mainFrame.getFrameManagerSize()));
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void done() {
+        super.done();
+        mainFrame.dispose();
+    }
+
+    /**
+     * Execute this swing worker in the swing worker executor.
+     */
+    public void executeInExecutor() {
+        SwingWorkerExecutor.queue(this);
+    }
+
+}

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

@@ -507,6 +507,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         initUISettings();
 
         setObjectGraph(graph.plus(new SwingModule(this)));
+        getObjectGraph().validate();
         swingManager = getObjectGraph().get(SwingManager.class);
 
         registerCommand(ServerSettings.class, ServerSettings.INFO);

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

@@ -23,16 +23,21 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule;
+import com.dmdirc.ClientModule.GlobalConfig;
 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.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.concurrent.Callable;
 
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -50,8 +55,7 @@ import dagger.Provides;
             Input.class,
             ServerSettings.class,
             ChannelSettings.class,
-        },
-        library = true
+        }
 )
 public class SwingModule {
 
@@ -84,6 +88,9 @@ public class SwingModule {
      * @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 globalConfig The config to read settings from.
+     * @param quitWorker The worker to use when quitting the application.
+     * @param urlBuilder The URL builder to use to find icons.
      * @param windowManager The core window manager to use to find windows.
      * @return The main window.
      */
@@ -93,6 +100,9 @@ public class SwingModule {
             final SwingController swingController,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final Provider<QuitWorker> quitWorker,
+            final URLBuilder urlBuilder,
             final WindowManager windowManager) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
             /** {@inheritDoc} */
@@ -102,6 +112,9 @@ public class SwingModule {
                         swingController,
                         windowFactory,
                         lifecycleController,
+                        globalConfig,
+                        quitWorker,
+                        new IconManager(globalConfig, urlBuilder),
                         windowManager);
             }
         });

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

@@ -61,8 +61,6 @@ public class CtrlTabWindowManager implements SwingWindowListener,
     private final TreeViewModel model;
     /** Tree Scroller. */
     private final TreeScroller treeScroller;
-    /** Window factory. */
-    private final SwingWindowFactory windowFactory;
     /** Selection model for the tree scroller. */
     private final TreeSelectionModel selectionModel;
 
@@ -93,9 +91,7 @@ public class CtrlTabWindowManager implements SwingWindowListener,
             }
         };
 
-        this.windowFactory = windowFactory;
         windowFactory.addWindowListener(this);
-
         mainFrame.addSelectionListener(this);
 
         component.getActionMap().put("prevFrameAction",