Push some SwingController dependencies out a bit.

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

src/com/dmdirc/addons/debug/commands/FirstRun.java

@@ -25,10 +25,11 @@ package com.dmdirc.addons.debug.commands;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.Service;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -70,8 +71,12 @@ public class FirstRun extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        ((SwingController) pluginManager.getPluginInfoByName("ui_swing").getPlugin())
-                .showFirstRunWizard();
+        for (Service service : pluginManager.getServicesByType("ui")) {
+            if (service.isActive()) {
+                ((UIController) service.getActiveProvider().getExportedService("getController")
+                        .execute()).showFirstRunWizard();
+            }
+        }
     }
 
 }

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -22,9 +22,11 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -66,7 +68,9 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Creates a new instance of NickColourInputDialog.
      *
-     * @param swingController The controller that owns this dialog.
+     * @param owner The window that owns this dialog.
+     * @param colourManager The colour manager to use to retrieve colours.
+     * @param iconManager The icon manager to use for the dialog icon.
      * @param panel The panel that's opening this dialog
      * @param row The row of the table we're editing
      * @param nickname The nickname that's currently set
@@ -75,18 +79,20 @@ public class NickColourInputDialog extends StandardDialog
      * @param nickcolour The nicklist colour that's currently set
      */
     public NickColourInputDialog(
-            final SwingController swingController,
+            final MainFrame owner,
+            final ColourManager colourManager,
+            final IconManager iconManager,
             final NickColourPanel panel, final int row,
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
-        super(swingController.getMainFrame(), false);
+        super(owner, false);
 
         this.panel = panel;
         this.row = row;
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
-        initComponents(swingController, nickname, network, textcolour, nickcolour);
+        initComponents(colourManager, iconManager, nickname, network, textcolour, nickcolour);
         initListeners();
         layoutComponents();
 
@@ -97,13 +103,17 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Creates a new instance of NickColourInputDialog.
      *
-     * @param swingController The controller that owns this dialog.
+     * @param owner The window that owns this dialog.
+     * @param colourManager The colour manager to use to retrieve colours.
+     * @param iconManager The icon manager to use for the dialog icon.
      * @param panel The panel that's opening this dialog
      */
     public NickColourInputDialog(
-            final SwingController swingController,
+            final MainFrame owner,
+            final ColourManager colourManager,
+            final IconManager iconManager,
             final NickColourPanel panel) {
-        this(swingController, panel, -1, "", "", "", "");
+        this(owner, colourManager, iconManager, panel, -1, "", "", "", "");
 
         isnew = true;
     }
@@ -116,21 +126,19 @@ public class NickColourInputDialog extends StandardDialog
      * @param defaultTextColour The default value for the text colour option
      * @param defaultNickColour The default value for the nick colour option
      */
-    private void initComponents(final SwingController swingController, final String defaultNickname,
+    private void initComponents(
+            final ColourManager colourManager,
+            final IconManager iconManager,
+            final String defaultNickname,
             final String defaultNetwork, final String defaultTextColour,
             final String defaultNickColour) {
         orderButtons(new JButton(), new JButton());
 
         nickname = new JTextField(defaultNickname);
         network = new JTextField(defaultNetwork);
-        textColour = new ColourChooser(
-                swingController.getColourManager(),
-                swingController.getIconManager(),
-                defaultTextColour, true, true);
-        nicklistColour = new ColourChooser(
-                swingController.getColourManager(),
-                swingController.getIconManager(),
-                defaultNickColour, true, true);
+        textColour = new ColourChooser(colourManager, iconManager, defaultTextColour, true, true);
+        nicklistColour = new ColourChooser(colourManager, iconManager, defaultNickColour,
+                true, true);
     }
 
     /** Initialises the listeners. */

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -79,13 +79,15 @@ public class NickColourPanel extends JPanel implements ActionListener,
      * @param controller The UI controller that owns this panel
      * @param plugin The plugin that owns this panel
      * @param colourManager The colour manager to use to parse colours.
+     * @param userSettings The provider to write user settings to.
      */
     public NickColourPanel(
             final SwingController controller,
             final NickColourPlugin plugin,
-            final ColourManager colourManager) {
+            final ColourManager colourManager,
+            final ConfigProvider userSettings) {
         this.plugin = plugin;
-        this.configIdentity = controller.getIdentityManager().getUserSettings();
+        this.configIdentity = userSettings;
         this.swingController = controller;
 
         final Object[][] data = plugin.getData();
@@ -164,7 +166,11 @@ public class NickColourPanel extends JPanel implements ActionListener,
         final int row = table.getSelectedRow();
         switch (e.getActionCommand()) {
             case "Add":
-                new NickColourInputDialog(swingController, this);
+                new NickColourInputDialog(
+                        swingController.getMainFrame(),
+                        swingController.getColourManager(),
+                        swingController.getIconManager(),
+                        this);
                 break;
             case "Edit":
                 final DefaultTableModel model = ((DefaultTableModel) table.getModel());
@@ -178,7 +184,11 @@ public class NickColourPanel extends JPanel implements ActionListener,
                 if (nickcolour == null) {
                     nickcolour = "";
                 }
-                new NickColourInputDialog(swingController, this, row, nickname, network,
+                new NickColourInputDialog(
+                        swingController.getMainFrame(),
+                        swingController.getColourManager(),
+                        swingController.getIconManager(),
+                        this, row, nickname, network,
                         textcolour, nickcolour);
                 break;
             case "Delete":

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -270,8 +270,11 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
                     /** {@inheritDoc} */
                     @Override
                     public NickColourPanel call() {
-                        return new NickColourPanel(swingController, NickColourPlugin.this,
-                                colourManager);
+                        return new NickColourPanel(
+                                swingController,
+                                NickColourPlugin.this,
+                                colourManager,
+                                swingController.getGlobalIdentity());
                     }
                 }));
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.components.FileBrowser;
 import com.dmdirc.addons.ui_swing.components.FontPicker;
 import com.dmdirc.addons.ui_swing.components.OptionalJSpinner;
@@ -32,6 +33,8 @@ import com.dmdirc.addons.ui_swing.components.renderers.MapEntryRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 import com.dmdirc.util.validators.Validator;
@@ -68,17 +71,23 @@ import org.jdesktop.jxlayer.JXLayer;
 @Singleton
 public final class PrefsComponentFactory {
 
-    /** Swing Controller. */
-    private final SwingController controller;
+    /** The icon manager to use for dialog and error icons. */
+    private final IconManager iconManager;
+    /** The colour manager to use for colour preferences. */
+    private final ColourManager colourManager;
 
     /**
      * Creates a new instance of PrefsComponentFactory.
      *
-     * @param controller Swing Controller
+     * @param iconManager The icon manager to use for dialog and error icons.
+     * @param colourManager The colour manager to use for colour preferences.
      */
     @Inject
-    public PrefsComponentFactory(final SwingController controller) {
-        this.controller = controller;
+    public PrefsComponentFactory(
+            @GlobalConfig final IconManager iconManager,
+            final ColourManager colourManager) {
+        this.iconManager = iconManager;
+        this.colourManager = colourManager;
     }
 
     /**
@@ -153,7 +162,7 @@ public final class PrefsComponentFactory {
      */
     private JComponent getTextOption(final PreferencesSetting setting) {
         final ValidatingJTextField option = new ValidatingJTextField(
-                controller.getIconManager(), setting.getValidator());
+                iconManager, setting.getValidator());
         option.setText(setting.getValue());
 
         option.addKeyListener(new KeyAdapter() {
@@ -364,9 +373,7 @@ public final class PrefsComponentFactory {
     private JComponent getColourOption(
             final PreferencesSetting setting) {
         final OptionalColourChooser option = new OptionalColourChooser(
-                controller.getIconManager(),
-                controller.getColourManager(),
-                setting.getValue(), true, true, true);
+                iconManager, colourManager, setting.getValue(), true, true, true);
 
         option.addActionListener(new ActionListener() {
 
@@ -398,8 +405,7 @@ public final class PrefsComponentFactory {
                 .getValue().substring(1 + setting.getValue().indexOf(':'));
 
         final OptionalColourChooser option = new OptionalColourChooser(
-                controller.getIconManager(), controller.getColourManager(),
-                colour, state, true, true);
+                iconManager, colourManager, colour, state, true, true);
 
         option.addActionListener(new ActionListener() {
 
@@ -454,8 +460,7 @@ public final class PrefsComponentFactory {
      */
     private JComponent getFileBrowseOption(
             final PreferencesSetting setting, final int type) {
-        final FileBrowser option = new FileBrowser(controller.getIconManager(),
-                setting, type);
+        final FileBrowser option = new FileBrowser(iconManager, setting, type);
 
         option.addActionListener(new ActionListener() {
             /** {@inheritDoc} */