Use some dependency injection

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

src/com/dmdirc/addons/activewindow/ActiveWindowPlugin.java

@@ -24,16 +24,18 @@ package com.dmdirc.addons.activewindow;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.plugins.BasePlugin;
-import com.dmdirc.plugins.PluginManager;
 
 /** Plugin to provide an active window command to the Swing UI. */
 public final class ActiveWindowPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public ActiveWindowPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param controller The controller to use to find active windows
+     */
+    public ActiveWindowPlugin(final SwingController controller) {
         super();
-        registerCommand(new ActiveCommand(((SwingController) PluginManager
-                .getPluginManager().getPluginInfoByName("ui_swing")
-                .getPlugin()).getMainFrame()), ActiveCommand.INFO);
+        registerCommand(new ActiveCommand(controller.getMainFrame()),
+                ActiveCommand.INFO);
     }
 }

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -70,13 +70,15 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
     /** Our DCC Container window. */
     private PlaceholderContainer container;
 
-    /** Creates a new instance of this plugin. */
-    public DCCPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param controller The controller to register UI implementations with
+     */
+    public DCCPlugin(final SwingController controller) {
         super();
         registerCommand(new DCCCommand(this), DCCCommand.INFO);
-        final SwingWindowFactory factory = ((SwingController) PluginManager
-                .getPluginManager().getPluginInfoByName("ui_swing").getPlugin())
-                .getWindowFactory();
+        final SwingWindowFactory factory = controller.getWindowFactory();
         factory.registerImplementation(new HashSet<String>(Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
                 PlaceholderWindow.class);

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -63,7 +63,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
     private final Map<Server, RollingList<Long>> history
             = new HashMap<Server, RollingList<Long>>();
     /** Parent Swing UI. */
-    private SwingController controller;
+    private final SwingController controller;
     /** Whether or not to show a graph in the info popup. */
     private boolean showGraph = true;
     /** Whether or not to show labels on that graph. */
@@ -71,11 +71,18 @@ public final class LagDisplayPlugin extends BasePlugin implements
     /** The length of history to keep per-server. */
     private int historySize = 100;
 
+    /**
+     * Creates a new LagDisplayPlugin.
+     *
+     * @param controller The controller to add components to
+     */
+    public LagDisplayPlugin(final SwingController controller) {
+        this.controller = controller;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        controller = ((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin());
         controller.getSwingStatusBar().addComponent(panel);
         controller.getMainFrame().addSelectionListener(this);
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
@@ -93,7 +100,6 @@ public final class LagDisplayPlugin extends BasePlugin implements
         controller.getSwingStatusBar().removeComponent(panel);
         IdentityManager.getConfigIdentity().removeListener(this);
         ActionManager.getActionManager().unregisterListener(this);
-        controller = null;
     }
 
     /** Reads the plugin's global configuration settings. */

src/com/dmdirc/addons/swingdebug/SwingDebugPlugin.java

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.CheckBoxMenuItem;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.plugins.BasePlugin;
-import com.dmdirc.plugins.PluginManager;
 
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -49,7 +48,7 @@ import net.miginfocom.swing.MigLayout;
 public class SwingDebugPlugin extends BasePlugin implements ActionListener {
 
     /** Swing controller. */
-    private SwingController controller;
+    private final SwingController controller;
     /** Debug menu. */
     private JMenu debugMenu;
     /** Debug EDT menu item. */
@@ -71,11 +70,18 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
     /** System error frame. */
     private JDialog errorFrame;
 
+    /**
+     * Creates a new SwingDebugPlugin.
+     *
+     * @param controller The controller to add debug entries to
+     */
+    public SwingDebugPlugin(final SwingController controller) {
+        this.controller = controller;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        controller = (SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin();
         try {
             sysout = System.out;
             syserr = System.err;
@@ -127,7 +133,6 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         outFrame = null;
         errorFrame = null;
         controller.getMainFrame().getJMenuBar().remove(debugMenu);
-        controller = null;
     }
 
     /**