Desingleton PluginManager (and as a side-effect, ServerManager).

Depends-On: I4a3d9b78a5f80aab0330d0906e8c76d00813c97c
Change-Id: I72fe837b5ea2352ae0c695948336efcdd92c09c8
Reviewed-on: http://gerrit.dmdirc.com/2522
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -89,6 +89,14 @@ public final class LagDisplayPlugin extends BasePlugin implements
         panel = new LagDisplayPanel(this, controller);
     }
 
+    /**
+     * Get our PluginInfo.
+     * @return Our PluginInfo.
+     */
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -74,7 +73,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        final List<Server> servers = ServerManager.getServerManager().getServers();
+        final List<Server> servers = getController().getMain().getServerManager().getServers();
 
         if (servers.isEmpty()) {
             panel.add(new JLabel("No open servers."));

src/com/dmdirc/addons/mediasource_dcop/AmarokSource.java

@@ -32,10 +32,22 @@ import java.util.List;
  */
 public class AmarokSource implements MediaSource {
 
+    /** Our parent plugin. */
+    private final DcopMediaSourcePlugin myPlugin;
+
+    /**
+     * Create a new instance of this source.
+     *
+     * @param myPlugin The plugin that owns this source.
+     */
+    public AmarokSource(final DcopMediaSourcePlugin myPlugin) {
+        this.myPlugin = myPlugin;
+    }
+
     /** {@inheritDoc} */
     @Override
     public MediaSourceState getState() {
-        final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop amarok player status");
+        final List<String> res = myPlugin.getDcopResult("dcop amarok player status");
         if (res.isEmpty()) {
             return MediaSourceState.CLOSED;
         } else {
@@ -67,44 +79,43 @@ public class AmarokSource implements MediaSource {
     /** {@inheritDoc} */
     @Override
     public String getArtist() {
-        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player artist").get(0);
+        return myPlugin.getDcopResult("dcop amarok player artist").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getTitle() {
-        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player title").get(0);
+        return myPlugin.getDcopResult("dcop amarok player title").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getAlbum() {
-        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player album").get(0);
+        return myPlugin.getDcopResult("dcop amarok player album").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getLength() {
-        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player totalTime").get(0);
+        return myPlugin.getDcopResult("dcop amarok player totalTime").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getTime() {
-        return DcopMediaSourcePlugin.getDcopResult(
-                "dcop amarok player currentTime").get(0);
+        return myPlugin.getDcopResult("dcop amarok player currentTime").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getFormat() {
-        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player type").get(0);
+        return myPlugin.getDcopResult("dcop amarok player type").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getBitrate() {
-        return DcopMediaSourcePlugin.getDcopResult("dcop amarok player bitrate").get(0);
+        return myPlugin.getDcopResult("dcop amarok player bitrate").get(0);
     }
 
 }

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

@@ -40,15 +40,19 @@ public class DcopMediaSourcePlugin extends BasePlugin
     /** Media sources. */
     private final List<MediaSource> sources;
 
+    /** This plugins plugin manager. */
+    private final PluginManager pluginManager;
+
     /**
      * Creates a new instance of DcopMediaSourcePlugin.
      */
-    public DcopMediaSourcePlugin() {
+    public DcopMediaSourcePlugin(final PluginManager pluginManager) {
         super();
+        this.pluginManager = pluginManager;
         sources = new ArrayList<MediaSource>();
-        sources.add(new AmarokSource());
-        sources.add(new KaffeineSource());
-        sources.add(new NoatunSource());
+        sources.add(new AmarokSource(this));
+        sources.add(new KaffeineSource(this));
+        sources.add(new NoatunSource(this));
     }
 
     /**
@@ -58,10 +62,10 @@ public class DcopMediaSourcePlugin extends BasePlugin
      * @return The result of the dcop query, line-by-line
      */
     @SuppressWarnings("unchecked")
-    protected static List<String> getDcopResult(final String query) {
+    protected List<String> getDcopResult(final String query) {
         try {
-            return (List<String>) PluginManager.getPluginManager()
-                    .getExportedService("dcop").execute(query);
+            return (List<String>) pluginManager.getExportedService("dcop")
+                    .execute(query);
         } catch (NoSuchProviderException nspe) {
             return new ArrayList<String>();
         }

src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java

@@ -32,10 +32,22 @@ import java.util.List;
  */
 public class KaffeineSource implements MediaSource {
 
+    /** Our parent plugin. */
+    private final DcopMediaSourcePlugin myPlugin;
+
+    /**
+     * Create a new instance of this source.
+     *
+     * @param myPlugin The plugin that owns this source.
+     */
+    public KaffeineSource(final DcopMediaSourcePlugin myPlugin) {
+        this.myPlugin = myPlugin;
+    }
+
     /** {@inheritDoc} */
     @Override
     public MediaSourceState getState() {
-        final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop kaffeine KaffeineIface isPlaying");
+        final List<String> res = myPlugin.getDcopResult("dcop kaffeine KaffeineIface isPlaying");
         if (res.isEmpty()) {
             return MediaSourceState.CLOSED;
         } else {
@@ -57,35 +69,32 @@ public class KaffeineSource implements MediaSource {
     /** {@inheritDoc} */
     @Override
     public String getArtist() {
-        return DcopMediaSourcePlugin.getDcopResult(
-                "dcop kaffeine KaffeineIface artist").get(0);
+        return myPlugin.getDcopResult("dcop kaffeine KaffeineIface artist").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getTitle() {
-        return DcopMediaSourcePlugin.getDcopResult(
-                "dcop kaffeine KaffeineIface title").get(0);
+        return myPlugin.getDcopResult("dcop kaffeine KaffeineIface title").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getAlbum() {
-        return DcopMediaSourcePlugin.getDcopResult(
-                "dcop kaffeine KaffeineIface album").get(0);
+        return myPlugin.getDcopResult("dcop kaffeine KaffeineIface album").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getLength() {
-        return duration(Integer.parseInt(DcopMediaSourcePlugin.getDcopResult(
+        return duration(Integer.parseInt(myPlugin.getDcopResult(
                 "dcop kaffeine KaffeineIface getLength").get(0)));
     }
 
     /** {@inheritDoc} */
     @Override
     public String getTime() {
-        return duration(Integer.parseInt(DcopMediaSourcePlugin.getDcopResult(
+        return duration(Integer.parseInt(myPlugin.getDcopResult(
                 "dcop kaffeine KaffeineIface getTimePos").get(0)));
     }
 

src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java

@@ -32,10 +32,22 @@ import java.util.List;
  */
 public class NoatunSource implements MediaSource {
 
+    /** Our parent plugin. */
+    private final DcopMediaSourcePlugin myPlugin;
+
+    /**
+     * Create a new instance of this source.
+     *
+     * @param myPlugin The plugin that owns this source.
+     */
+    public NoatunSource(final DcopMediaSourcePlugin myPlugin) {
+        this.myPlugin = myPlugin;
+    }
+
     /** {@inheritDoc} */
     @Override
     public MediaSourceState getState() {
-        final List<String> res = DcopMediaSourcePlugin.getDcopResult("dcop noatun Noatun state");
+        final List<String> res = myPlugin.getDcopResult("dcop noatun Noatun state");
         if (res.isEmpty()) {
             return MediaSourceState.CLOSED;
         } else {
@@ -67,8 +79,7 @@ public class NoatunSource implements MediaSource {
     /** {@inheritDoc} */
     @Override
     public String getArtist() {
-        final String result = DcopMediaSourcePlugin.getDcopResult(
-                "dcop noatun Noatun title").get(0);
+        final String result = myPlugin.getDcopResult("dcop noatun Noatun title").get(0);
         if (result.indexOf(" - ") == -1) {
             return "";
         }
@@ -78,8 +89,7 @@ public class NoatunSource implements MediaSource {
     /** {@inheritDoc} */
     @Override
     public String getTitle() {
-        final String result = DcopMediaSourcePlugin.getDcopResult(
-                "dcop noatun Noatun title").get(0);
+        final String result = myPlugin.getDcopResult("dcop noatun Noatun title").get(0);
         if (result.indexOf(" - ") == -1) {
             return "";
         }
@@ -95,14 +105,13 @@ public class NoatunSource implements MediaSource {
     /** {@inheritDoc} */
     @Override
     public String getLength() {
-        return DcopMediaSourcePlugin.getDcopResult(
-                "dcop noatun Noatun lengthString").get(0);
+        return myPlugin.getDcopResult("dcop noatun Noatun lengthString").get(0);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getTime() {
-        return duration(Integer.parseInt(DcopMediaSourcePlugin.getDcopResult(
+        return duration(Integer.parseInt(myPlugin.getDcopResult(
                 "dcop noatun Noatun position").get(0)) /1000);
     }
 

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

@@ -28,7 +28,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BaseFileDependantPlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.io.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
@@ -45,6 +44,9 @@ public class WindowsMediaSourcePlugin extends BaseFileDependantPlugin
     /** Media sources. */
     private final List<MediaSource> sources;
 
+    /** My plugin info. */
+    private final PluginInfo pluginInfo;
+
     /**
      * Creates a new instance of DcopMediaSourcePlugin.
      *
@@ -52,6 +54,7 @@ public class WindowsMediaSourcePlugin extends BaseFileDependantPlugin
      */
     public WindowsMediaSourcePlugin(final PluginInfo pluginInfo) {
         super(pluginInfo.getMetaData());
+        this.pluginInfo = pluginInfo;
         sources = new ArrayList<MediaSource>();
         sources.add(new DllSource(this, "Winamp", true));
         sources.add(new DllSource(this, "iTunes", false));
@@ -93,7 +96,7 @@ public class WindowsMediaSourcePlugin extends BaseFileDependantPlugin
     @Override
     public void onLoad() {
         // Extract GetMediaInfo.exe and required DLLs
-        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("windowsmediasource");
+        final PluginInfo pi = pluginInfo.getMetaData().getManager().getPluginInfoByName("windowsmediasource");
 
         // This shouldn't actually happen, but check to make sure.
         if (pi == null) {

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.nickcolours;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.plugins.PluginManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -77,7 +76,7 @@ public class NickColourInputDialog extends StandardDialog
     public NickColourInputDialog(final NickColourPanel panel, final int row,
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
-        super(((SwingController) PluginManager.getPluginManager()
+        super(((SwingController) panel.getPlugin().getPluginInfo().getMetaData().getManager()
                 .getPluginInfoByName("ui_swing").getPlugin()), false);
 
         this.panel = panel;

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

@@ -139,6 +139,15 @@ public class NickColourPanel extends JPanel implements ActionListener,
         deleteButton.setEnabled(false);
     }
 
+    /**
+     * Get an instance of the plugin that owns us.
+     *
+     * @return Our plugin.
+     */
+    public NickColourPlugin getPlugin() {
+        return plugin;
+    }
+
     /**
      * {@inheritDoc}
      *

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

@@ -43,7 +43,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
@@ -80,6 +79,15 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
         this.pluginInfo = pluginInfo;
     }
 
+    /**
+     * Get our PluginInfo
+     *
+     * @return our PluginInfo
+     */
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
@@ -270,7 +278,7 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
                     @Override
                     public NickColourPanel call() {
                         return new NickColourPanel(
-                                (SwingController) PluginManager.getPluginManager()
+                                (SwingController) pluginInfo.getMetaData().getManager()
                                 .getPluginInfoByName("ui_swing").getPlugin(),
                                 NickColourPlugin.this);
                     }

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -32,7 +32,6 @@ import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,7 +69,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
         loadSettings();
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.PLUGIN_LOADED, CoreActionType.PLUGIN_UNLOADED);
-        for (PluginInfo target : PluginManager.getPluginManager()
+        for (PluginInfo target : pluginInfo.getMetaData().getManager()
                 .getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
@@ -171,7 +170,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
      * @return The method with the specified name or null if none were found.
      */
     public PluginInfo getMethod(final String name) {
-        return PluginManager.getPluginManager().getPluginInfoByName(name);
+        return pluginInfo.getMetaData().getManager().getPluginInfoByName(name);
     }
 
     /**
@@ -182,7 +181,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
     public List<PluginInfo> getMethods() {
         final List<PluginInfo> plugins = new ArrayList<PluginInfo>();
         for (String method : methods) {
-            plugins.add(PluginManager.getPluginManager()
+            plugins.add(pluginInfo.getMetaData().getManager()
                     .getPluginInfoByName(method));
         }
         return plugins;
@@ -208,7 +207,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
         }
         for (String method : order) {
             if (methods.contains(method)) {
-                return PluginManager.getPluginManager().getPluginInfoByName(
+                return pluginInfo.getMetaData().getManager().getPluginInfoByName(
                     method);
             }
         }

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -34,7 +34,6 @@ import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -85,7 +84,7 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
         actionController.registerListener(this, CoreActionType.PLUGIN_LOADED,
                 CoreActionType.PLUGIN_UNLOADED);
 
-        for (PluginInfo target : PluginManager.getPluginManager().getPluginInfos()) {
+        for (PluginInfo target : pluginInfo.getMetaData().getManager().getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
             }

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

@@ -71,6 +71,15 @@ public final class OsdPlugin extends BasePlugin implements
         registerCommand(new OsdCommand(osdManager), OsdCommand.INFO);
     }
 
+    /**
+     * Get our PluginInfo.
+     *
+     * @return our PluginInfo.
+     */
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.osd;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -96,7 +95,7 @@ public class OsdWindow extends JDialog implements MouseListener,
      */
     public OsdWindow(final int timeout, final String text, final boolean config, final int x,
             final int y, final OsdPlugin plugin, final OsdManager osdManager) {
-        super(((SwingController) PluginManager.getPluginManager()
+        super(((SwingController) plugin.getPluginInfo().getMetaData().getManager()
                 .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
 
         this.config = config;

src/com/dmdirc/addons/parser_twitter/actions/TwitterActionComponents.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.parser_twitter.actions;
 
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.addons.parser_twitter.Twitter;
 import com.dmdirc.addons.parser_twitter.api.TwitterStatus;
 import com.dmdirc.addons.parser_twitter.api.TwitterUser;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import com.dmdirc.parser.interfaces.Parser;
 
 /**
@@ -43,10 +43,10 @@ public enum TwitterActionComponents implements ActionComponent {
 
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) {
-            final long id = Long.parseLong(((String) argument).substring(1));
+        public Object get(final ActionComponentArgument arg) {
+            final long id = Long.parseLong(((String) arg.getObject()).substring(1));
 
-            for (Server server : ServerManager.getServerManager().getServers()) {
+            for (Server server : arg.getMain().getServerManager().getServers()) {
                 final Parser parser = server.getParser();
 
                 if (parser instanceof Twitter) {
@@ -86,8 +86,8 @@ public enum TwitterActionComponents implements ActionComponent {
 
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) {
-            return ((TwitterStatus) argument).getUser();
+        public Object get(final ActionComponentArgument arg) {
+            return ((TwitterStatus) arg.getObject()).getUser();
         }
 
         /** {@inheritDoc} */
@@ -115,8 +115,8 @@ public enum TwitterActionComponents implements ActionComponent {
 
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) {
-            return ((TwitterUser) argument).getScreenName();
+        public Object get(final ActionComponentArgument arg) {
+            return ((TwitterUser) arg.getObject()).getScreenName();
         }
 
         /** {@inheritDoc} */

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.relaybot;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -88,7 +87,7 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
 
         // Add ourself to all currently known channels that we should be
         // connected with.
-        for (Server server : ServerManager.getServerManager().getServers()) {
+        for (Server server : getPluginManager().getMain().getServerManager().getServers()) {
             final Parser parser = server.getParser();
             if (parser instanceof IRCParser && !(parser.getCallbackManager() instanceof RelayCallbackManager)) {
                 new RelayCallbackManager(this, (IRCParser) parser);
@@ -99,13 +98,22 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
         }
     }
 
+    /**
+     * Get our plugin manager.
+     *
+     * @return Our plugin manager.
+     */
+    protected PluginManager getPluginManager() {
+        return pluginInfo.getMetaData().getManager();
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         ActionManager.getActionManager().unregisterListener(this);
 
         // Remove RelayCallbackManagers
-        for (Server server : ServerManager.getServerManager().getServers()) {
+        for (Server server : getPluginManager().getMain().getServerManager().getServers()) {
             final Parser parser = server.getParser();
             if (parser instanceof IRCParser && parser.getCallbackManager() instanceof RelayCallbackManager) {
                 ((RelayCallbackManager) parser.getCallbackManager()).onSocketClosed(parser, new Date());
@@ -174,7 +182,7 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
     public void configChanged(final String domain, final String key) {
         final boolean wasUnset = !IdentityManager.getIdentityManager().getGlobalConfiguration().hasOptionString(domain, key);
 
-        for (Server server : ServerManager.getServerManager().getServers()) {
+        for (Server server : getPluginManager().getMain().getServerManager().getServers()) {
             if (server.hasChannel(key)) {
                 final Channel chan = server.getChannel(key);
                 if (wasUnset) {
@@ -290,7 +298,7 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
             /** {@inheritDoc} */
             @Override
             public RelayChannelPanel call() {
-                return new RelayChannelPanel(PluginManager.getPluginManager()
+                return new RelayChannelPanel(getPluginManager()
                         .getPluginInfoByName("ui_swing").getPlugin(),
                         RelayBotPlugin.this);
             }

src/com/dmdirc/addons/relaybot/RelayChannelHandler.java

@@ -33,7 +33,6 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.lang.reflect.Field;
@@ -213,7 +212,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
     */
     private void colourClient(final ChannelClientInfo channelClient) {
         // Use nick colour plugin to colour the client if available.
-        final PluginInfo nickColour = PluginManager.getPluginManager()
+        final PluginInfo nickColour = myPlugin.getPluginManager()
                 .getPluginInfoByName("nickcolour");
 
         final boolean fullColour = IdentityManager.getIdentityManager()

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

@@ -83,7 +83,7 @@ public final class ServerListDialog extends StandardDialog implements
         super(controller, controller.getMainFrame(), ModalityType.MODELESS);
 
         setTitle("Server List");
-        model = new ServerListModel();
+        model = new ServerListModel(controller.getPluginManager(), controller.getMain().getServerManager());
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
         connectButton = new JButton("Connect");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.actions.wrappers.PerformType;
 import com.dmdirc.logger.ErrorLevel;
@@ -30,6 +31,7 @@ import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.serverlists.ServerList;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.io.IOException;
@@ -45,16 +47,23 @@ import javax.swing.tree.DefaultTreeModel;
 public class ServerListModel {
 
     /** Server list. */
-    private final ServerList list = new ServerList();
+    private final ServerList list;
     /** Listener list. */
     private final ListenerList listeners;
     /** Active server item. */
     private ServerGroupItem activeItem;
+    /** ServerManager that ServerEntrys use to create servers */
+    private final ServerManager serverManager;
 
     /**
      * Creates a new server list model.
+     *
+     * @param pluginManager PluginManager currently in use.
+     * @param serverManager ServerManager currently in use.
      */
-    public ServerListModel() {
+    public ServerListModel(final PluginManager pluginManager, final ServerManager serverManager) {
+        this.serverManager = serverManager;
+        list = new ServerList(pluginManager, serverManager);
         listeners = new ListenerList();
     }
 
@@ -217,7 +226,7 @@ public class ServerListModel {
      */
     public void addEntry(final ServerGroup parentGroup, final String entryName,
             final URI url) {
-        final ServerGroupItem sg = new ServerEntry(parentGroup, entryName, url,
+        final ServerGroupItem sg = new ServerEntry(serverManager, parentGroup, entryName, url,
                 null);
         parentGroup.addItem(sg);
         for (ServerListListener listener : listeners.get(

src/com/dmdirc/addons/serverlists/ServerEntry.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.serverlists;
 
 import com.dmdirc.Server;
 
+import com.dmdirc.ServerManager;
 import java.net.URI;
 
 /**
@@ -40,6 +41,9 @@ public class ServerEntry extends ServerGroupItemBase {
     /** The group that owns this entry. */
     private final ServerGroup group;
 
+    /** The manager to use to create new servers. */
+    private final ServerManager serverManager;
+
     /**
      * Creates a new server entry.
      *
@@ -48,8 +52,10 @@ public class ServerEntry extends ServerGroupItemBase {
      * @param address The address of this server
      * @param profile The name of the profile to be used by this server
      */
-    public ServerEntry(final ServerGroup group, final String name,
+    public ServerEntry(final ServerManager serverManager,
+            final ServerGroup group, final String name,
             final URI address, final String profile) {
+        this.serverManager = serverManager;
         setName(name);
         setProfile(profile);
         this.address = address;
@@ -91,7 +97,7 @@ public class ServerEntry extends ServerGroupItemBase {
     /** {@inheritDoc} */
     @Override
     public void connect() {
-        final Server server = new Server(address, getProfileIdentity());
+        final Server server = new Server(serverManager, address, getProfileIdentity());
         server.connect();
     }
 

src/com/dmdirc/addons/serverlists/ServerList.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.serverlists;
 
 import com.dmdirc.Precondition;
+import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.io.ServerGroupReader;
 import com.dmdirc.addons.serverlists.io.ServerGroupWriter;
 import com.dmdirc.addons.serverlists.service.ServerListServiceProvider;
@@ -30,6 +31,7 @@ import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityListener;
 import com.dmdirc.config.IdentityManager;
 
+import com.dmdirc.plugins.PluginManager;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,17 +50,24 @@ public class ServerList implements IdentityListener {
     private final Map<ServerGroup, ServerGroupWriter> groups
             = new HashMap<ServerGroup, ServerGroupWriter>();
 
+    /** ServerManager that ServerEntrys use to create servers */
+    private final ServerManager serverManager;
+
     /**
      * Creates a new ServerList and loads groups and servers.
+     *
+     * @param pluginManager Plugin Manager to use.
+     * @param serverManager Server Manager to use.
      */
-    public ServerList() {
+    public ServerList(final PluginManager pluginManager, final ServerManager serverManager) {
+        this.serverManager = serverManager;
         IdentityManager.getIdentityManager().registerIdentityListener("servergroup", this);
 
         for (Identity identity : IdentityManager.getIdentityManager().getIdentitiesByType("servergroup")) {
             identityAdded(identity);
         }
 
-        new ServerListServiceProvider(this).register();
+        new ServerListServiceProvider(pluginManager, this).register();
     }
 
     /**
@@ -136,7 +145,7 @@ public class ServerList implements IdentityListener {
     @Override
     public void identityAdded(final Identity identity) {
         try {
-            final ServerGroupReader reader = new ServerGroupReader(identity);
+            final ServerGroupReader reader = new ServerGroupReader(serverManager, identity);
             addServerGroup(reader.read(), reader.getWriter());
         } catch (IllegalArgumentException ex) {
             // Silently ignore

src/com/dmdirc/addons/serverlists/io/ServerEntryReader.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.serverlists.io;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.config.Identity;
@@ -39,14 +40,18 @@ public class ServerEntryReader {
     /** The identity to read entries from. */
     private final Identity identity;
 
+    /** ServerManager that ServerEntrys use to create servers */
+    private final ServerManager serverManager;
+
     /**
      * Creates a new Server Entry Reader which will read from the specified
      * identity.
      *
      * @param identity The identity which defines our server entries
      */
-    public ServerEntryReader(final Identity identity) {
+    public ServerEntryReader(final ServerManager serverManager, final Identity identity) {
         this.identity = identity;
+        this.serverManager = serverManager;
     }
 
     /**
@@ -70,7 +75,7 @@ public class ServerEntryReader {
         final String serverName = identity.getOption(name, "name");
         final URI serverURI = new URI(identity.getOption(name, "address"));
 
-        return new ServerEntry(group, serverName, serverURI, null);
+        return new ServerEntry(serverManager, group, serverName, serverURI, null);
     }
 
 }

src/com/dmdirc/addons/serverlists/io/ServerGroupReader.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.serverlists.io;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.config.Identity;
 
@@ -48,9 +49,9 @@ public class ServerGroupReader {
      *
      * @param identity The identity describing the server group
      */
-    public ServerGroupReader(final Identity identity) {
+    public ServerGroupReader(final ServerManager serverManager, final Identity identity) {
         this.identity = identity;
-        this.entryReader = new ServerEntryReader(identity);
+        this.entryReader = new ServerEntryReader(serverManager, identity);
     }
 
     /**

src/com/dmdirc/addons/serverlists/service/ServerListServiceProvider.java

@@ -51,15 +51,20 @@ public class ServerListServiceProvider implements ServiceProvider {
     /** The services that this provider providers. */
     private final List<Service> services;
 
+    /** Plugin Manager */
+    private final PluginManager pluginManager;
+
     /**
      * Creates a new server list service provider.
      *
+     * @param pluginManager The PluginManager to use.
      * @param serverList The {@link ServerList} to retrieve items from
      */
-    public ServerListServiceProvider(final ServerList serverList) {
+    public ServerListServiceProvider(final PluginManager pluginManager, final ServerList serverList) {
         this.serverList = serverList;
+        this.pluginManager = pluginManager;
         this.services = Arrays.asList(new Service[] {
-           PluginManager.getPluginManager().getService("parser", "serverlist", true)
+           pluginManager.getService("parser", "serverlist", true)
         });
     }
 
@@ -145,7 +150,7 @@ public class ServerListServiceProvider implements ServiceProvider {
      * @return A corresponding parser instance
      */
     protected Parser getParserForItem(final MyInfo myInfo, final ServerGroupItem item) {
-        return new ParserFactory().getParser(myInfo, item.getAddress());
+        return new ParserFactory(pluginManager).getParser(myInfo, item.getAddress());
     }
 
 }

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

@@ -35,7 +35,6 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.validators.ValidationResponse;
@@ -159,7 +158,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
         boolean continueLoading = true;
         try {
             SystemTray.getSystemTray().add(icon);
-            mainFrame = ((SwingController) PluginManager.getPluginManager()
+            mainFrame = ((SwingController) pluginInfo.getMetaData().getManager()
                     .getPluginInfoByName("ui_swing").getPlugin())
                     .getMainFrame();
             actionController.registerListener(this, CoreActionType.CLIENT_MINIMISED);

src/com/dmdirc/addons/ui_dummy/DummyChannelWindow.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Channel;
+import com.dmdirc.interfaces.ui.UIController;
 
 /**
  * Dummy channel window, used for testing.
@@ -32,9 +33,10 @@ public final class DummyChannelWindow extends DummyInputWindow {
     /**
      * Instantiates a new DummyChannelWindow.
      *
+     * @param controller Parent Controller
      * @param parent Parent channel
      */
-    public DummyChannelWindow(final Channel parent) {
-        super(parent);
+    public DummyChannelWindow(final UIController controller, final Channel parent) {
+        super(controller, parent);
     }
 }

src/com/dmdirc/addons/ui_dummy/DummyController.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
@@ -37,14 +38,24 @@ import java.net.URI;
  */
 public final class DummyController extends BasePlugin implements UIController {
 
+    /** The main that owns us. */
+    private final Main main;
+
     /**
      * Creates a new instance of DummyController.
      */
-    public DummyController() {
+    public DummyController(final Main main) {
         super();
+        this.main = main;
         StatusBarManager.getStatusBarManager().registerStatusBar(new DummyStatusBar());
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Main getMain() {
+        return main;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {

src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java

@@ -26,6 +26,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.UIController;
 
 /**
  * Dummy input handler.
@@ -36,14 +37,16 @@ public class DummyInputHandler extends InputHandler {
      * Creates a new instance of InputHandler. Adds listeners to the target
      * that we need to operate.
      *
+     * @param controller The controller that owns us.
      * @param target The text field this input handler is dealing with.
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public DummyInputHandler(final InputField target,
+    public DummyInputHandler(final UIController controller,
+            final InputField target,
             final CommandParser commandParser,
             final WritableFrameContainer parentWindow) {
-        super(target, commandParser, parentWindow);
+        super(controller, target, commandParser, parentWindow);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -35,19 +35,23 @@ public class DummyInputWindow implements InputWindow {
     /** Our container. */
     private final WritableFrameContainer container;
 
+    /** Our Controller. */
+    private final UIController controller;
+
     /**
      * Instantiates a new DummyInputWindow.
      *
      * @param owner Parent window
      */
-    public DummyInputWindow(final WritableFrameContainer owner) {
+    public DummyInputWindow(final UIController controller, final WritableFrameContainer owner) {
+        this.controller = controller;
         this.container = owner;
     }
 
     /** {@inheritDoc} */
     @Override
     public InputHandler getInputHandler() {
-        return new DummyInputHandler(new DummyInputField(), null,
+        return new DummyInputHandler(controller, new DummyInputField(), null,
                 getContainer());
     }
 
@@ -60,7 +64,7 @@ public class DummyInputWindow implements InputWindow {
     /** {@inheritDoc} */
     @Override
     public UIController getController() {
-        return new DummyController();
+        return controller;
     }
 
 }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
@@ -112,6 +111,8 @@ public final class Apple implements InvocationHandler, ActionListener {
     private MenuBar menuBar = null;
     /** Has the CLIENT_OPENED action been called? */
     private boolean clientOpened = false;
+    /** Our swing controller. */
+    private final SwingController controller;
 
     /**
      * Create the Apple class.
@@ -127,8 +128,9 @@ public final class Apple implements InvocationHandler, ActionListener {
      *
      * @param configManager Config manager
      */
-    public Apple(final ConfigManager configManager) {
+    public Apple(final ConfigManager configManager, final SwingController controller) {
         this.configManager = configManager;
+        this.controller = controller;
         if (isApple()) {
             try {
                 System.loadLibrary("DMDirc-Apple"); // NOPMD
@@ -477,7 +479,7 @@ public final class Apple implements InvocationHandler, ActionListener {
             synchronized (addresses) {
                 clientOpened = true;
                 for (final URI addr : addresses) {
-                    ServerManager.getServerManager().connectToAddress(addr);
+                    controller.getMain().getServerManager().connectToAddress(addr);
                 }
                 addresses.clear();
             }
@@ -508,7 +510,7 @@ public final class Apple implements InvocationHandler, ActionListener {
                         Thread.currentThread().setContextClassLoader(
                                 ClassLoader.getSystemClassLoader());
                     }
-                    ServerManager.getServerManager().connectToAddress(addr);
+                    controller.getMain().getServerManager().connectToAddress(addr);
                 } else {
                     addresses.add(addr);
                 }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -522,7 +521,7 @@ public final class MainFrame extends JFrame implements WindowListener,
             protected Void doInBackground() {
                 ActionManager.getActionManager().triggerEvent(
                         CoreActionType.CLIENT_CLOSING, null);
-                ServerManager.getServerManager().closeAll(controller
+                controller.getMain().getServerManager().closeAll(controller
                         .getGlobalConfig().getOption("general", "closemessage"));
                 controller.getGlobalIdentity().setOption("ui",
                         "frameManagerSize",

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

@@ -176,7 +176,7 @@ public class SwingController extends BasePlugin implements UIController {
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getGlobalConfigIdentity();
         addonIdentity = identityManager.getGlobalAddonIdentity();
-        apple = new Apple(getGlobalConfig());
+        apple = new Apple(getGlobalConfig(), this);
         iconManager = new IconManager(globalConfig);
         prefsComponentFactory = new PrefsComponentFactory(this);
         dialogManager = new DialogManager(this);

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

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -52,7 +51,7 @@ public class ChannelSettings extends Command implements
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        ((SwingController) PluginManager.getPluginManager()
+        ((SwingController) getController().getMain().getPluginManager()
                 .getPluginInfoByName("ui_swing").getPlugin())
                 .showChannelSettingsDialog(((ChannelCommandContext) context)
                 .getChannel());

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

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -52,7 +51,7 @@ public class ServerSettings extends Command implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        ((SwingController) PluginManager.getPluginManager()
+        ((SwingController) getController().getMain().getPluginManager()
                 .getPluginInfoByName("ui_swing").getPlugin())
                 .showServerSettingsDialog(context.getSource().getServer());
     }

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

@@ -122,7 +122,7 @@ public class TopicBar extends JComponent implements ActionListener,
                 channelFrame.getIconManager().getIcon("close"),
                 channelFrame.getIconManager().getIcon("close-active"));
 
-        final SwingInputHandler handler = new SwingInputHandler(topicText,
+        final SwingInputHandler handler = new SwingInputHandler(controller, topicText,
                 channelFrame.getContainer().getCommandParser(),
                 channelFrame.getContainer());
         handler.setTypes(true, false, true, false);

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.components.addonbrowser;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.util.io.Downloader;
 
@@ -68,11 +67,11 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
                     ActionManager.installActionPack(file.getAbsolutePath());
                     break;
                 case TYPE_PLUGIN:
-                    final File newFile = new File(PluginManager
+                    final File newFile = new File(controller.getMain()
                             .getPluginManager().getDirectory(),
                             info.getTitle() + ".jar");
                     if (file.renameTo(newFile)) {
-                        PluginManager.getPluginManager().addPlugin(
+                        controller.getMain().getPluginManager().addPlugin(
                                 newFile.getName());
                     } else {
                         return "Unable to install addon, failed to move file: "

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.config.Identity;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdateChecker;
@@ -159,7 +158,7 @@ public final class AddonToggle {
                     } else {
                         pi.unloadPlugin();
                     }
-                    PluginManager.getPluginManager().updateAutoLoad(pi);
+                    pi.getMetaData().getManager().updateAutoLoad(pi);
                     if (getID() != -1) {
                         if (getUpdateState()) {
                             identity.unsetOption("updater", "enable-addon-"

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -29,7 +29,6 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 
 import java.awt.Window;
 import java.util.ArrayList;
@@ -64,7 +63,7 @@ public class PluginPanel extends AddonPanel implements ActionListener {
 
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.PLUGIN_REFRESH);
-        PluginManager.getPluginManager().refreshPlugins();
+        controller.getMain().getPluginManager().refreshPlugins();
     }
 
     /** {@inheritDoc} */
@@ -72,7 +71,7 @@ public class PluginPanel extends AddonPanel implements ActionListener {
     protected JTable populateList(final JTable table) {
         final List<PluginInfo> list = new ArrayList<PluginInfo>();
         final List<PluginInfo> sortedList = new ArrayList<PluginInfo>();
-        list.addAll(PluginManager.getPluginManager().getPluginInfos());
+        list.addAll(controller.getMain().getPluginManager().getPluginInfos());
         Collections.sort(list);
         for (final PluginInfo plugin : list) {
             if (plugin.getMetaData().getParents().length == 0) {

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -131,7 +131,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      */
     private void initComponents() {
         inputField = new SwingInputField(this, getController().getMainFrame());
-        inputHandler = new SwingInputHandler(inputField,
+        inputHandler = new SwingInputHandler(controller, inputField,
                 getContainer().getCommandParser(), getContainer());
         inputHandler.addValidationListener(inputField);
         inputHandler.setTabCompleter(((WritableFrameContainer) frameParent).

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
@@ -51,14 +52,16 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      * Creates a new instance of InputHandler. Adds listeners to the target
      * that we need to operate.
      *
+     * @param controller The UIController that owns this input handler.
      * @param target The text field this input handler is dealing with.
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public SwingInputHandler(final InputField target,
+    public SwingInputHandler(final UIController controller,
+            final InputField target,
             final CommandParser commandParser,
             final WritableFrameContainer parentWindow) {
-        super(target, commandParser, parentWindow);
+        super(controller, target, commandParser, parentWindow);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/menubar/HelpMenu.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
@@ -96,7 +95,7 @@ public class HelpMenu extends JMenu implements ActionListener {
         if (e.getActionCommand().equals("About")) {
             controller.showDialog(AboutDialog.class);
         } else if (e.getActionCommand().equals("JoinDevChat")) {
-            ServerManager.getServerManager().joinDevChat();
+            controller.getMain().getServerManager().joinDevChat();
         } else if (e.getActionCommand().equals("feedback")) {
             controller.showDialog(FeedbackDialog.class);
         }

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.Invite;
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -100,7 +99,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         accept.setActionCommand("acceptAll");
         accept.addActionListener(this);
 
-        for (final Server server : ServerManager.getServerManager().getServers()) {
+        for (final Server server : controller.getMain().getServerManager().getServers()) {
             server.addInviteListener(this);
         }
 

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.SendWorker;
@@ -181,7 +180,7 @@ public final class FeedbackDialog extends StandardDialog implements
         final StringBuilder serverInfo = new StringBuilder();
         final StringBuilder dmdircInfo = new StringBuilder();
         if (serverCheckbox.isSelected()) {
-            for (Server server : ServerManager.getServerManager()
+            for (Server server : getController().getMain().getServerManager()
                     .getServers()) {
                 if (server.getState().isDisconnected()) {
                     continue;

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -126,7 +125,7 @@ public final class NewServerDialog extends StandardDialog implements
 
         serverField.requestFocusInWindow();
 
-        if (ServerManager.getServerManager().numServers() == 0 ||
+        if (getController().getMain().getServerManager().numServers() == 0 ||
                 getController().getMainFrame().getActiveFrame() == null) {
             newServerWindowCheck.setSelected(true);
             newServerWindowCheck.setEnabled(false);
@@ -248,13 +247,13 @@ public final class NewServerDialog extends StandardDialog implements
 
             // Open in a new window?
             if (newServerWindowCheck.isSelected()
-                    || ServerManager.getServerManager().numServers() == 0
+                    || getController().getMain().getServerManager().numServers() == 0
                     || getController().getMainFrame().getActiveFrame() == null) {
 
                 new LoggingSwingWorker<Void, Void>() {
                     @Override
                     protected Void doInBackground() {
-                        final Server server = new Server(address, profile);
+                        final Server server = new Server(getController().getMain().getServerManager(), address, profile);
                         server.connect();
                         return null;
                     }
@@ -269,7 +268,7 @@ public final class NewServerDialog extends StandardDialog implements
                     @Override
                     protected Void doInBackground() {
                         if (server == null) {
-                            final Server newServer = new Server(address, profile);
+                            final Server newServer = new Server(getController().getMain().getServerManager(), address, profile);
                             newServer.connect();
                         } else {
                             server.connect(address, profile);

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

@@ -78,8 +78,7 @@ public final class AboutDialog extends StandardDialog implements
 
         tabbedPane.add("About", new AboutPanel(getController().getURLHandler()));
         tabbedPane.add("Credits", cp);
-        tabbedPane.add("Licences", new LicencesPanel(getController()
-                .getGlobalConfig()));
+        tabbedPane.add("Licences", new LicencesPanel(getController()));
         tabbedPane.add("Information", new InfoPanel(getController()));
         tabbedPane.addChangeListener(this);
 

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;
@@ -51,6 +51,8 @@ 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;
 
     /**
      * Instantiates a new licence loader.
@@ -58,9 +60,10 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
      * @param tree Tree
      * @param model Model to load licences into
      */
-    public LicenceLoader(final JTree tree, final DefaultTreeModel model) {
+    public LicenceLoader(final SwingController controller, final JTree tree, final DefaultTreeModel model) {
         super();
 
+        this.controller = controller;
         this.tree = tree;
         this.model = model;
     }
@@ -78,7 +81,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
                     + "no resource manager");
         } else {
             addCoreLicences(rm);
-            for (PluginInfo pi : PluginManager.getPluginManager()
+            for (PluginInfo pi : controller.getMain().getPluginManager()
                     .getPluginInfos()) {
                 addPluginLicences(pi);
             }

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

@@ -22,6 +22,7 @@
 
 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.TreeScroller;
 import com.dmdirc.config.ConfigManager;
@@ -65,16 +66,19 @@ public final class LicencesPanel extends JPanel implements
     private JEditorPane licence;
     /** Licence list. */
     private JTree list;
+    /** Swing Controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new instance of LicencesPanel.
      *
      * @param config Config manager
      */
-    public LicencesPanel(final ConfigManager config) {
+    public LicencesPanel(final SwingController controller) {
         super();
 
-        this.config = config;
+        this.controller = controller;
+        this.config = controller.getGlobalConfig();
         initComponents();
         addListeners();
         layoutComponents();
@@ -130,7 +134,7 @@ public final class LicencesPanel extends JPanel implements
         list.getSelectionModel().setSelectionMode(TreeSelectionModel.
                 SINGLE_TREE_SELECTION);
         new TreeScroller(list);
-        new LicenceLoader(list, listModel).executeInExecutor();
+        new LicenceLoader(controller, list, listModel).executeInExecutor();
         licence = new JEditorPane();
         licence.setEditorKit(new HTMLEditorKit());
         final Font font = UIManager.getFont("Label.font");

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -104,8 +104,8 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         topicText.setWrapStyleWord(true);
         topicText.setRows(5);
         topicText.setColumns(30);
-        final SwingInputHandler handler = new SwingInputHandler(topicText,
-                channel.getCommandParser(), channelWindow.getContainer());
+        final SwingInputHandler handler = new SwingInputHandler(parent.getController(),
+                topicText, channel.getCommandParser(), channelWindow.getContainer());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -121,7 +121,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         textField.setColumns(50);
         textField.setRows(10);
 
-        new SwingInputHandler(textField, parent.getContainer()
+        new SwingInputHandler(getController(), textField, parent.getContainer()
                 .getCommandParser(), parent.getContainer())
                 .setTypes(false, false, true,false);
 

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -278,7 +278,8 @@ public class DynamicRequestHandler extends AbstractHandler {
     private void doNewServer(final HttpServletRequest request)
             throws IOException {
         try {
-            new Server(new URI("irc://" + request.getParameter("password") + "@"
+            new Server(controller.getMain().getServerManager(),
+                    new URI("irc://" + request.getParameter("password") + "@"
                     + request.getParameter("server") + ":"
                     + request.getParameter("port")),
                     findProfile(request.getParameter("profile"))).connect();

src/com/dmdirc/addons/ui_web/StaticRequestHandler.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;
@@ -42,6 +41,17 @@ public class StaticRequestHandler extends AbstractHandler {
 
     private ResourceManager rm;
 
+    private final WebInterfaceUI controller;
+
+    /**
+     * Create a new StaticRequestHandler.
+     *
+     * @param controller UI Controller that owns this handler.
+     */
+    public StaticRequestHandler(final WebInterfaceUI controller) {
+        this.controller = controller;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void handle(final String target, final HttpServletRequest request,
@@ -50,7 +60,7 @@ public class StaticRequestHandler extends AbstractHandler {
 
         if (rm == null) {
             try {
-                rm = PluginManager.getPluginManager()
+                rm = controller.getMain().getPluginManager()
                     .getPluginInfoByName("ui_web").getResourceManager();
             } catch (IOException ex) {
                 // Die horribly

src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_web;
 
+import com.dmdirc.Main;
 import com.dmdirc.plugins.BasePlugin;
 
 import lombok.Getter;
@@ -33,15 +34,27 @@ import org.mortbay.jetty.Handler;
  */
 public class WebInterfacePlugin extends BasePlugin {
 
+    /** Our instance of main. */
+    private final Main main;
+
     /** The UI that we're using. */
     @Getter
     private WebInterfaceUI controller;
 
+    /**
+     * Create a new WebInterfacePlugin
+     *
+     * @param main The instance of main that this client uses.
+     */
+    public WebInterfacePlugin(final Main main) {
+        this.main = main;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
         if (controller == null) {
-            controller = new WebInterfaceUI(getDomain());
+            controller = new WebInterfaceUI(main, getDomain());
         }
     }
 
@@ -52,7 +65,7 @@ public class WebInterfacePlugin extends BasePlugin {
      */
     public void addWebHandler(final Handler newHandler) {
         if (controller == null) {
-            controller = new WebInterfaceUI(getDomain());
+            controller = new WebInterfaceUI(main, getDomain());
         }
 
         controller.addWebHandler(newHandler);

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.ui.UIController;
@@ -56,14 +57,18 @@ public class WebInterfaceUI implements UIController {
     @Getter
     private final DynamicRequestHandler handler;
 
+    /** Instance of Main that owns us. */
+    private final Main main;
+
     /**
      * Creates a new WebInterfaceUI belonging to the specified plugin.
      *
      * @param domain The domain to retrieve config settings from
      */
-    public WebInterfaceUI(final String domain) {
+    public WebInterfaceUI(final Main main, final String domain) {
         super();
 
+        this.main = main;
         final SecurityHandler sh = new SecurityHandler();
         final Constraint constraint = new Constraint();
         final ConstraintMapping cm = new ConstraintMapping();
@@ -84,7 +89,7 @@ public class WebInterfaceUI implements UIController {
         webServer.setHandlers(new Handler[]{
             sh,
             new RootRequestHandler(),
-            new StaticRequestHandler(),
+            new StaticRequestHandler(this),
             new DMDircRequestHandler(),
             handler,
         });
@@ -100,6 +105,12 @@ public class WebInterfaceUI implements UIController {
         StatusBarManager.getStatusBarManager().registerStatusBar(new WebStatusBar(handler));
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Main getMain() {
+        return main;
+    }
+
     /**
      * Adds the specified handler to the webserver.
      *

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_web.uicomponents;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -33,10 +34,11 @@ import com.dmdirc.ui.input.TabCompleter;
  */
 public class WebInputHandler extends InputHandler {
 
-    public WebInputHandler(final InputField thisTarget,
+    public WebInputHandler(final UIController controller,
+                           final InputField thisTarget,
                            final CommandParser thisCommandParser,
                            final WritableFrameContainer thisParentWindow) {
-        super(thisTarget, thisCommandParser, thisParentWindow);
+        super(controller, thisTarget, thisCommandParser, thisParentWindow);
     }
 
     public InputField getTarget() {

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

@@ -50,12 +50,15 @@ public class WebInputWindow extends WebWindow implements InputWindow {
     private final Map<Client, WebInputHandler> inputHandlers
             = new HashMap<Client, WebInputHandler>();
 
+    private final WebInterfaceUI controller;
+
     public WebInputWindow(final WebInterfaceUI controller,
             final WritableFrameContainer parent, final String id) {
         super(controller, parent, id);
         this.container = parent;
         this.commandparser = parent.getCommandParser();
-        this.inputHandler = new WebInputHandler(new WebInputField(),
+        this.controller = controller;
+        this.inputHandler = new WebInputHandler(controller, new WebInputField(),
                 commandparser, getContainer());
     }
 
@@ -67,7 +70,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     public WebInputHandler getInputHandler(final Client client) {
         if (!inputHandlers.containsKey(client)) {
-            final WebInputHandler ih = new WebInputHandler(
+            final WebInputHandler ih = new WebInputHandler(controller,
                     new WebInputField(client), commandparser, getContainer());
             ih.setTabCompleter(inputHandler.getTabCompleter());
             inputHandlers.put(client, ih);

src/com/dmdirc/addons/userlevel/AccessLevelComponent.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.userlevel;
 
 import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
@@ -34,9 +35,9 @@ public class AccessLevelComponent implements ActionComponent {
 
     /** {@inheritDoc} */
     @Override
-    public Object get(final Object argument) {
-        UserLevelPlugin.doGlobalLevel((ClientInfo) argument);
-        return ((ClientInfo) argument).getMap().get("level");
+    public Object get(final ActionComponentArgument arg) {
+        UserLevelPlugin.doGlobalLevel((ClientInfo) arg.getObject());
+        return ((ClientInfo) arg.getObject()).getMap().get("level");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/userlevel/ChannelAccessLevelComponent.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.userlevel;
 
 import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 /**
@@ -34,8 +35,8 @@ public class ChannelAccessLevelComponent implements ActionComponent {
 
     /** {@inheritDoc} */
     @Override
-    public Object get(final Object argument) {
-        final ChannelClientInfo ci = (ChannelClientInfo) argument;
+    public Object get(final ActionComponentArgument arg) {
+        final ChannelClientInfo ci = (ChannelClientInfo) arg.getObject();
 
         UserLevelPlugin.doChannelLevel(ci);
 

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -42,7 +42,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -91,7 +90,7 @@ public final class WindowStatusPlugin extends BasePlugin
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        controller = (SwingController) PluginManager.getPluginManager()
+        controller = (SwingController) pluginInfo.getMetaData().getManager()
                 .getPluginInfoByName("ui_swing").getPlugin();
         controller.getSwingStatusBar().addComponent(panel);
         controller.getMainFrame().addSelectionListener(this);