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

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

src/com/dmdirc/Main.java

@@ -74,6 +74,12 @@ public class Main {
     /** Instance of main, protected to allow subclasses direct access. */
     protected static Main mainInstance;
 
+    /** Instance of pluginmanager used by this Main. */
+    protected PluginManager pluginManager;
+
+    /** Our ServerManager. */
+    protected ServerManager serverManager;
+
     /**
      * Entry procedure.
      *
@@ -98,6 +104,8 @@ public class Main {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
         IdentityManager.getIdentityManager().loadVersionIdentity();
+        serverManager = new ServerManager(this);
+        ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
 
         final CommandLineParser clp = new CommandLineParser(this, args);
 
@@ -111,8 +119,8 @@ public class Main {
 
         MessageSinkManager.getManager().loadDefaultSinks();
 
-        final PluginManager pm = PluginManager.initPluginManager(IdentityManager.getIdentityManager(), this);
-        checkBundledPlugins(pm, IdentityManager.getIdentityManager().getGlobalConfiguration());
+        pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
+        checkBundledPlugins(pluginManager, IdentityManager.getIdentityManager().getGlobalConfiguration());
 
         ThemeManager.loadThemes();
 
@@ -121,22 +129,22 @@ public class Main {
         new CommandLoader().loadCommands(CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this));
 
         for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
-            ensureExists(pm, service);
+            ensureExists(pluginManager, service);
         }
 
         // The user may have an existing parser plugin (e.g. twitter) which
         // will satisfy the service existance check above, but will render the
         // client pretty useless, so we'll force IRC extraction for now.
         extractCorePlugins("parser_irc");
-        pm.refreshPlugins();
+        pluginManager.refreshPlugins();
 
-        loadUIs(pm);
+        loadUIs(pluginManager);
 
         doFirstRun();
 
         ActionManager.getActionManager().initialise();
 
-        pm.doAutoLoad();
+        pluginManager.doAutoLoad();
 
         ActionManager.getActionManager().loadUserActions();
 
@@ -153,12 +161,34 @@ public class Main {
             public void run() {
                 ActionManager.getActionManager().triggerEvent(
                         CoreActionType.CLIENT_CLOSED, null);
-                ServerManager.getServerManager().disconnectAll("Unexpected shutdown");
+                serverManager.disconnectAll("Unexpected shutdown");
                 IdentityManager.getIdentityManager().saveAll();
             }
         }, "Shutdown thread"));
     }
 
+    /**
+     * Get the plugin manager for this instance of main.
+     *
+     * @return PluginManager in use.
+     * @Deprecated Global state is bad.
+     */
+    @Deprecated
+    public PluginManager getPluginManager() {
+        return pluginManager;
+    }
+
+    /**
+     * Get our ServerManager
+     *
+     * @return ServerManager controlled by this Main.
+     * @Deprecated Global state is bad.
+     */
+    @Deprecated
+    public ServerManager getServerManager() {
+        return serverManager;
+    }
+
     /**
      * Called when the UI has failed to initialise correctly. This method
      * attempts to extract any and all UI plugins bundled with the client, and
@@ -270,7 +300,7 @@ public class Main {
 
                 if (installed.compareTo(bundled) < 0) {
                     extractCorePlugins(plugin.getMetaData().getName());
-                    PluginManager.getPluginManager().reloadPlugin(plugin.getFilename());
+                    pm.reloadPlugin(plugin.getFilename());
                 }
             }
         }
@@ -368,7 +398,7 @@ public class Main {
      *                  operating system when the client exits
      */
     public void quit(final String reason, final int exitCode) {
-        ServerManager.getServerManager().disconnectAll(reason);
+        serverManager.disconnectAll(reason);
 
         System.exit(exitCode);
     }
@@ -470,13 +500,11 @@ public class Main {
                         resourceName.length()));
 
                 if (!newFile.isDirectory()) {
-                    final PluginManager pm = PluginManager.getPluginManager();
-
                     ResourceManager.getResourceManager().
                             resourceToFile(resource.getValue(), newFile);
 
-                    final PluginInfo plugin = pm.getPluginInfo(newFile
-                            .getAbsolutePath().substring(pm.getDirectory().length()));
+                    final PluginInfo plugin = pluginManager.getPluginInfo(newFile
+                            .getAbsolutePath().substring(pluginManager.getDirectory().length()));
 
                     if (plugin != null) {
                         plugin.pluginUpdated();

src/com/dmdirc/ParserFactory.java

@@ -33,14 +33,19 @@ import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 
 import java.net.URI;
+import lombok.RequiredArgsConstructor;
 
 /**
  * Provides a method to retrieve a parser.
  *
  * @since 0.6
  */
+@RequiredArgsConstructor
 public class ParserFactory {
 
+    /** PluginManager used by this ParserFactory */
+    private final PluginManager pluginManager;
+
     /**
      * Retrieves a parser instance.
      *
@@ -102,7 +107,7 @@ public class ParserFactory {
         final String scheme = address.getScheme() == null ? "irc" : address.getScheme();
 
         try {
-            final Service service = PluginManager.getPluginManager().getService("parser", scheme);
+            final Service service = pluginManager.getService("parser", scheme);
 
             if (service != null && !service.getProviders().isEmpty()) {
                 final ServiceProvider provider = service.getProviders().get(0);

src/com/dmdirc/Server.java

@@ -177,6 +177,12 @@ public class Server extends WritableFrameContainer
     /** The certificate manager in use, if any. */
     private CertificateManager certificateManager;
 
+    /** ParserFactory we use for creating parsers. */
+    private final ParserFactory parserFactory;
+
+    /** ServerManager that created us. */
+    private final ServerManager manager;
+
     // </editor-fold>
 
     // </editor-fold>
@@ -188,10 +194,11 @@ public class Server extends WritableFrameContainer
      * the specified profile.
      *
      * @since 0.6.3
+     * @param manager The servermanager that owns this server.
      * @param uri The address of the server to connect to
      * @param profile The profile to use
      */
-    public Server(final URI uri, final Identity profile) {
+    public Server(final ServerManager manager, final URI uri, final Identity profile) {
         super("server-disconnected", getHost(uri), getHost(uri),
                 new ConfigManager(uri.getScheme(), "", "", uri.getHost()),
                 new ServerCommandParser(
@@ -200,9 +207,11 @@ public class Server extends WritableFrameContainer
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
+        this.manager = manager;
+        parserFactory = new ParserFactory(manager.getMain().getPluginManager());
         setConnectionDetails(uri, profile);
 
-        ServerManager.getServerManager().registerServer(this);
+        manager.registerServer(this);
         WindowManager.getWindowManager().addWindow(this);
 
         tabCompleter.addEntries(TabCompletionType.COMMAND,
@@ -246,7 +255,7 @@ public class Server extends WritableFrameContainer
      */
     private void setConnectionDetails(final URI uri, final Identity profile) {
         this.address = uri;
-        this.protocolDescription = new ParserFactory().getDescription(uri);
+        this.protocolDescription = parserFactory.getDescription(uri);
         this.profile = profile;
 
         if (uri.getPort() == -1 && protocolDescription != null) {
@@ -676,7 +685,7 @@ public class Server extends WritableFrameContainer
      */
     private Parser buildParser() {
         final MyInfo myInfo = buildMyInfo();
-        final Parser myParser = new ParserFactory().getParser(myInfo, address);
+        final Parser myParser = parserFactory.getParser(myInfo, address);
 
         if (myParser instanceof SecureParser) {
             certificateManager = new CertificateManager(address.getHost(), getConfigManager());
@@ -1060,7 +1069,7 @@ public class Server extends WritableFrameContainer
 
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
-        ServerManager.getServerManager().unregisterServer(this);
+        manager.unregisterServer(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/ServerManager.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
@@ -39,10 +40,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * The ServerManager maintains a list of all servers, and provides methods to
  * search or iterate over them.
  */
-public class ServerManager {
+public class ServerManager implements ServerFactory {
 
-    /** Singleton instance of ServerManager. */
-    private static ServerManager me;
+    /** Main that owns this ServerManager. */
+    private final Main main;
 
     /** All servers that currently exist. */
     private final Set<Server> servers = new CopyOnWriteArraySet<Server>();
@@ -50,19 +51,25 @@ public class ServerManager {
     /**
      * Creates a new instance of ServerManager.
      */
-    private ServerManager() {
+    public ServerManager(final Main main) {
+        this.main = main;
     }
 
     /**
-     * Returns the singleton instance of ServerManager.
+     * Get the Main that owns this ServerManager.
      *
-     * @return Instance of ServerManager
+     * @return The Main that owns this ServerManager.
+     * @Deprecated Global state is bad.
      */
-    public static synchronized ServerManager getServerManager() {
-        if (me == null) {
-            me = new ServerManager();
-        }
-        return me;
+    @Deprecated
+    public Main getMain() {
+        return main;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Server createServer(final URI uri, final Identity profile) {
+        return new Server(this, uri, profile);
     }
 
     /**
@@ -205,7 +212,7 @@ public class ServerManager {
         }
 
         if (server == null) {
-            server = new Server(uri, profile);
+            server = new Server(this, uri, profile);
             server.connect();
             return server;
         }
@@ -241,7 +248,7 @@ public class ServerManager {
 
         if (connectedServer == null) {
             try {
-                final Server server = new Server(new URI("irc://irc.quakenet.org/DMDirc"),
+                final Server server = new Server(this, new URI("irc://irc.quakenet.org/DMDirc"),
                         IdentityManager.getIdentityManager()
                         .getIdentitiesByType("profile").get(0));
                 server.connect();

src/com/dmdirc/actions/ActionComponentChain.java

@@ -24,6 +24,7 @@ package com.dmdirc.actions;
 
 import com.dmdirc.Precondition;
 import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import com.dmdirc.logger.Logger;
 
 import java.util.ArrayList;
@@ -81,15 +82,15 @@ public class ActionComponentChain implements ActionComponent {
 
     /** {@inheritDoc} */
     @Override
-    public Object get(final Object argument) {
-        Object res = argument;
+    public Object get(final ActionComponentArgument arg) {
+        Object res = arg.getObject();
 
         for (ActionComponent component : components) {
             if (res == null) {
                 return null;
             }
 
-            res = component.get(res);
+            res = component.get(new ActionComponentArgument(arg.getMain(), res));
         }
 
         return res;
@@ -164,7 +165,7 @@ public class ActionComponentChain implements ActionComponent {
         for (ActionComponent component : components) {
             try {
                 final ComponentOptions options = component.getClass()
-                        .getMethod("get", Object.class).getAnnotation(ComponentOptions.class);
+                        .getMethod("get", ActionComponentArgument.class).getAnnotation(ComponentOptions.class);
                 if (options != null) {
                     res |= options.requireConnected();
                 }

src/com/dmdirc/actions/ActionCondition.java

@@ -24,6 +24,7 @@ package com.dmdirc.actions;
 
 import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 
 /**
  * An action condition represents one condition within an action.
@@ -95,7 +96,7 @@ public class ActionCondition {
             final String thisStarget = sub.doSubstitution(starget, args);
             return getComparison().test(thisStarget, thisTarget);
         } else {
-            return getComparison().test(getComponent().get(args[getArg()]), thisTarget);
+            return getComparison().test(getComponent().get(new ActionComponentArgument(ActionManager.getActionManager().getMain(), args[getArg()])), thisTarget);
         }
     }
 

src/com/dmdirc/actions/ActionManager.java

@@ -22,12 +22,13 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.Main;
 import com.dmdirc.Precondition;
+import com.dmdirc.ServerManager;
 import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.IdentityController;
@@ -58,13 +59,18 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class ActionManager implements ActionController {
 
-    /** A singleton instance of the ActionManager. */
-    private static final ActionManager INSTANCE
-            = new ActionManager(IdentityManager.getIdentityManager());
-
     /** The identity manager to load configuration from. */
     private final IdentityController identityManager;
 
+    /** The ActionManager Instance. */
+    private static ActionManager me;
+
+    /** The instance of main that owns this Action Manager. */
+    private final Main main;
+
+    /** The ServerManager currently in use. */
+    private final ServerManager serverManager;
+
     /** A list of registered action types. */
     private final List<ActionType> types
             = new ArrayList<ActionType>();
@@ -104,20 +110,56 @@ public class ActionManager implements ActionController {
     /**
      * Creates a new instance of ActionManager.
      *
+     * @param main Main that created this action manager.
+     * @param serverManager The ServerManager in use.
      * @param identityManager The IdentityManager to load configuration from.
      */
-    public ActionManager(final IdentityController identityManager) {
+    private ActionManager(final Main main, final ServerManager serverManager, final IdentityController identityManager) {
+        // TODO: We shouldn't need a main.
+        this.main = main;
+        this.serverManager = serverManager;
         this.identityManager = identityManager;
         this.identityManager.getGlobalConfiguration().getBinder().bind(this, ActionManager.class);
     }
 
+    /**
+     * Get the instance of Main that owns this.
+     *
+     * @return Instance of main.
+     * @Deprecated Global state is bad.
+     */
+    @Deprecated
+    public Main getMain() {
+        return main;
+    }
+
+    /**
+     * Get the server manager.
+     *
+     * @return ServerManager
+     */
+    public ServerManager getServerManager() {
+        return serverManager;
+    }
+
+    /**
+     * Create the singleton instance of the Action Manager.
+     *
+     * @return The singleton ActionManager instance
+     */
+    @Deprecated
+    public static ActionManager initActionManager(final Main main, final ServerManager serverManager, final IdentityController identityManager) {
+        me = new ActionManager(main, serverManager, identityManager);
+        return me;
+    }
+
     /**
      * Returns a singleton instance of the Action Manager.
      *
      * @return A singleton ActionManager instance
      */
     public static ActionManager getActionManager() {
-        return INSTANCE;
+        return me;
     }
 
     /** {@inheritDoc} */
@@ -381,7 +423,7 @@ public class ActionManager implements ActionController {
             for (Action action : new ArrayList<Action>(actions.get(type))) {
                 try {
                     if (action.getConcurrencyGroup() == null) {
-                        res |= action.trigger(format, arguments);
+                        res |= action.trigger(getServerManager(), format, arguments);
                     } else {
                         synchronized (locks) {
                             if (!locks.containsKey(action.getConcurrencyGroup())) {
@@ -390,7 +432,7 @@ public class ActionManager implements ActionController {
                         }
 
                         synchronized (locks.get(action.getConcurrencyGroup())) {
-                            res |= action.trigger(format, arguments);
+                            res |= action.trigger(getServerManager(), format, arguments);
                         }
                     }
                 } catch (LinkageError e) {

src/com/dmdirc/actions/ActionModel.java

@@ -127,7 +127,7 @@ public class ActionModel {
         "This action has at least one trigger",
         "This action's primary trigger is non-null"
     })
-    public boolean trigger(final StringBuffer format,
+    public boolean trigger(final ServerManager serverManager, final StringBuffer format,
             final Object... arguments) {
         assert triggers.length > 0;
         assert triggers[0] != null;
@@ -148,8 +148,8 @@ public class ActionModel {
         if (arguments.length > 0
                 && arguments[0] instanceof WritableFrameContainer) {
             container = (WritableFrameContainer) arguments[0];
-        } else if (ServerManager.getServerManager().numServers() > 0) {
-            container = ServerManager.getServerManager().getServers().get(0);
+        } else if (serverManager.numServers() > 0) {
+            container = serverManager.getServers().get(0);
         }
 
         if (container == null) {

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.Window;
 
@@ -296,7 +297,7 @@ public class ActionSubstitutor {
         if ((chain.requiresConnection() && args[0] instanceof FrameContainer
                     && ((FrameContainer) args[0]).getServer().getState()
                     == ServerState.CONNECTED) || !chain.requiresConnection()) {
-            final Object res = chain.get(argument);
+            final Object res = chain.get(new ActionComponentArgument(ActionManager.getActionManager().getMain(), argument));
             return res == null ? ERR_NULL_CHAIN : res.toString();
         }
 

src/com/dmdirc/actions/CoreActionComponent.java

@@ -28,6 +28,7 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -52,7 +53,7 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Server) argument).getAddress(); }
+        public Object get(final ActionComponentArgument arg) { return ((Server) arg.getObject()).getAddress(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Server.class; }
@@ -69,7 +70,7 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         @ComponentOptions(requireConnected = true)
-        public Object get(final Object argument) { return ((Server) argument).getNetwork(); }
+        public Object get(final ActionComponentArgument arg) { return ((Server) arg.getObject()).getNetwork(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Server.class; }
@@ -89,7 +90,7 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_PROTOCOL {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Server) argument).getProtocol(); }
+        public Object get(final ActionComponentArgument arg) { return ((Server) arg.getObject()).getProtocol(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Server.class; }
@@ -105,7 +106,7 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_MYAWAYREASON {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Server) argument).getAwayMessage(); }
+        public Object get(final ActionComponentArgument arg) { return ((Server) arg.getObject()).getAwayMessage(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Server.class; }
@@ -122,7 +123,7 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         @ComponentOptions(requireConnected = true)
-        public Object get(final Object argument) { return ((Server) argument).getParser().getChannelUserModes(); }
+        public Object get(final ActionComponentArgument arg) { return ((Server) arg.getObject()).getParser().getChannelUserModes(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Server.class; }
@@ -139,8 +140,8 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         @ComponentOptions(requireConnected = true)
-        public Object get(final Object argument) {
-            final Server server = (Server) argument;
+        public Object get(final ActionComponentArgument arg) {
+            final Server server = (Server) arg.getObject();
 
             if (server == null || server.getParser() == null) {
                 Logger.appError(ErrorLevel.LOW, "SERVER_MYNICKNAME.get() called with null element",
@@ -170,7 +171,7 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_PROFILE {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Server) argument).getProfile(); }
+        public Object get(final ActionComponentArgument arg) { return ((Server) arg.getObject()).getProfile(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Server.class; }
@@ -186,7 +187,7 @@ public enum CoreActionComponent implements ActionComponent {
     CHANNEL_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Channel) argument).getChannelInfo().getName(); }
+        public Object get(final ActionComponentArgument arg) { return ((Channel) arg.getObject()).getChannelInfo().getName(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Channel.class; }
@@ -202,7 +203,7 @@ public enum CoreActionComponent implements ActionComponent {
     CHANNEL_COLOUR {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Channel) argument).getNotification(); }
+        public Object get(final ActionComponentArgument arg) { return ((Channel) arg.getObject()).getNotification(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Channel.class; }
@@ -218,7 +219,7 @@ public enum CoreActionComponent implements ActionComponent {
     CLIENT_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((ClientInfo) argument).getNickname(); }
+        public Object get(final ActionComponentArgument arg) { return ((ClientInfo) arg.getObject()).getNickname(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return ClientInfo.class; }
@@ -234,7 +235,7 @@ public enum CoreActionComponent implements ActionComponent {
     CLIENT_HOST {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((ClientInfo) argument).getHostname(); }
+        public Object get(final ActionComponentArgument arg) { return ((ClientInfo) arg.getObject()).getHostname(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return ClientInfo.class; }
@@ -250,7 +251,7 @@ public enum CoreActionComponent implements ActionComponent {
     USER_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((ChannelClientInfo) argument).getClient().getNickname(); }
+        public Object get(final ActionComponentArgument arg) { return ((ChannelClientInfo) arg.getObject()).getClient().getNickname(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return ChannelClientInfo.class; }
@@ -266,7 +267,7 @@ public enum CoreActionComponent implements ActionComponent {
     USER_MODES {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((ChannelClientInfo) argument).getAllModes(); }
+        public Object get(final ActionComponentArgument arg) { return ((ChannelClientInfo) arg.getObject()).getAllModes(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return ChannelClientInfo.class; }
@@ -282,7 +283,7 @@ public enum CoreActionComponent implements ActionComponent {
     USER_HOST {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((ChannelClientInfo) argument).getClient().getHostname(); }
+        public Object get(final ActionComponentArgument arg) { return ((ChannelClientInfo) arg.getObject()).getClient().getHostname(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return ChannelClientInfo.class; }
@@ -298,7 +299,7 @@ public enum CoreActionComponent implements ActionComponent {
     USER_COMCHANS {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return Integer.valueOf(((ChannelClientInfo) argument).getClient().getChannelCount()); }
+        public Object get(final ActionComponentArgument arg) { return Integer.valueOf(((ChannelClientInfo) arg.getObject()).getClient().getChannelCount()); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return ChannelClientInfo.class; }
@@ -314,7 +315,7 @@ public enum CoreActionComponent implements ActionComponent {
     STRING_STRING {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return argument; }
+        public Object get(final ActionComponentArgument arg) { return arg.getObject(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return String.class; }
@@ -330,7 +331,7 @@ public enum CoreActionComponent implements ActionComponent {
     STRING_STRIPPED {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return Styliser.stipControlCodes((String) argument); }
+        public Object get(final ActionComponentArgument arg) { return Styliser.stipControlCodes((String) arg.getObject()); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return String.class; }
@@ -346,7 +347,7 @@ public enum CoreActionComponent implements ActionComponent {
     STRING_LENGTH {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((String) argument).length(); }
+        public Object get(final ActionComponentArgument arg) { return ((String) arg.getObject()).length(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return String.class; }
@@ -362,7 +363,7 @@ public enum CoreActionComponent implements ActionComponent {
     STRINGARRAY_LENGTH {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return Integer.valueOf(((String[]) argument).length); }
+        public Object get(final ActionComponentArgument arg) { return Integer.valueOf(((String[]) arg.getObject()).length); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return String[].class; }
@@ -378,7 +379,7 @@ public enum CoreActionComponent implements ActionComponent {
     CALENDAR_FULLSTRING {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((GregorianCalendar) argument).getTime().toString(); }
+        public Object get(final ActionComponentArgument arg) { return ((GregorianCalendar) arg.getObject()).getTime().toString(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Calendar.class; }
@@ -394,7 +395,7 @@ public enum CoreActionComponent implements ActionComponent {
     KEYEVENT_KEYNAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return KeyEvent.getKeyText(((KeyStroke) argument).getKeyCode()); }
+        public Object get(final ActionComponentArgument arg) { return KeyEvent.getKeyText(((KeyStroke) arg.getObject()).getKeyCode()); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return KeyStroke.class; }
@@ -410,8 +411,8 @@ public enum CoreActionComponent implements ActionComponent {
     KEYEVENT_CTRLSTATE {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) {
-            return Boolean.valueOf((((KeyStroke) argument).getModifiers() & KeyEvent.CTRL_DOWN_MASK) != 0);
+        public Object get(final ActionComponentArgument arg) {
+            return Boolean.valueOf((((KeyStroke) arg.getObject()).getModifiers() & KeyEvent.CTRL_DOWN_MASK) != 0);
         }
         /** {@inheritDoc} */
         @Override
@@ -428,8 +429,8 @@ public enum CoreActionComponent implements ActionComponent {
     KEYEVENT_SHIFTSTATE {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) {
-            return Boolean.valueOf((((KeyStroke) argument).getModifiers() & KeyEvent.SHIFT_DOWN_MASK) != 0);
+        public Object get(final ActionComponentArgument arg) {
+            return Boolean.valueOf((((KeyStroke) arg.getObject()).getModifiers() & KeyEvent.SHIFT_DOWN_MASK) != 0);
         }
         /** {@inheritDoc} */
         @Override
@@ -446,8 +447,8 @@ public enum CoreActionComponent implements ActionComponent {
     KEYEVENT_ALTSTATE {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) {
-            return Boolean.valueOf((((KeyStroke) argument).getModifiers() & KeyEvent.ALT_DOWN_MASK) != 0);
+        public Object get(final ActionComponentArgument arg) {
+            return Boolean.valueOf((((KeyStroke) arg.getObject()).getModifiers() & KeyEvent.ALT_DOWN_MASK) != 0);
         }
         /** {@inheritDoc} */
         @Override
@@ -464,7 +465,7 @@ public enum CoreActionComponent implements ActionComponent {
     QUERY_HOST {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Query) argument).getHost(); }
+        public Object get(final ActionComponentArgument arg) { return ((Query) arg.getObject()).getHost(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Query.class; }
@@ -480,7 +481,7 @@ public enum CoreActionComponent implements ActionComponent {
     QUERY_NICK {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Query) argument).getName(); }
+        public Object get(final ActionComponentArgument arg) { return ((Query) arg.getObject()).getName(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Query.class; }
@@ -496,7 +497,7 @@ public enum CoreActionComponent implements ActionComponent {
     QUERY_COLOUR {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Query) argument).getNotification(); }
+        public Object get(final ActionComponentArgument arg) { return ((Query) arg.getObject()).getNotification(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Query.class; }
@@ -512,7 +513,7 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((FrameContainer) argument).getName(); }
+        public Object get(final ActionComponentArgument arg) { return ((FrameContainer) arg.getObject()).getName(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return FrameContainer.class; }
@@ -528,7 +529,7 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_COLOUR {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((FrameContainer) argument).getNotification(); }
+        public Object get(final ActionComponentArgument arg) { return ((FrameContainer) arg.getObject()).getNotification(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return FrameContainer.class; }
@@ -548,7 +549,7 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_SERVER {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Window) argument)
+        public Object get(final ActionComponentArgument arg) { return ((Window) arg.getObject())
                 .getContainer().getServer(); }
         /** {@inheritDoc} */
         @Override
@@ -565,7 +566,7 @@ public enum CoreActionComponent implements ActionComponent {
     IDENTITY_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Identity) argument).getName(); }
+        public Object get(final ActionComponentArgument arg) { return ((Identity) arg.getObject()).getName(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Identity.class; }
@@ -581,7 +582,7 @@ public enum CoreActionComponent implements ActionComponent {
     INTEGER_VALUE {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return (Integer) argument; }
+        public Object get(final ActionComponentArgument arg) { return (Integer) arg.getObject(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Integer.class; }

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -28,6 +28,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionGroup;
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.interfaces.CommandController;
@@ -52,15 +53,19 @@ public final class AliasWrapper extends ActionGroup {
     /** Command controller to get command info from. */
     private final CommandController commandController;
 
+    /** Server Manager. */
+    private final ServerManager serverManager;
+
     /**
      * Creates a new instance of AliasWrapper.
      *
      * @param commandController Command controller to get command info from.
      */
-    public AliasWrapper(final CommandController commandController) {
+    public AliasWrapper(final CommandController commandController, final ServerManager serverManager) {
         super("aliases");
 
         this.commandController = commandController;
+        this.serverManager = serverManager;
     }
 
     /**
@@ -70,7 +75,7 @@ public final class AliasWrapper extends ActionGroup {
      */
     public static synchronized AliasWrapper getAliasWrapper() {
         if (me == null) {
-            me = new AliasWrapper(CommandManager.getCommandManager());
+            me = new AliasWrapper(CommandManager.getCommandManager(), ActionManager.getActionManager().getServerManager());
         }
 
         return me;
@@ -101,7 +106,7 @@ public final class AliasWrapper extends ActionGroup {
                             .addEntry(TabCompletionType.COMMAND, commandName);
                 }
 
-                for (Server server : ServerManager.getServerManager().getServers()) {
+                for (Server server : serverManager.getServers()) {
                     server.getTabCompleter().addEntry(TabCompletionType.COMMAND, commandName);
                 }
             } else {
@@ -124,7 +129,7 @@ public final class AliasWrapper extends ActionGroup {
 
             aliases.remove(commandName);
 
-            for (Server server : ServerManager.getServerManager().getServers()) {
+            for (Server server : serverManager.getServers()) {
                 server.getTabCompleter().removeEntry(TabCompletionType.COMMAND, commandName);
             }
         }

src/com/dmdirc/commandline/CommandLineParser.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandline;
 
 import com.dmdirc.Main;
-import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
@@ -116,7 +115,7 @@ public class CommandLineParser {
             }
         }
 
-        RemoteServer.bind();
+        new RemoteServer(main).bind();
     }
 
     /**
@@ -369,7 +368,7 @@ public class CommandLineParser {
      */
     public void processArguments() {
         for (URI address : addresses)  {
-            ServerManager.getServerManager().connectToAddress(address);
+            main.getServerManager().connectToAddress(address);
         }
     }
 

src/com/dmdirc/commandline/RemoteServer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandline;
 
-import com.dmdirc.ServerManager;
+import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -44,13 +44,22 @@ public class RemoteServer implements RemoteInterface {
     /** The maximum port to use for RMI binding. */
     private static final int MAXPORT = MINPORT + 5;
     /** The interface we're exposing. */
-    private static final RemoteServer SERVER = new RemoteServer();
+    private final Main main;
+
+    /**
+     * Crate a new RemoteServer.
+     *
+     * @param main Main instance to use to do things.
+     */
+    public RemoteServer(final Main main) {
+        this.main = main;
+    }
 
     /** {@inheritDoc} */
     @Override
     public void connect(final List<URI> addresses) throws RemoteException {
         for (URI address : addresses) {
-            ServerManager.getServerManager().connectToAddress(address);
+            main.getServerManager().connectToAddress(address);
         }
     }
 
@@ -58,11 +67,11 @@ public class RemoteServer implements RemoteInterface {
      * Binds to the RMI registry so that other clients may find this remote
      * server.
      */
-    public static void bind() {
+    public void bind() {
         RemoteInterface stub;
 
         try {
-            stub = (RemoteInterface) UnicastRemoteObject.exportObject(SERVER, 0);
+            stub = (RemoteInterface) UnicastRemoteObject.exportObject(this, 0);
         } catch (RemoteException ex) {
             Logger.appError(ErrorLevel.MEDIUM, "Unable to export remote interface", ex);
             return;

src/com/dmdirc/commandparser/CommandLoader.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.BasicServerFactory;
 import com.dmdirc.commandparser.commands.channel.Ban;
 import com.dmdirc.commandparser.commands.channel.Cycle;
 import com.dmdirc.commandparser.commands.channel.Invite;
@@ -127,7 +126,7 @@ public class CommandLoader {
         manager.registerCommand(new Exit(), Exit.INFO);
         manager.registerCommand(new Help(), Help.INFO);
         manager.registerCommand(new Ifplugin(), Ifplugin.INFO);
-        manager.registerCommand(new NewServer(new BasicServerFactory()), NewServer.INFO);
+        manager.registerCommand(new NewServer(manager.getMain().getServerManager()), NewServer.INFO);
         manager.registerCommand(new Notify(), Notify.INFO);
         manager.registerCommand(new LoadPlugin(), LoadPlugin.INFO);
         manager.registerCommand(new UnloadPlugin(), UnloadPlugin.INFO);

src/com/dmdirc/commandparser/CommandManager.java

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser;
 import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigBinding;
@@ -168,7 +167,7 @@ public class CommandManager implements CommandController {
         final String commandName = getCommandChar() + command.getName();
 
         // TODO: This logic is probably in two places. Abstract it.
-        for (Server server : ServerManager.getServerManager().getServers()) {
+        for (Server server : main.getServerManager().getServers()) {
             if (command.getType() == CommandType.TYPE_SERVER
                     || command.getType() == CommandType.TYPE_GLOBAL) {
                 registerCommandName(server.getTabCompleter(), commandName, register);

src/com/dmdirc/commandparser/commands/global/AllServers.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -51,7 +50,7 @@ public class AllServers extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final String command = args.getArgumentsAsString();
 
-        for (Server target : ServerManager.getServerManager().getServers()) {
+        for (Server target : getController().getMain().getServerManager().getServers()) {
             target.getCommandParser().parseCommand(target, command);
         }
     }

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -34,7 +34,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -63,7 +62,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
 
         final String pname = args.getArguments()[0].substring(negative ? 1 : 0);
 
-        final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName(pname);
+        final PluginInfo pluginInfo = getController().getMain().getPluginManager().getPluginInfoByName(pname);
 
         boolean result = true;
 
@@ -93,7 +92,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
             res = new AdditionalTabTargets().excludeAll();
 
             for (PluginInfo possPlugin
-                    : PluginManager.getPluginManager().getPluginInfos()) {
+                    : getController().getMain().getPluginManager().getPluginInfos()) {
                 res.add(possPlugin.getMetaData().getName());
                 res.add("!" + possPlugin.getMetaData().getName());
             }

src/com/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -55,9 +54,9 @@ public class LoadPlugin extends Command implements IntelligentCommand {
         }
 
         // Add previously unknown plugin to plugin manager
-        PluginManager.getPluginManager().addPlugin(
+        getController().getMain().getPluginManager().addPlugin(
                 args.getArgumentsAsString());
-        final PluginInfo plugin = PluginManager.getPluginManager()
+        final PluginInfo plugin = getController().getMain().getPluginManager()
                 .getPluginInfo(args.getArgumentsAsString());
 
         if (plugin == null) {
@@ -71,7 +70,7 @@ public class LoadPlugin extends Command implements IntelligentCommand {
             if (plugin.isLoaded()) {
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                         "Plugin loaded.");
-                PluginManager.getPluginManager().updateAutoLoad(plugin);
+                getController().getMain().getPluginManager().updateAutoLoad(plugin);
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                         "Loading plugin failed. ("
@@ -90,7 +89,7 @@ public class LoadPlugin extends Command implements IntelligentCommand {
 
         if (arg == 0) {
             for (PluginMetaData possPlugin
-                    : PluginManager.getPluginManager().getAllPlugins()) {
+                    : getController().getMain().getPluginManager().getAllPlugins()) {
                 res.add(possPlugin.getRelativeFilename());
             }
         }

src/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -35,7 +35,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -239,7 +238,7 @@ public class NewServer extends Command implements IntelligentCommand {
         final AdditionalTabTargets res = new AdditionalTabTargets();
 
         if (arg == 0) {
-            for (Service parserType : PluginManager.getPluginManager().getServicesByType("parser")) {
+            for (Service parserType : getController().getMain().getPluginManager().getServicesByType("parser")) {
                 res.add(parserType.getName()+"://");
             }
         }

src/com/dmdirc/commandparser/commands/global/ReloadPlugin.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -53,12 +52,12 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
             return;
         }
 
-        final PluginInfo plugin = PluginManager.getPluginManager()
+        final PluginInfo plugin = getController().getMain().getPluginManager()
                 .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "Plugin Reloading failed - Plugin not loaded");
-        } else if (PluginManager.getPluginManager().reloadPlugin(plugin.getMetaData().getRelativeFilename())) {
+        } else if (getController().getMain().getPluginManager().reloadPlugin(plugin.getMetaData().getRelativeFilename())) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin Reloaded.");
         } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Reloading failed");
@@ -72,7 +71,7 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
 
         if (arg == 0) {
-            for (PluginInfo possPlugin : PluginManager.getPluginManager().getPluginInfos()) {
+            for (PluginInfo possPlugin : getController().getMain().getPluginManager().getPluginInfos()) {
                 res.add(possPlugin.getMetaData().getName());
             }
         }

src/com/dmdirc/commandparser/commands/global/UnloadPlugin.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -53,13 +52,13 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
             return;
         }
 
-        final PluginInfo plugin = PluginManager.getPluginManager()
+        final PluginInfo plugin = getController().getMain().getPluginManager()
                 .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin unloading failed - Plugin not loaded");
-        } else if (PluginManager.getPluginManager().delPlugin(plugin.getMetaData().getRelativeFilename())) {
+        } else if (getController().getMain().getPluginManager().delPlugin(plugin.getMetaData().getRelativeFilename())) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin Unloaded.");
-            PluginManager.getPluginManager().updateAutoLoad(plugin);
+            getController().getMain().getPluginManager().updateAutoLoad(plugin);
         } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Unloading failed");
         }
@@ -72,7 +71,7 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
 
         if (arg == 0) {
-            for (PluginInfo possPlugin : PluginManager.getPluginManager().getPluginInfos()) {
+            for (PluginInfo possPlugin : getController().getMain().getPluginManager().getPluginInfos()) {
                 if (possPlugin.isLoaded()) {
                     res.add(possPlugin.getMetaData().getName());
                 }

src/com/dmdirc/interfaces/actions/ActionComponent.java

@@ -54,10 +54,10 @@ public interface ActionComponent {
      * Retrieves the component of the specified argument that this component
      * represents.
      *
-     * @param argument The object to retrieve the component from
+     * @param arg The object to retrieve the component from
      * @return The relevant component of the object
      */
-    Object get(Object argument);
+    Object get(ActionComponentArgument arg);
 
     /**
      * Retrieves the type of class that this component applies to.

src/com/dmdirc/BasicServerFactory.java → src/com/dmdirc/interfaces/actions/ActionComponentArgument.java

@@ -19,23 +19,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+package com.dmdirc.interfaces.actions;
 
-package com.dmdirc;
-
-import com.dmdirc.config.Identity;
-import com.dmdirc.interfaces.ServerFactory;
-
-import java.net.URI;
+import com.dmdirc.Main;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 /**
- * A basic factory for servers.
+ * Represents an argument for an ActionComponent
  */
-public class BasicServerFactory implements ServerFactory {
-
-    /** {@inheritDoc} */
-    @Override
-    public Server createServer(final URI uri, final Identity profile) {
-        return new Server(uri, profile);
-    }
+@RequiredArgsConstructor
+@SuppressWarnings("PMD.UnusedPrivateField")
+public class ActionComponentArgument {
+    /** Instance of main that ActionComponents may wish to use. */
+    @Getter
+    private final Main main;
 
+    /** The object this argument wraps. */
+    @Getter
+    private final Object object;
 }

src/com/dmdirc/interfaces/ui/UIController.java

@@ -24,6 +24,7 @@ package com.dmdirc.interfaces.ui;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 
 import java.net.URI;
@@ -34,6 +35,15 @@ import java.net.URI;
  */
 public interface UIController {
 
+    /**
+     * Get the instance of Main that created this UIController.
+     *
+     * @return Instance of Main that created this UIController.
+     * @Deprecated Global state is bad.
+     */
+    @Deprecated
+    Main getMain();
+
     /**
      * Requests that the specified window be bought to focus in this UI.
      *

src/com/dmdirc/plugins/BaseFileDependantPlugin.java

@@ -56,8 +56,7 @@ public class BaseFileDependantPlugin extends BasePlugin {
     private File initFilesDir() {
         if (filesDir == null) {
             final String fs = System.getProperty("file.separator");
-            final String dir = PluginManager.getPluginManager()
-                    .getFilesDirectory();
+            final String dir = metaData.getManager().getFilesDirectory();
             filesDir = new File(dir + metaData.getName() + fs);
             if (!filesDir.exists()) {
                 filesDir.mkdirs();

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -34,17 +34,20 @@ import java.util.Map;
  */
 public final class GlobalClassLoader extends ClassLoader {
 
-    /** Singleton instance of the GlobalClassLoader. */
-    private static GlobalClassLoader me;
-
     /** HashMap containing sources of Global class files. */
     private final Map<String, String> resourcesList = new HashMap<String, String>();
 
+    /** Plugin Manager that owns this GlobalClassLoader. */
+    private final PluginManager manager;
+
     /**
      * Create a new GlobalClassLoader.
+     *
+     * @param manager Plugin Manager that this GCL is used by.
      */
-    private GlobalClassLoader() {
+    public GlobalClassLoader(final PluginManager manager) {
         super();
+        this.manager = manager;
     }
 
     /**
@@ -57,19 +60,6 @@ public final class GlobalClassLoader extends ClassLoader {
         return findLoadedClass(name) != null;
     }
 
-    /**
-     * Retrieves the singleton instance of the GlobalClassLoader.
-     *
-     * @return A singleton instance of GlobalClassLoader.
-     */
-    public static synchronized GlobalClassLoader getGlobalClassLoader() {
-        if (me == null) {
-            me = new GlobalClassLoader();
-        }
-
-        return me;
-    }
-
     /**
      * Load the plugin with the given className.
      *
@@ -100,7 +90,7 @@ public final class GlobalClassLoader extends ClassLoader {
         }
 
         // Check the other plugins.
-        for (PluginInfo pi : PluginManager.getPluginManager().getPluginInfos()) {
+        for (PluginInfo pi : manager.getPluginInfos()) {
             final List<String> classList = pi.getClassList();
             if (classList.contains(name) && pi.getPluginClassLoader() != null) {
                 return pi.getPluginClassLoader().loadClass(name, false);

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -36,6 +36,9 @@ public class PluginClassLoader extends ClassLoader {
     /** The plugin Info object for the plugin we are loading. */
     private final PluginInfo pluginInfo;
 
+    /** Global Class Loader */
+    private final GlobalClassLoader globalLoader;
+
     /** The parent class loaders. */
     private final PluginClassLoader[] parents;
 
@@ -43,11 +46,13 @@ public class PluginClassLoader extends ClassLoader {
      * Create a new PluginClassLoader.
      *
      * @param info PluginInfo this classloader will be for
+     * @param globalLoader Global class loader to use where needed.
      * @param parents Parent ClassLoaders
      */
-    public PluginClassLoader(final PluginInfo info, final PluginClassLoader ... parents) {
+    public PluginClassLoader(final PluginInfo info, final GlobalClassLoader globalLoader, final PluginClassLoader ... parents) {
         this.pluginInfo = info;
         this.parents = parents;
+        this.globalLoader = globalLoader;
     }
 
     /**
@@ -57,7 +62,7 @@ public class PluginClassLoader extends ClassLoader {
      * @return A classloader configured with this one as its parent
      */
     public PluginClassLoader getSubClassLoader(final PluginInfo info) {
-        return new PluginClassLoader(info, this);
+        return new PluginClassLoader(info, globalLoader, this);
     }
 
     /**
@@ -81,7 +86,7 @@ public class PluginClassLoader extends ClassLoader {
      */
     public boolean isClassLoaded(final String name, final boolean checkGlobal) {
         return findLoadedClass(name) != null || (checkGlobal
-                && GlobalClassLoader.getGlobalClassLoader().isClassLoaded(name));
+                && globalLoader.isClassLoaded(name));
     }
 
     /**
@@ -117,12 +122,12 @@ public class PluginClassLoader extends ClassLoader {
         try {
             if (pluginInfo.isPersistent(name) || !res.resourceExists(fileName)) {
                 if (!pluginInfo.isPersistent(name) && askGlobal) {
-                    return GlobalClassLoader.getGlobalClassLoader().loadClass(name);
+                    return globalLoader.loadClass(name);
                 } else {
                     // Try to load class from previous load.
                     try {
                         if (askGlobal) {
-                            return GlobalClassLoader.getGlobalClassLoader().loadClass(name, pluginInfo);
+                            return globalLoader.loadClass(name, pluginInfo);
                         }
                     } catch (ClassNotFoundException e) {
                         /* Class doesn't exist, we load it ourself below */
@@ -150,7 +155,7 @@ public class PluginClassLoader extends ClassLoader {
 
         try {
             if (pluginInfo.isPersistent(name)) {
-                GlobalClassLoader.getGlobalClassLoader().defineClass(name, data);
+                globalLoader.defineClass(name, data);
             } else {
                 loadedClass = defineClass(name, data, 0, data.length);
             }

src/com/dmdirc/plugins/PluginInfo.java

@@ -147,7 +147,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         final Plugin[] plugins = new Plugin[parents.length];
 
         for (int i = 0; i < metaData.getParents().length; i++) {
-            final PluginInfo parent = PluginManager.getPluginManager()
+            final PluginInfo parent = metaData.getManager()
                     .getPluginInfoByName(metaData.getParents()[i]);
             parents[i] = parent.getInjector();
             plugins[i] = parent.getPlugin();
@@ -159,13 +159,13 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             injector.addParameter(parentPlugin);
         }
 
-        injector.addParameter(PluginManager.class, PluginManager.getPluginManager());
+        injector.addParameter(PluginManager.class, metaData.getManager());
         injector.addParameter(ActionManager.getActionManager());
         injector.addParameter(PluginInfo.class, this);
-        injector.addParameter(Main.class, PluginManager.getPluginManager().getMain());
+        injector.addParameter(Main.class, metaData.getManager().getMain());
         injector.addParameter(PluginMetaData.class, metaData);
         injector.addParameter(IdentityManager.class, IdentityManager.getIdentityManager());
-        injector.addParameter(ServerManager.class, ServerManager.getServerManager());
+        injector.addParameter(ServerManager.class, metaData.getManager().getMain().getServerManager());
 
         return injector;
     }
@@ -288,7 +288,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 final String type = bits.length > 1 ? bits[1] : "misc";
 
                 if (!name.equalsIgnoreCase("any") && !type.equalsIgnoreCase("export")) {
-                    final Service service = PluginManager.getPluginManager().getService(type, name, true);
+                    final Service service = metaData.getManager().getService(type, name, true);
                     synchronized (provides) {
                         service.addProvider(this);
                         provides.add(service);
@@ -442,7 +442,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return True iff all required services were found and satisfied
      */
     protected boolean loadRequiredServices() {
-        final ServiceManager manager = PluginManager.getPluginManager();
+        final ServiceManager manager = metaData.getManager();
 
         for (String serviceInfo : metaData.getRequiredServices()) {
             final String[] parts = serviceInfo.split(" ", 2);
@@ -513,7 +513,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         log.info("Loading required plugin '{}' for plugin {}",
                 new Object[] { name, metaData.getName() });
 
-        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName(name);
+        final PluginInfo pi = metaData.getManager().getPluginInfoByName(name);
 
         if (pi == null) {
             return false;
@@ -628,7 +628,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
 
             for (int i = 0; i < metaData.getParents().length; i++) {
                 final String parentName = metaData.getParents()[i];
-                final PluginInfo parent = PluginManager.getPluginManager()
+                final PluginInfo parent = metaData.getManager()
                         .getPluginInfoByName(parentName);
                 parent.addChild(this);
                 loaders[i] = parent.getPluginClassLoader();
@@ -646,7 +646,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 }
             }
 
-            pluginClassLoader = new PluginClassLoader(this, loaders);
+            pluginClassLoader = new PluginClassLoader(this, metaData.getManager().getGlobalClassLoader(), loaders);
         }
     }
 
@@ -774,7 +774,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 // Delete ourself as a child of our parent.
                 if (!parentUnloading) {
                     for (String parent : metaData.getParents()) {
-                        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName(parent);
+                        final PluginInfo pi = metaData.getManager().getPluginInfoByName(parent);
                         if (pi != null) {
                             pi.delChild(this);
                         }
@@ -892,7 +892,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 final String serviceName = bits.length > 4 ? bits[4] : bits[0];
 
                 // Add a provides for this
-                final Service service = PluginManager.getPluginManager().getService("export", serviceName, true);
+                final Service service = metaData.getManager().getService("export", serviceName, true);
                 synchronized (provides) {
                     service.addProvider(this);
                     provides.add(service);

src/com/dmdirc/plugins/PluginManager.java

@@ -53,9 +53,6 @@ import java.util.Map;
  */
 public class PluginManager implements ActionListener, ServiceManager {
 
-    /** Singleton instance of the plugin manager. */
-    private static PluginManager me;
-
     /** List of known plugins' file names to their corresponding {@link PluginInfo} objects. */
     private final Map<String, PluginInfo> knownPlugins = new HashMap<String, PluginInfo>();
 
@@ -71,23 +68,39 @@ public class PluginManager implements ActionListener, ServiceManager {
     /** Parent. */
     private final Main main;
 
+    /** Global ClassLoader used by plugins from this manager. */
+    private final GlobalClassLoader globalClassLoader;
+
     /**
      * Creates a new instance of PluginManager.
      */
-    private PluginManager(final IdentityManager identityManager, final Main main) {
+    public PluginManager(final IdentityManager identityManager, final Main main) {
         final String fs = System.getProperty("file.separator");
         myDir = identityManager.getConfigDir() + "plugins" + fs;
         this.main = main;
+        this.globalClassLoader = new GlobalClassLoader(this);
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_PREFS_OPENED,
                 CoreActionType.CLIENT_PREFS_CLOSED);
+        refreshPlugins();
+    }
+
+    /**
+     * Get the global class loader in use for this plugin manager.
+     *
+     * @return Global Class Loader
+     */
+    public GlobalClassLoader getGlobalClassLoader() {
+        return globalClassLoader;
     }
 
     /**
      * Get the instance of Main that owns this.
      *
-     * @return
+     * @return main that owns this.
+     * @Deprecated Global state is bad.
      */
+    @Deprecated
     public Main getMain() {
         return main;
     }
@@ -208,26 +221,6 @@ public class PluginManager implements ActionListener, ServiceManager {
         }
     }
 
-    /**
-     * Retrieves the singleton instance of the plugin manager.
-     *
-     * @return A singleton instance of PluginManager.
-     */
-    public static synchronized PluginManager initPluginManager(final IdentityManager identityManager, final Main main) {
-        me = new PluginManager(identityManager, main);
-        me.refreshPlugins();
-        return me;
-    }
-
-    /**
-     * Retrieves the singleton instance of the plugin manager.
-     *
-     * @return A singleton instance of PluginManager.
-     */
-    public static synchronized PluginManager getPluginManager() {
-        return me;
-    }
-
     /**
      * Tests and adds the specified plugin to the known plugins list. Plugins
      * will only be added if: <ul><li>The file exists,<li>No other plugin with
@@ -251,7 +244,7 @@ public class PluginManager implements ActionListener, ServiceManager {
         }
 
         try {
-            final PluginMetaData metadata = new PluginMetaData(
+            final PluginMetaData metadata = new PluginMetaData(this,
                     new URL("jar:file:" + getDirectory() + filename
                     + "!/META-INF/plugin.config"),
                     new URL("file:" + getDirectory() + filename));
@@ -485,7 +478,7 @@ public class PluginManager implements ActionListener, ServiceManager {
         // Initialise all of our metadata objects
         for (String target : pluginPaths) {
             try {
-                final PluginMetaData targetMetaData = new PluginMetaData(
+                final PluginMetaData targetMetaData = new PluginMetaData(this,
                         new URL("jar:file:" + getDirectory() + target
                         + "!/META-INF/plugin.config"),
                         new URL("file:" + getDirectory() + target));

src/com/dmdirc/plugins/PluginMetaData.java

@@ -135,13 +135,17 @@ public class PluginMetaData {
     /** The URL to load the metadata from. */
     private final URL url;
 
+    /** The parent plugin manager. */
+    private PluginManager manager;
+
     /**
      * Creates a new meta data reader for a config file at the specified URL.
      *
      * @param url The URL to load the config file from
      * @param pluginUrl The URL to the plugin that this data corresponds to
      */
-    public PluginMetaData(final URL url, final URL pluginUrl) {
+    public PluginMetaData(final PluginManager manager, final URL url, final URL pluginUrl) {
+        this.manager = manager;
         this.pluginUrl = pluginUrl;
         this.url = url;
     }
@@ -399,7 +403,7 @@ public class PluginMetaData {
     public String getRelativeFilename() {
         // Yuck...
         final String filename = getPluginUrl().getPath();
-        final String dir = new File(PluginManager.getPluginManager().getDirectory())
+        final String dir = new File(manager.getDirectory())
                 .getAbsolutePath() + File.separator;
         final String file = new File(filename).getAbsolutePath();
 
@@ -408,6 +412,15 @@ public class PluginMetaData {
 
     // <editor-fold defaultstate="collapsed" desc="Getters">
 
+    /**
+     * What plugin manager owns this metadata?
+     *
+     * @return The pluginmanager that created this metadata.
+     */
+    public PluginManager getManager() {
+        return manager;
+    }
+
     /**
      * Retrieves the URL to the plugin that this metadata corresponds to.
      *

src/com/dmdirc/ui/UIAttachDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui;
 
-import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.Main;
 import com.dmdirc.plugins.Service;
 
 import java.awt.BorderLayout;
@@ -56,10 +56,13 @@ public class UIAttachDialog extends JDialog implements ActionListener,
     private static final int GAP = 5;
     /** Services list. */
     private final JList list;
+    /** Main instance. */
+    private final Main main;
 
     /** Creates a new dialog allowing the user to select and load a UI. */
-    public UIAttachDialog() {
+    public UIAttachDialog(final Main main) {
         super();
+        this.main = main;
         list = initList();
         setLayout(new BorderLayout());
         add(list, BorderLayout.CENTER);
@@ -72,7 +75,7 @@ public class UIAttachDialog extends JDialog implements ActionListener,
         final JList newList = new JList(model);
         newList.setCellRenderer(new ServiceRenderer());
         newList.addListSelectionListener(this);
-        final List<Service> services = PluginManager.getPluginManager()
+        final List<Service> services = main.getPluginManager()
                 .getServicesByType("ui");
         for (Service service : services) {
             model.addElement(service);

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.core.util;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.UIController;
@@ -156,7 +155,7 @@ public class URLHandler {
             StatusBarManager.getStatusBarManager().setMessage(
                     new StatusMessage("Connecting to: " + uri.toString(),
                     config));
-            ServerManager.getServerManager().connectToAddress(uri);
+            controller.getMain().getServerManager().connectToAddress(uri);
         } else if ("BROWSER".equals(command)) {
             StatusBarManager.getStatusBarManager().setMessage(
                     new StatusMessage("Opening: " + uri.toString(),

src/com/dmdirc/ui/input/InputHandler.java

@@ -35,8 +35,8 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.parser.common.CompositionState;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 import com.dmdirc.ui.messages.Styliser;
@@ -110,6 +110,8 @@ public abstract class InputHandler implements ConfigChangeListener {
     private CompositionState state = CompositionState.IDLE;
     /** Timer used to manage timeouts of composition state. */
     private Timer compositionTimer;
+    /** UIController that owns this InputHandler. */
+    private final UIController controller;
 
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target
@@ -119,10 +121,11 @@ public abstract class InputHandler implements ConfigChangeListener {
      * @param thisCommandParser The command parser to use for this text field.
      * @param thisParentWindow The window that owns this input handler
      */
-    public InputHandler(final InputField thisTarget,
+    public InputHandler(final UIController controller, final InputField thisTarget,
             final CommandParser thisCommandParser,
             final WritableFrameContainer thisParentWindow) {
 
+        this.controller = controller;
         buffer = new RollingList<String>(thisParentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");
 
@@ -188,7 +191,7 @@ public abstract class InputHandler implements ConfigChangeListener {
      * Sets this inputhandler's tab completion style.
      */
     private void setStyle() {
-        style = (TabCompletionStyle) PluginManager.getPluginManager()
+        style = (TabCompletionStyle) controller.getMain().getPluginManager()
                 .getServiceProvider("tabcompletion", parentWindow
                 .getConfigManager().getOption("tabcompletion", "style"))
                 .getExportedService("getCompletionStyle").execute(tabCompleter,

src/com/dmdirc/util/URLBuilder.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.util;
 
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
 
 import java.net.MalformedURLException;
@@ -109,9 +109,17 @@ public final class URLBuilder {
      * @return An URL corresponding to the specified resource, or null on failure
      */
     public static URL buildPluginURL(final String plugin, final String path) {
+        // TODO: Un hack this.
+        // Using the ActionManager to getMain() so that we can get the plugin
+        // manager is a horribe horrible hack.
+        // But making this method require an instance of Main means that
+        // BuildURL also need one, which breaks other things. Specifically
+        // IconManager, which currently is created new each time it is needed
+        // rather than being created once and passed around.
         return buildJarURL(
-                PluginManager.getPluginManager().getPluginInfoByName(plugin)
-                .getMetaData().getPluginUrl().getPath(), path);
+                ActionManager.getActionManager().getMain().getPluginManager()
+                .getPluginInfoByName(plugin).getMetaData().getPluginUrl()
+                .getPath(), path);
     }
 
     /**

test/com/dmdirc/ServerManagerTest.java

@@ -41,15 +41,15 @@ public class ServerManagerTest {
 
     @After
     public void tearDown() {
-        for (Server server : ServerManager.getServerManager().getServers()) {
-            ServerManager.getServerManager().unregisterServer(server);
+        for (Server server : TestMain.getTestMain().getServerManager().getServers()) {
+            TestMain.getTestMain().getServerManager().unregisterServer(server);
         }
     }
 
     @Test
     public void testGetServerManager() {
-        final ServerManager resultA = ServerManager.getServerManager();
-        final ServerManager resultB = ServerManager.getServerManager();
+        final ServerManager resultA = TestMain.getTestMain().getServerManager();
+        final ServerManager resultB = TestMain.getTestMain().getServerManager();
 
         assertNotNull(resultA);
         assertTrue(resultA instanceof ServerManager);
@@ -60,7 +60,7 @@ public class ServerManagerTest {
     public void testRegisterServer() {
         final Server server = mock(Server.class);
 
-        final ServerManager instance = ServerManager.getServerManager();
+        final ServerManager instance = TestMain.getTestMain().getServerManager();
 
         instance.registerServer(server);
 
@@ -71,7 +71,7 @@ public class ServerManagerTest {
     public void testUnregisterServer() {
         final Server server = mock(Server.class);
 
-        final ServerManager instance = ServerManager.getServerManager();
+        final ServerManager instance = TestMain.getTestMain().getServerManager();
 
         instance.registerServer(server);
         instance.unregisterServer(server);
@@ -81,7 +81,7 @@ public class ServerManagerTest {
 
     @Test
     public void testNumServers() {
-        final ServerManager instance = ServerManager.getServerManager();
+        final ServerManager instance = TestMain.getTestMain().getServerManager();
 
         assertEquals(instance.getServers().size(), instance.numServers());
 
@@ -103,7 +103,7 @@ public class ServerManagerTest {
         when(serverA.getAddress()).thenReturn("255.255.255.255");
         when(serverB.getAddress()).thenReturn("255.255.255.254");
 
-        final ServerManager sm = ServerManager.getServerManager();
+        final ServerManager sm = TestMain.getTestMain().getServerManager();
 
         sm.registerServer(serverA);
         sm.registerServer(serverB);
@@ -123,7 +123,7 @@ public class ServerManagerTest {
         when(serverB.isNetwork("Net2")).thenReturn(true);
         when(serverC.isNetwork("Net2")).thenReturn(true);
 
-        final ServerManager sm = ServerManager.getServerManager();
+        final ServerManager sm = TestMain.getTestMain().getServerManager();
 
         sm.registerServer(serverA);
         sm.registerServer(serverB);
@@ -142,8 +142,8 @@ public class ServerManagerTest {
     @Test
     public void testCloseAll() {
         final Server serverA = mock(Server.class);
-        ServerManager.getServerManager().registerServer(serverA);
-        ServerManager.getServerManager().closeAll();
+        TestMain.getTestMain().getServerManager().registerServer(serverA);
+        TestMain.getTestMain().getServerManager().closeAll();
         verify(serverA).disconnect();
         verify(serverA).close();
     }
@@ -151,8 +151,8 @@ public class ServerManagerTest {
     @Test
     public void testCloseAllWithMessage() {
         final Server serverA = mock(Server.class);
-        ServerManager.getServerManager().registerServer(serverA);
-        ServerManager.getServerManager().closeAll("message here");
+        TestMain.getTestMain().getServerManager().registerServer(serverA);
+        TestMain.getTestMain().getServerManager().closeAll("message here");
         verify(serverA).disconnect("message here");
         verify(serverA).close();
     }
@@ -160,8 +160,8 @@ public class ServerManagerTest {
     @Test
     public void testDisconnectAll() {
         final Server serverA = mock(Server.class);
-        ServerManager.getServerManager().registerServer(serverA);
-        ServerManager.getServerManager().disconnectAll("message here");
+        TestMain.getTestMain().getServerManager().registerServer(serverA);
+        TestMain.getTestMain().getServerManager().disconnectAll("message here");
         verify(serverA).disconnect("message here");
     }
 
@@ -172,8 +172,8 @@ public class ServerManagerTest {
         when(serverA.hasChannel("#DMDirc")).thenReturn(true);
         when(serverA.getState()).thenReturn(ServerState.CONNECTED);
 
-        ServerManager.getServerManager().registerServer(serverA);
-        ServerManager.getServerManager().joinDevChat();
+        TestMain.getTestMain().getServerManager().registerServer(serverA);
+        TestMain.getTestMain().getServerManager().joinDevChat();
 
         verify(serverA).join(new ChannelJoinRequest("#DMDirc"));
     }
@@ -185,8 +185,8 @@ public class ServerManagerTest {
         when(serverA.hasChannel("#DMDirc")).thenReturn(false);
         when(serverA.getState()).thenReturn(ServerState.CONNECTED);
 
-        ServerManager.getServerManager().registerServer(serverA);
-        ServerManager.getServerManager().joinDevChat();
+        TestMain.getTestMain().getServerManager().registerServer(serverA);
+        TestMain.getTestMain().getServerManager().joinDevChat();
 
         verify(serverA).join(new ChannelJoinRequest("#DMDirc"));
     }
@@ -202,12 +202,12 @@ public class ServerManagerTest {
         when(serverB.getNetwork()).thenReturn("Foonet");
         when(serverB.getState()).thenReturn(ServerState.CONNECTED);
 
-        ServerManager.getServerManager().registerServer(serverA);
-        ServerManager.getServerManager().registerServer(serverB);
+        TestMain.getTestMain().getServerManager().registerServer(serverA);
+        TestMain.getTestMain().getServerManager().registerServer(serverB);
 
-        ServerManager.getServerManager().joinDevChat();
+        TestMain.getTestMain().getServerManager().joinDevChat();
 
-        assertEquals(3, ServerManager.getServerManager().numServers());
+        assertEquals(3, TestMain.getTestMain().getServerManager().numServers());
     }
 
 }

test/com/dmdirc/ServerTest.java

@@ -40,7 +40,7 @@ public class ServerTest {
     @BeforeClass
     public static void setUp() throws Exception {
         TestMain.getTestMain();
-        server = new Server(new URI("irc-test://255.255.255.255"),
+        server = new Server(TestMain.getTestMain().getServerManager(), new URI("irc-test://255.255.255.255"),
                 IdentityManager.getIdentityManager()
                 .getIdentitiesByType("profile").get(0));
     }

test/com/dmdirc/TestMain.java

@@ -28,7 +28,10 @@ public class TestMain extends Main {
             // DON'T do anything to the user's configuration... (so no calls
             // to handleInvalidConfigFile(); here)
         }
-        PluginManager.initPluginManager(IdentityManager.getIdentityManager(), this);
+        serverManager = new ServerManager(this);
+        ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
+        pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
+        pluginManager.refreshPlugins();
         CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this);
 
         ActionManager.getActionManager().initialise();

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -25,6 +25,7 @@ package com.dmdirc.actions;
 import com.dmdirc.TestMain;
 import com.dmdirc.Server;
 
+import com.dmdirc.interfaces.actions.ActionComponentArgument;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -40,7 +41,7 @@ public class ActionComponentChainTest {
     @Test
     public void testSingle() {
         final ActionComponentChain chain = new ActionComponentChain(String.class, "STRING_STRING");
-        assertEquals(chain.get("foo bar baz"), "foo bar baz");
+        assertEquals(chain.get(new ActionComponentArgument(TestMain.getTestMain(), "foo bar baz")), "foo bar baz");
         assertEquals("STRING_STRING", chain.toString());
     }
 
@@ -48,7 +49,7 @@ public class ActionComponentChainTest {
     public void testDouble() {
         final ActionComponentChain chain = new ActionComponentChain(String.class,
                 "STRING_STRING.STRING_STRING");
-        assertEquals(chain.get("foo bar baz"), "foo bar baz");
+        assertEquals(chain.get(new ActionComponentArgument(TestMain.getTestMain(), "foo bar baz")), "foo bar baz");
         assertEquals("STRING_STRING.STRING_STRING", chain.toString());
     }
 

test/com/dmdirc/actions/ActionModelTest.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.actions;
 
+import org.junit.BeforeClass;
+import com.dmdirc.TestMain;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
@@ -34,6 +36,11 @@ import static org.junit.Assert.*;
 
 public class ActionModelTest {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        TestMain.getTestMain();
+    }
+
     @Test
     public void testConditions() {
         final ActionModel model = new ActionModel("group", "name");

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.actions.wrappers;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
@@ -56,7 +56,7 @@ public class AliasWrapperTest {
         action = mock(Action.class);
         condition = mock(ActionCondition.class);
         conditions = new ArrayList<ActionCondition>();
-        aliasWrapper = new AliasWrapper(controller);
+        aliasWrapper = new AliasWrapper(controller, TestMain.getTestMain().getServerManager());
 
         when(condition.getArg()).thenReturn(1);
         when(condition.getComparison()).thenReturn(CoreActionComparison.STRING_EQUALS);

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.global.Echo;
@@ -48,7 +49,7 @@ public class CommandParserTest {
         when(cm.getOptionChar("general", "commandchar")).thenReturn('/');
         final ConfigBinder binder = new ConfigBinder(cm);
         when(cm.getBinder()).thenReturn(binder);
-        commands = new CommandManager(cm, (Main)mock(Main.class));
+        commands = new CommandManager(cm, TestMain.getTestMain());
         commands.registerCommand(new Echo(commands), Echo.INFO);
     }
 

test/com/dmdirc/ui/WindowManagerTest.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.ui;
 
+import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.TestMain;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
@@ -59,7 +60,7 @@ public class WindowManagerTest {
     public void testAddRoot() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
 
         manager.addListener(tfm);
 
@@ -76,8 +77,8 @@ public class WindowManagerTest {
     public void testAddChild() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
         manager.addListener(tfm);
 
@@ -91,7 +92,7 @@ public class WindowManagerTest {
     public void testRemoveRoot() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
         manager.addListener(tfm);
 
@@ -104,8 +105,8 @@ public class WindowManagerTest {
     public void testRemoveChild() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
         manager.addWindow(parent.getContainer(), child.getContainer());
         manager.addListener(tfm);
@@ -122,8 +123,8 @@ public class WindowManagerTest {
     public void testRemoveFrameManager() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
 
         manager.addListener(tfm);