Remove horrible SwingController lookups.

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

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

@@ -66,6 +66,7 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Creates a new instance of NickColourInputDialog.
      *
+     * @param swingController The controller that owns this dialog.
      * @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
@@ -73,11 +74,12 @@ public class NickColourInputDialog extends StandardDialog
      * @param textcolour The text colour that's currently set
      * @param nickcolour The nicklist colour that's currently set
      */
-    public NickColourInputDialog(final NickColourPanel panel, final int row,
+    public NickColourInputDialog(
+            final SwingController swingController,
+            final NickColourPanel panel, final int row,
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
-        super(((SwingController) panel.getPlugin().getPluginInfo().getMetaData().getManager()
-                .getPluginInfoByName("ui_swing").getPlugin()), false);
+        super(swingController, false);
 
         this.panel = panel;
         this.row = row;
@@ -95,10 +97,13 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Creates a new instance of NickColourInputDialog.
      *
+     * @param swingController The controller that owns this dialog.
      * @param panel The panel that's opening this dialog
      */
-    public NickColourInputDialog(final NickColourPanel panel) {
-        this(panel, -1, "", "", "", "");
+    public NickColourInputDialog(
+            final SwingController swingController,
+            final NickColourPanel panel) {
+        this(swingController, panel, -1, "", "", "", "");
 
         isnew = true;
     }

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

@@ -57,15 +57,19 @@ public class NickColourPanel extends JPanel implements ActionListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+
+    /** The table headings. */
+    private static final String[] HEADERS =
+            {"Network", "Nickname", "Text colour", "Nicklist colour"};
+
     /** The table used for displaying the options. */
     private final JTable table;
     /** The plugin we're associated with. */
     private final transient NickColourPlugin plugin;
     /** The identity to write settings to. */
     private final ConfigProvider configIdentity;
-    /** The table headings. */
-    private static final String[] HEADERS = {"Network", "Nickname",
-        "Text colour", "Nicklist colour"};
+    /** The controller that owns this dialog. */
+    private final SwingController swingController;
 
     /** Edit and delete buttons. */
     private final JButton editButton, deleteButton;
@@ -83,6 +87,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
             final ColourManager colourManager) {
         this.plugin = plugin;
         this.configIdentity = controller.getIdentityManager().getUserSettings();
+        this.swingController = controller;
 
         final Object[][] data = plugin.getData();
 
@@ -159,7 +164,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getActionCommand().equals("Add")) {
-            new NickColourInputDialog(this);
+            new NickColourInputDialog(swingController, this);
         } else if (e.getActionCommand().equals("Edit")) {
             final DefaultTableModel model
                     = ((DefaultTableModel) table.getModel());
@@ -179,7 +184,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
                 nickcolour = "";
             }
 
-            new NickColourInputDialog(this, row, nickname, network, textcolour,
+            new NickColourInputDialog(swingController, this, row, nickname, network, textcolour,
                     nickcolour);
         } else if (e.getActionCommand().equals("Delete")) {
             final int row = table.getSelectedRow();

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

@@ -76,6 +76,8 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
     private final IdentityController identityController;
     /** Manager to parse colours with. */
     private final ColourManager colourManager;
+    /** The swing controller to use. */
+    private final SwingController swingController;
 
     /** {@inheritDoc} */
     @Override
@@ -264,10 +266,8 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
                     /** {@inheritDoc} */
                     @Override
                     public NickColourPanel call() {
-                        return new NickColourPanel(
-                                (SwingController) pluginInfo.getMetaData().getManager()
-                                .getPluginInfoByName("ui_swing").getPlugin(),
-                                NickColourPlugin.this, colourManager);
+                        return new NickColourPanel(swingController, NickColourPlugin.this,
+                                colourManager);
                     }
                 }));
 

