Remove some more usages of SwingController.

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

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

@@ -436,7 +436,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         // Init the UI settings before we start any DI, as we might create frames etc.
         initUISettings();
 
-        setObjectGraph(graph.plus(new SwingModule(this)));
+        setObjectGraph(graph.plus(new SwingModule(this, pluginInfo.getDomain())));
         getObjectGraph().validate();
         swingManager = getObjectGraph().get(SwingManager.class);
 

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -46,21 +46,21 @@ public class PopInCommand extends Command {
             "popin - Reattaches the current window to the main client if it"
                 + " has been detached via the popin command.",
             CommandType.TYPE_GLOBAL);
-    /** SwingController associated with this popin Command. */
-    private final SwingController controller;
+    /** Factory to use to locate windows. */
+    private final SwingWindowFactory windowFactory;
 
     /**
      * Create a new instance of PopInCommand.
      *
-     * @param controller SwingWindowController associated with this command
+     * @param windowFactory Factory to use to locate windows.
      * @param commandController The command controller to use for command info.
      */
     @Inject
     public PopInCommand(
-            final SwingController controller,
+            final SwingWindowFactory windowFactory,
             final CommandController commandController) {
         super(commandController);
-        this.controller = controller;
+        this.windowFactory = windowFactory;
     }
 
     /** {@inheritDoc} */
@@ -71,8 +71,7 @@ public class PopInCommand extends Command {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final TextFrame swingWindow = controller.getWindowFactory()
-                        .getSwingWindow(origin);
+                final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
                 if (swingWindow == null) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
                             + " currently no window to pop in.");

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -46,21 +46,21 @@ public class PopOutCommand extends Command {
             "popout - Makes the current window pop out of the client as a "
                 + "free floating window on your desktop.",
             CommandType.TYPE_GLOBAL);
-    /** SwingController associated with this popout Command. */
-    private final SwingController controller;
+    /** Factory to use to locate windows. */
+    private final SwingWindowFactory windowFactory;
 
     /**
      * Create a new instance of PopOutCommand.
      *
-     * @param controller SwingWindowController associated with this command
+     * @param windowFactory Factory to use to locate windows.
      * @param commandController The command controller to use for command info.
      */
     @Inject
     public PopOutCommand(
-            final SwingController controller,
+            final SwingWindowFactory windowFactory,
             final CommandController commandController) {
         super(commandController);
-        this.controller = controller;
+        this.windowFactory = windowFactory;
     }
 
     /** {@inheritDoc} */
@@ -71,8 +71,7 @@ public class PopOutCommand extends Command {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final TextFrame swingWindow = controller.getWindowFactory()
-                        .getSwingWindow(origin);
+                final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
                 if (swingWindow == null) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
                             + " currently no window to pop out.");

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

@@ -22,14 +22,16 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 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.addons.ui_swing.injection.SwingModule.SwingSettingsDomain;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -70,24 +72,27 @@ public class MDIBar extends JPanel implements SwingWindowListener,
     /**
      * Instantiates a new MDI bar.
      *
-     * @param controller The controller that owns this MDI bar
+     * @param globalConfig The config to read settings from.
+     * @param iconManager The manager to use to retrieve icons.
+     * @param domain The domain to read settings from under.
      * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame Main frame instance
      */
     @Inject
     public MDIBar(
-            final SwingController controller,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            @GlobalConfig final IconManager iconManager,
+            @SwingSettingsDomain final String domain,
             final SwingWindowFactory windowFactory,
             final MainFrame mainFrame) {
         super();
 
         this.mainFrame = mainFrame;
-        config = controller.getGlobalConfig();
-        configDomain = controller.getDomain();
+        this.config = globalConfig;
+        this.configDomain = domain;
         visibility = config.getOptionBool(configDomain, "mdiBarVisibility");
 
-        closeButton = new NoFocusButton(controller.getIconManager()
-                .getScaledIcon("close-12", ICON_SIZE,ICON_SIZE));
+        closeButton = new NoFocusButton(iconManager.getScaledIcon("close-12", ICON_SIZE,ICON_SIZE));
 
         setOpaque(false);
         setLayout(new MigLayout("hmax 17, ins 1 0 0 0, fill"));

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -22,16 +22,17 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.UpdateManager;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.io.ConfigFile;
@@ -73,19 +74,22 @@ public class DataLoaderWorker
     private final JProgressBar jpb = new JProgressBar(0, 100);
     /** Refresh addons feed? */
     private final boolean download;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Directory to store temporary files in. */
     private final String tempDirectory;
+    /** URL Builder to use when loading addon resources. */
+    private final URLBuilder urlBuilder;
     /** Factory to use to produce install workers. */
     private final InstallWorkerFactory workerFactory;
     /** The manager to use to retrieve update information. */
     private final UpdateManager updateManager;
+    /** Configuration to read settings from. */
+    private final AggregateConfigProvider globalConfig;
 
     /**
      * Creates a new data loader worker.
      *
-     * @param controller Swing controller
+     * @param globalConfig Configuration to read settings from.
+     * @param urlBuilder URL Builder to use when loading addon resources.
      * @param workerFactory Factory to use to produce install workers.
      * @param updateManager Manager to use to retrieve update information.
      * @param tempDirectory The directory to store temporary items in, such as the addons feed.
@@ -95,7 +99,8 @@ public class DataLoaderWorker
      * @param scrollPane Table's parent scrollpane
      */
     public DataLoaderWorker(
-            final SwingController controller,
+            @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider globalConfig,
+            final URLBuilder urlBuilder,
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
             @SuppressWarnings("qualifiers") @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
@@ -103,7 +108,8 @@ public class DataLoaderWorker
             @Unbound final boolean download,
             @Unbound final BrowserWindow browserWindow,
             @Unbound final JScrollPane scrollPane) {
-        this.controller = controller;
+        this.globalConfig = globalConfig;
+        this.urlBuilder = urlBuilder;
         this.workerFactory = workerFactory;
         this.download = download;
         this.table = table;
@@ -148,8 +154,7 @@ public class DataLoaderWorker
 
         final List<AddonInfo> list = new ArrayList<>();
         for (final Map<String, String> entry : data.getKeyDomains().values()) {
-            list.add(new AddonInfo(controller.getGlobalConfig(), updateManager,
-                    controller.getUrlBuilder(), entry));
+            list.add(new AddonInfo(globalConfig, updateManager, urlBuilder, entry));
         }
         return list;
     }

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -73,15 +72,6 @@ public class DurationEditor extends StandardDialog implements ActionListener {
     /** Parent window. */
     private Window window;
 
-    /**
-     * Instantiates a new duration editor.
-     *
-     * @param controller Controller for dialog creation
-     */
-    public DurationEditor(final SwingController controller) {
-        this(controller, 0);
-    }
-
     /**
      * Instantiates a new duration editor.
      *
@@ -93,18 +83,6 @@ public class DurationEditor extends StandardDialog implements ActionListener {
         this(window, 0);
     }
 
-    /**
-     * Instantiates a new duration editor.
-     *
-     * @param controller Controller for dialog creation
-     *
-     * @param duration Starting duration
-     */
-    public DurationEditor(final SwingController controller,
-            final long duration) {
-        this(controller.getMainFrame(), duration);
-    }
-
     /**
      * Instantiates a new duration editor.
      *

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.event.ActionEvent;
@@ -55,20 +54,30 @@ public class AboutDialog extends StandardDialog implements ActionListener, Chang
     /**
      * Creates a new instance of AboutDialog.
      *
-     * @param controller Swing controller
      * @param parentWindow Parent window
+     * @param infoPanel The info panel to display.
+     * @param creditsPanel The credits panel to display.
+     * @param licensesPanel The licenses panel to display.
+     * @param aboutPanel The about panel to display.
      */
     @Inject
     public AboutDialog(
             final MainFrame parentWindow,
-            final SwingController controller) {
+            final InfoPanel infoPanel,
+            final CreditsPanel creditsPanel,
+            final LicencesPanel licensesPanel,
+            final AboutPanel aboutPanel) {
         super(parentWindow, ModalityType.MODELESS);
 
-        initComponents(controller);
+        initComponents(infoPanel, creditsPanel, licensesPanel, aboutPanel);
     }
 
     /** Initialises the main UI components. */
-    private void initComponents(final SwingController controller) {
+    private void initComponents(
+            final InfoPanel infoPanel,
+            final CreditsPanel creditsPanel,
+            final LicencesPanel licensesPanel,
+            final AboutPanel aboutPanel) {
         tabbedPane = new JTabbedPane();
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -80,12 +89,12 @@ public class AboutDialog extends StandardDialog implements ActionListener, Chang
         getOkButton().addActionListener(this);
         getCancelButton().addActionListener(this);
 
-        cp = new CreditsPanel(controller.getUrlHandler());
+        cp = creditsPanel;
 
-        tabbedPane.add("About", new AboutPanel(controller.getUrlHandler()));
+        tabbedPane.add("About", aboutPanel);
         tabbedPane.add("Credits", cp);
-        tabbedPane.add("Licences", new LicencesPanel(controller));
-        tabbedPane.add("Information", new InfoPanel(controller));
+        tabbedPane.add("Licences", licensesPanel);
+        tabbedPane.add("Information", infoPanel);
         tabbedPane.addChangeListener(this);
 
         getContentPane().setLayout(new MigLayout("ins rel, wrap 1, fill, " +

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutPanel.java

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 
+import javax.inject.Inject;
 import javax.swing.JPanel;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkEvent.EventType;
@@ -53,6 +54,7 @@ public final class AboutPanel extends JPanel implements HyperlinkListener {
      *
      * @param urlHandler The URL Handler to use to handle clicked links
      */
+    @Inject
     public AboutPanel(final URLHandler urlHandler) {
         super();
 

src/com/dmdirc/addons/ui_swing/dialogs/about/CreditsPanel.java

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 
+import javax.inject.Inject;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.event.HyperlinkEvent;
@@ -57,6 +58,7 @@ public final class CreditsPanel extends JPanel implements HyperlinkListener {
      *
      * @param urlHandler The URL handler to use to open clicked links
      */
+    @Inject
     public CreditsPanel(final URLHandler urlHandler) {
         super();
 

src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -30,6 +30,7 @@ import com.dmdirc.util.DateUtils;
 import java.awt.Font;
 import java.nio.charset.Charset;
 
+import javax.inject.Inject;
 import javax.swing.JEditorPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -53,6 +54,7 @@ public final class InfoPanel extends JPanel {
      *
      * @param controller Parent swing controller
      */
+    @Inject
     public InfoPanel(final SwingController controller) {
         super();
 

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.BufferedReader;
@@ -53,20 +53,23 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
     private final JTree tree;
     /** Model to load licences into. */
     private final DefaultTreeModel model;
-    /** Swing Controller */
-    final SwingController controller;
+    /** Manager to use to get plugin information from */
+    private final PluginManager pluginManager;
 
     /**
      * Instantiates a new licence loader.
      *
-     * @param controller to get plugin manager from to get plugin list from to read licenses
+     * @param pluginManager to get plugin manager from to get plugin list from to read licenses
      * @param tree Tree
      * @param model Model to load licences into
      */
-    public LicenceLoader(final SwingController controller, final JTree tree, final DefaultTreeModel model) {
+    public LicenceLoader(
+            final PluginManager pluginManager,
+            final JTree tree,
+            final DefaultTreeModel model) {
         super();
 
-        this.controller = controller;
+        this.pluginManager = pluginManager;
         this.tree = tree;
         this.model = model;
     }
@@ -84,7 +87,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
                     + "no resource manager");
         } else {
             addCoreLicences(rm);
-            for (PluginInfo pi : controller.getPluginManager().getPluginInfos()) {
+            for (PluginInfo pi : pluginManager.getPluginInfos()) {
                 addPluginLicences(pi);
             }
         }

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -22,15 +22,17 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
 
 import java.awt.Font;
 import java.awt.Rectangle;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JEditorPane;
 import javax.swing.JPanel;
@@ -65,20 +67,21 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
     private JEditorPane licence;
     /** Licence list. */
     private JTree list;
-    /** Swing Controller. */
-    private final SwingController controller;
 
     /**
      * Creates a new instance of LicencesPanel.
      *
-     * @param controller Controller to pass to LicenseLoader (should be PluginManager)
+     * @param globalConfig The config to read settings from.
+     * @param pluginManager The manager to use to find plugins (to display their licenses).
      */
-    public LicencesPanel(final SwingController controller) {
+    @Inject
+    public LicencesPanel(
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final PluginManager pluginManager) {
         super();
 
-        this.controller = controller;
-        this.config = controller.getGlobalConfig();
-        initComponents();
+        this.config = globalConfig;
+        initComponents(new LicenceLoader(pluginManager, list, listModel));
         addListeners();
         layoutComponents();
     }
@@ -100,7 +103,7 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
     }
 
     /** Initialises the components. */
-    private void initComponents() {
+    private void initComponents(final LicenceLoader licenceLoader) {
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         listModel = new DefaultTreeModel(new DefaultMutableTreeNode());
         list = new JTree(listModel) {
@@ -133,7 +136,7 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
         list.getSelectionModel().setSelectionMode(TreeSelectionModel.
                 SINGLE_TREE_SELECTION);
         new TreeScroller(list);
-        new LicenceLoader(controller, list, listModel).executeInExecutor();
+        licenceLoader.executeInExecutor();
         licence = new JEditorPane();
         licence.setEditorKit(new HTMLEditorKit());
         final Font font = UIManager.getFont("Label.font");

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

@@ -47,6 +47,7 @@ import com.dmdirc.util.URLBuilder;
 import java.util.concurrent.Callable;
 
 import javax.inject.Provider;
+import javax.inject.Qualifier;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -69,17 +70,36 @@ import dagger.Provides;
 )
 public class SwingModule {
 
+    @Qualifier
+    public static @interface SwingSettingsDomain {}
+
     /** The controller to return to clients. */
     private final SwingController controller;
 
+    /** The domain for plugin settings. */
+    private final String domain;
+
     /**
      * Creates a new instance of {@link SwingModule}.
      *
      * @param controller The controller to return. This should be removed when SwingController
      * is separated from the plugin implementation.
+     * @param domain The domain for plugin settings.
      */
-    public SwingModule(final SwingController controller) {
+    public SwingModule(final SwingController controller, final String domain) {
         this.controller = controller;
+        this.domain = domain;
+    }
+
+    /**
+     * Provides the domain that the swing settings should be stored under.
+     *
+     * @return The settings domain for the swing plugin.
+     */
+    @Provides
+    @SwingSettingsDomain
+    public String getSettingsDomain() {
+        return domain;
     }
 
     /**