src/com/dmdirc/addons/osd/OsdManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.osd;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.messages.ColourManager;
@@ -42,6 +43,8 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class OsdManager {
 
+    /** The window the OSD will be associated with. */
+    private final MainFrame mainFrame;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
     /** The Plugin that owns this OSD Manager. */
@@ -102,7 +105,9 @@ public class OsdManager {
             /** {@inheritDoc} */
             @Override
             public OsdWindow call() {
-                return new OsdWindow(identityController, plugin, OsdManager.this, colourManager,
+                return new OsdWindow(
+                        mainFrame,
+                        identityController, plugin, OsdManager.this, colourManager,
                         timeout, message, false,
                         identityController.getGlobalConfiguration().getOptionInt(
                         plugin.getDomain(), "locationX"), policy.getYPosition(

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.osd;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.prefs.CategoryChangeListener;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -64,25 +66,29 @@ public class OsdPlugin extends BaseCommandPlugin implements
     private final IdentityController identityController;
     /** The manager to use to parse colours. */
     private final ColourManager colourManager;
+    /** The window that the OSDs will be associated with. */
+    private final MainFrame mainFrame;
 
     /**
      * Creates a new instance of this plugin.
      *
+     * @param swingController The controller that owns this plugin.
      * @param pluginInfo This plugin's plugin info
      * @param identityController The controller to use to read and write settings.
      * @param commandController Command controller to register commands
      * @param colourManager The manager to use to parse colours.
      */
     public OsdPlugin(
+            final SwingController swingController,
             final PluginInfo pluginInfo,
             final IdentityController identityController,
             final CommandController commandController,
             final ColourManager colourManager) {
-        super(commandController);
         this.pluginInfo = pluginInfo;
         this.identityController = identityController;
         this.colourManager = colourManager;
-        osdManager = new OsdManager(identityController, this, colourManager);
+        this.mainFrame = swingController.getMainFrame();
+        osdManager = new OsdManager(mainFrame, identityController, this, colourManager);
         registerCommand(new OsdCommand(commandController, osdManager), OsdCommand.INFO);
     }
 
@@ -161,7 +167,9 @@ public class OsdPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void categorySelected(final PreferencesCategory category) {
-        osdWindow = new OsdWindow(identityController, this, osdManager, colourManager, -1,
+        osdWindow = new OsdWindow(
+                mainFrame,
+                identityController, this, osdManager, colourManager, -1,
                 "Please drag this OSD to position", true, x, y);
         osdWindow.setBackgroundColour(backgroundSetting.getValue());
         osdWindow.setForegroundColour(foregroundSetting.getValue());

src/com/dmdirc/addons/osd/OsdWindow.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.osd;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.Colour;
@@ -87,6 +87,7 @@ public class OsdWindow extends JDialog implements MouseListener,
     /**
      * Creates a new instance of OsdWindow.
      *
+     * @param mainFrame The window to associate with.
      * @param identityController The controller to read/write settings with.
      * @param colourManager The manager to use to parse colours.
      * @param timeout Timeout period for the window. Set to -1 to use value from
@@ -100,12 +101,12 @@ public class OsdWindow extends JDialog implements MouseListener,
      * @param osdManager The manager that owns this OSD Window
      */
     public OsdWindow(
+            final MainFrame mainFrame,
             final IdentityController identityController, final OsdPlugin plugin,
             final OsdManager osdManager, final ColourManager colourManager,
             final int timeout, final String text, final boolean config, final int x,
             final int y) {
-        super(((SwingController) plugin.getPluginInfo().getMetaData().getManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
+        super(mainFrame, false);
 
         this.colourManager = colourManager;
         this.config = config;

src/com/dmdirc/addons/serverlistdialog/ServerListDialogPlugin.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.awt.event.ActionEvent;
@@ -46,16 +45,15 @@ public class ServerListDialogPlugin extends BasePlugin implements ActionListener
     /**
      * Creates a new server list dialog plugin.
      *
-     * @param pluginManager The plugin manager to use to find the Swing UI.
+     * @param swingController The controller that will own the dialog.
      * @param performWrapper The wrapper to use for modifying performs.
      */
     public ServerListDialogPlugin(
-            final PluginManager pluginManager,
+            final SwingController swingController,
             final PerformWrapper performWrapper) {
         this.performWrapper = performWrapper;
 
-        controller = (SwingController) pluginManager.getPluginInfoByName(
-                "ui_swing").getPlugin();
+        controller = swingController;
         final JMenuItem item = new JMenuItem("Server lists");
         item.setMnemonic('l');
         item.addActionListener(this);

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.systray;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -32,7 +31,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
@@ -56,13 +55,13 @@ import java.awt.event.MouseListener;
  * The Systray plugin shows DMDirc in the user's system tray, and allows
  * notifications to be disabled.
  */
-public final class SystrayPlugin extends BaseCommandPlugin implements
+public class SystrayPlugin extends BaseCommandPlugin implements
         ActionListener, MouseListener, com.dmdirc.interfaces.ActionListener {
 
     /** The tray icon we're currently using. */
     private final TrayIcon icon;
     /** Main frame instance. */
-    private MainFrame mainFrame;
+    private final MainFrame mainFrame;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** The action controller to use. */
@@ -73,23 +72,22 @@ public final class SystrayPlugin extends BaseCommandPlugin implements
     /**
      * Creates a new system tray plugin.
      *
+     * @param swingController The controller that owns this plugin.
      * @param pluginInfo This plugin's plugin info.
      * @param actionController The action controller to use.
      * @param identityController The identity manager to read settings from.
-     * @param commandController Command controller to register commands.
      * @param urlBuilder URL builder to use to resolve icon paths.
      */
     public SystrayPlugin(
+            final SwingController swingController,
             final PluginInfo pluginInfo,
             final ActionController actionController,
             final IdentityController identityController,
-            final CommandController commandController,
             final URLBuilder urlBuilder) {
-        super(commandController);
-
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
         this.identityController = identityController;
+        this.mainFrame = swingController.getMainFrame();
 
         final MenuItem show = new MenuItem("Show/hide");
         final MenuItem quit = new MenuItem("Quit");
@@ -171,9 +169,6 @@ public final class SystrayPlugin extends BaseCommandPlugin implements
         boolean continueLoading = true;
         try {
             SystemTray.getSystemTray().add(icon);
-            mainFrame = ((SwingController) pluginInfo.getMetaData().getManager()
-                    .getPluginInfoByName("ui_swing").getPlugin())
-                    .getMainFrame();
             actionController.registerListener(this, CoreActionType.CLIENT_MINIMISED);
         } catch (AWTException ex) {
             continueLoading = false;