Revert "Continue main removal"

Revert "Begin work on removing CommandManager singleton"

This reverts commit e93538e9dc.

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

src/com/dmdirc/Main.java

@@ -104,6 +104,7 @@ 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);
@@ -120,13 +121,12 @@ public class Main {
 
         pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
         checkBundledPlugins(pluginManager, IdentityManager.getIdentityManager().getGlobalConfiguration());
-        serverManager = new ServerManager(new ParserFactory(pluginManager));
 
         ThemeManager.loadThemes();
 
         clp.applySettings();
 
-        new CommandLoader(serverManager).loadCommands(CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this));
+        new CommandLoader().loadCommands(CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this));
 
         for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
             ensureExists(pluginManager, service);

src/com/dmdirc/Server.java

@@ -194,14 +194,11 @@ public class Server extends WritableFrameContainer
      * the specified profile.
      *
      * @since 0.6.3
-     *
-     * @param parserFactory Parser factory used to create parsers.
      * @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 ParserFactory parserFactory,
-            final ServerManager manager, 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(
@@ -211,7 +208,7 @@ public class Server extends WritableFrameContainer
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         this.manager = manager;
-        this.parserFactory = parserFactory;
+        parserFactory = new ParserFactory(manager.getMain().getPluginManager());
         setConnectionDetails(uri, profile);
 
         manager.registerServer(this);

src/com/dmdirc/ServerManager.java

@@ -36,25 +36,40 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import lombok.RequiredArgsConstructor;
-
 /**
  * The ServerManager maintains a list of all servers, and provides methods to
  * search or iterate over them.
  */
-@RequiredArgsConstructor
 public class ServerManager implements ServerFactory {
 
-    /** Parser factory. */
-    private final ParserFactory parserFactory;
+    /** Main that owns this ServerManager. */
+    private final Main main;
 
     /** All servers that currently exist. */
     private final Set<Server> servers = new CopyOnWriteArraySet<Server>();
 
+    /**
+     * Creates a new instance of ServerManager.
+     */
+    public ServerManager(final Main main) {
+        this.main = main;
+    }
+
+    /**
+     * Get the Main that owns this ServerManager.
+     *
+     * @return The Main that owns this ServerManager.
+     * @Deprecated Global state is bad.
+     */
+    @Deprecated
+    public Main getMain() {
+        return main;
+    }
+
     /** {@inheritDoc} */
     @Override
     public Server createServer(final URI uri, final Identity profile) {
-        return new Server(parserFactory, this, uri, profile);
+        return new Server(this, uri, profile);
     }
 
     /**
@@ -197,7 +212,7 @@ public class ServerManager implements ServerFactory {
         }
 
         if (server == null) {
-            server = new Server(parserFactory, this, uri, profile);
+            server = new Server(this, uri, profile);
             server.connect();
             return server;
         }
@@ -233,7 +248,7 @@ public class ServerManager implements ServerFactory {
 
         if (connectedServer == null) {
             try {
-                final Server server = new Server(parserFactory, this, 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/commandparser/CommandLoader.java

@@ -66,27 +66,12 @@ import com.dmdirc.commandparser.commands.server.RawServerCommand;
 import com.dmdirc.commandparser.commands.server.Reconnect;
 import com.dmdirc.commandparser.commands.server.Umode;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.ServerFactory;
 
 /**
  * Facilitates loading of core commands into a {@link CommandManager}.
  */
 public class CommandLoader {
 
-    /**
-     * Server factory to pass to commands.
-     */
-    private ServerFactory serverFactory;
-
-    /**
-     * Creates a new command loader.
-     *
-     * @param serverFactory Server factory to pass to commands
-     */
-    public CommandLoader(final ServerFactory serverFactory) {
-        this.serverFactory = serverFactory;
-    }
-
     /**
      * Loads all known core commands into the given manager.
      *
@@ -94,63 +79,63 @@ public class CommandLoader {
      */
     public void loadCommands(final CommandController manager) {
         // Chat commands
-        manager.registerCommand(new Me(manager), Me.INFO);
+        manager.registerCommand(new Me(), Me.INFO);
 
         // Channel commands
-        manager.registerCommand(new Ban(manager), Ban.INFO);
-        manager.registerCommand(new Cycle(manager), Cycle.INFO);
-        manager.registerCommand(new Invite(manager), Invite.INFO);
-        manager.registerCommand(new KickReason(manager), KickReason.INFO);
-        manager.registerCommand(new Mode(manager), Mode.INFO);
-        manager.registerCommand(new Names(manager), Names.INFO);
-        manager.registerCommand(new Part(manager), Part.INFO);
-        manager.registerCommand(new SetNickColour(manager), SetNickColour.INFO);
-        manager.registerCommand(new ShowTopic(manager), ShowTopic.INFO);
+        manager.registerCommand(new Ban(), Ban.INFO);
+        manager.registerCommand(new Cycle(), Cycle.INFO);
+        manager.registerCommand(new Invite(), Invite.INFO);
+        manager.registerCommand(new KickReason(), KickReason.INFO);
+        manager.registerCommand(new Mode(), Mode.INFO);
+        manager.registerCommand(new Names(), Names.INFO);
+        manager.registerCommand(new Part(), Part.INFO);
+        manager.registerCommand(new SetNickColour(), SetNickColour.INFO);
+        manager.registerCommand(new ShowTopic(), ShowTopic.INFO);
 
         // Server commands
-        manager.registerCommand(new AllChannels(manager), AllChannels.INFO);
-        manager.registerCommand(new Away(manager), Away.INFO);
-        manager.registerCommand(new Back(manager), Back.INFO);
-        manager.registerCommand(new ChangeServer(manager), ChangeServer.INFO);
-        manager.registerCommand(new Ctcp(manager), Ctcp.INFO);
-        manager.registerCommand(new Disconnect(manager), Disconnect.INFO);
-        manager.registerCommand(new Ignore(manager), Ignore.INFO);
-        manager.registerCommand(new JoinChannelCommand(manager), JoinChannelCommand.INFO);
-        manager.registerCommand(new Message(manager), Message.INFO);
-        manager.registerCommand(new Nick(manager), Nick.INFO);
-        manager.registerCommand(new Notice(manager), Notice.INFO);
-        manager.registerCommand(new OpenQuery(manager), OpenQuery.INFO);
-        manager.registerCommand(new Raw(manager), Raw.INFO);
-        manager.registerCommand(new Reconnect(manager), Reconnect.INFO);
-        manager.registerCommand(new Umode(manager), Umode.INFO);
+        manager.registerCommand(new AllChannels(), AllChannels.INFO);
+        manager.registerCommand(new Away(), Away.INFO);
+        manager.registerCommand(new Back(), Back.INFO);
+        manager.registerCommand(new ChangeServer(), ChangeServer.INFO);
+        manager.registerCommand(new Ctcp(), Ctcp.INFO);
+        manager.registerCommand(new Disconnect(), Disconnect.INFO);
+        manager.registerCommand(new Ignore(), Ignore.INFO);
+        manager.registerCommand(new JoinChannelCommand(), JoinChannelCommand.INFO);
+        manager.registerCommand(new Message(), Message.INFO);
+        manager.registerCommand(new Nick(), Nick.INFO);
+        manager.registerCommand(new Notice(), Notice.INFO);
+        manager.registerCommand(new OpenQuery(), OpenQuery.INFO);
+        manager.registerCommand(new Raw(), Raw.INFO);
+        manager.registerCommand(new Reconnect(), Reconnect.INFO);
+        manager.registerCommand(new Umode(), Umode.INFO);
 
-        manager.registerCommand(new RawServerCommand(manager, "lusers"));
-        manager.registerCommand(new RawServerCommand(manager, "map"));
-        manager.registerCommand(new RawServerCommand(manager, "motd"));
-        manager.registerCommand(new RawServerCommand(manager, "oper"));
-        manager.registerCommand(new RawServerCommand(manager, "whois"));
-        manager.registerCommand(new RawServerCommand(manager, "who"));
+        manager.registerCommand(new RawServerCommand("lusers"));
+        manager.registerCommand(new RawServerCommand("map"));
+        manager.registerCommand(new RawServerCommand("motd"));
+        manager.registerCommand(new RawServerCommand("oper"));
+        manager.registerCommand(new RawServerCommand("whois"));
+        manager.registerCommand(new RawServerCommand("who"));
 
         // Query commands
 
         // Global commands
-        manager.registerCommand(new AliasCommand(manager), AliasCommand.INFO);
-        manager.registerCommand(new AllServers(manager), AllServers.INFO);
-        manager.registerCommand(new Clear(manager), Clear.INFO);
-        manager.registerCommand(new Echo(manager), Echo.INFO);
-        manager.registerCommand(new Exit(manager), Exit.INFO);
-        manager.registerCommand(new Help(manager), Help.INFO);
-        manager.registerCommand(new Ifplugin(manager), Ifplugin.INFO);
-        manager.registerCommand(new NewServer(manager, serverFactory), NewServer.INFO);
-        manager.registerCommand(new Notify(manager), Notify.INFO);
-        manager.registerCommand(new LoadPlugin(manager), LoadPlugin.INFO);
-        manager.registerCommand(new UnloadPlugin(manager), UnloadPlugin.INFO);
-        manager.registerCommand(new OpenWindow(manager), OpenWindow.INFO);
-        manager.registerCommand(new ReloadActions(manager), ReloadActions.INFO);
-        manager.registerCommand(new ReloadIdentities(manager), ReloadIdentities.INFO);
-        manager.registerCommand(new ReloadPlugin(manager), ReloadPlugin.INFO);
-        manager.registerCommand(new SaveConfig(manager), SaveConfig.INFO);
-        manager.registerCommand(new Set(manager), Set.INFO);
+        manager.registerCommand(new AliasCommand(), AliasCommand.INFO);
+        manager.registerCommand(new AllServers(), AllServers.INFO);
+        manager.registerCommand(new Clear(), Clear.INFO);
+        manager.registerCommand(new Echo(), Echo.INFO);
+        manager.registerCommand(new Exit(), Exit.INFO);
+        manager.registerCommand(new Help(), Help.INFO);
+        manager.registerCommand(new Ifplugin(), Ifplugin.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);
+        manager.registerCommand(new OpenWindow(), OpenWindow.INFO);
+        manager.registerCommand(new ReloadActions(), ReloadActions.INFO);
+        manager.registerCommand(new ReloadIdentities(), ReloadIdentities.INFO);
+        manager.registerCommand(new ReloadPlugin(), ReloadPlugin.INFO);
+        manager.registerCommand(new SaveConfig(), SaveConfig.INFO);
+        manager.registerCommand(new Set(), Set.INFO);
     }
 
 }

src/com/dmdirc/commandparser/commands/Command.java

@@ -52,10 +52,7 @@ public abstract class Command {
     /**
      * Creates a new instance of Command using the default CommandManager
      * provided by {@link CommandManager#getCommandManager()}.
-     *
-     * @deprecated use {@link Command#Command(com.dmdirc.interfaces.CommandController)}
      */
-    @Deprecated
     public Command() {
         this(CommandManager.getCommandManager());
     }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -47,15 +46,6 @@ public class Ban extends Command implements IntelligentCommand {
             "ban <user|host> - bans the specified user or host from the channel",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the Ban command
-     *
-     * @param controller Command controller for the command
-     */
-    public Ban(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
@@ -45,15 +44,6 @@ public class Cycle extends Command {
             "cycle [message] - parts and rejoins the channel",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the Cycle command
-     *
-     * @param controller Command controller for the command
-     */
-    public Cycle(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -34,7 +34,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
 /**
@@ -50,15 +49,6 @@ public class Invite extends Command implements ExternalCommand {
             "invite <user> - invites user to a channel",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the Invite command
-     *
-     * @param controller Command controller for the command
-     */
-    public Invite(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/KickReason.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.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -50,15 +49,6 @@ public class KickReason extends Command implements IntelligentCommand {
             "kick <user> [reason] - kicks the specified user from the channel",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the KickReason command
-     *
-     * @param controller Command controller for the command
-     */
-    public KickReason(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -35,7 +35,6 @@ import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -52,15 +51,6 @@ public class Mode extends Command implements IntelligentCommand,
             "mode [changes] - displays or changes the current channel modes",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the Mode command
-     *
-     * @param controller Command controller for the command
-     */
-    public Mode(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -35,7 +35,6 @@ import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -50,15 +49,6 @@ public class Names extends Command implements IntelligentCommand,
             "names - Requests a list of users that are in the channel",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the Names command
-     *
-     * @param controller Command controller for the command
-     */
-    public Names(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The part command parts the current channel with a specified part message.
@@ -45,15 +44,6 @@ public class Part extends Command {
             "part [reason] - parts the channel",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the Part command
-     *
-     * @param controller Command controller for the command
-     */
-    public Part(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -51,15 +50,6 @@ public class SetNickColour extends Command implements IntelligentCommand {
             + "set the specified person's display colour",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the SetNickColour command
-     *
-     * @param controller Command controller for the command
-     */
-    public SetNickColour(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -34,7 +34,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
 /**
@@ -48,15 +47,6 @@ public class ShowTopic extends Command implements ExternalCommand {
             "topic - displays the current topic\ntopic <newtopic> - sets the channel topic",
             CommandType.TYPE_CHANNEL);
 
-    /**
-     * Creates a new instance of the ShowTopic command
-     *
-     * @param controller Command controller for the command
-     */
-    public ShowTopic(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.util.validators.ValidationResponse;
 
 /**
@@ -46,15 +45,6 @@ public class Me extends Command implements ValidatingCommand {
             "me <action> - sends the specified action",
             CommandType.TYPE_CHAT);
 
-    /**
-     * Creates a new instance of the Me command
-     *
-     * @param controller Command controller for the command
-     */
-    public Me(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -34,7 +34,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -48,15 +47,6 @@ public class AliasCommand extends Command implements IntelligentCommand {
             "alias [--remove] <name> [command] - creates or removes the specified alias",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the AliasCommand command
-     *
-     * @param controller Command controller for the command
-     */
-    public AliasCommand(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -45,15 +44,6 @@ public class AllServers extends Command implements IntelligentCommand {
             "allservers <command> - executes the command as though it had"
             + " been entered on all servers", CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the AllServers command
-     *
-     * @param controller Command controller for the command
-     */
-    public AllServers(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -43,15 +42,6 @@ public class Clear extends Command implements IntelligentCommand {
             "clear - clears the current window's text area",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the Clear command
-     *
-     * @param controller Command controller for the command
-     */
-    public Clear(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -61,6 +61,15 @@ public class Echo extends Command implements IntelligentCommand {
     /** The command flag handler for this command. */
     private final CommandFlagHandler handler;
 
+    /**
+     * Creates a new instance of Echo.
+     */
+    public Echo() {
+        super();
+
+        handler = new CommandFlagHandler(timeStampFlag, targetFlag);
+    }
+
     /**
      * Creates a new instance of Echo.
      *

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

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The exit command allows the user to quit DMDirc with a custom quit message.
@@ -43,15 +42,6 @@ public class Exit extends Command {
             "exit [reason] - exits the client",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the Exit command
-     *
-     * @param controller Command controller for the command
-     */
-    public Exit(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
@@ -53,15 +52,6 @@ public class Help extends Command implements IntelligentCommand {
             "help [command] - shows client command help",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the Help command
-     *
-     * @param controller Command controller for the command
-     */
-    public Help(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
@@ -50,15 +49,6 @@ public class Ifplugin extends Command implements IntelligentCommand {
             + "specified plugin is/isn't loaded",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the Ifplugin command
-     *
-     * @param controller Command controller for the command
-     */
-    public Ifplugin(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -45,15 +44,6 @@ public class LoadPlugin extends Command implements IntelligentCommand {
             "loadplugin <plugin> - loads the specified class as a plugin",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the LoadPlugin command
-     *
-     * @param controller Command controller for the command
-     */
-    public LoadPlugin(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -61,11 +60,9 @@ public class NewServer extends Command implements IntelligentCommand {
      * Creates a new newserver command which will use the specified factory
      * to construct servers.
      *
-     * @param controller Command controller for this command
      * @param serverFactory The factory to use to construct servers
      */
-    public NewServer(final CommandController controller, final ServerFactory serverFactory) {
-        super(controller);
+    public NewServer(final ServerFactory serverFactory) {
         this.serverFactory = serverFactory;
     }
 

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.ColourManager;
@@ -46,15 +45,6 @@ public class Notify extends Command implements IntelligentCommand {
             "notify <colour> - sets the notification colour for this window",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the Notify command
-     *
-     * @param controller Command controller for the command
-     */
-    public Notify(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -46,15 +45,6 @@ public class OpenWindow extends Command implements IntelligentCommand {
             + "- opens a window with the specified name and title",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the OpenWindow command
-     *
-     * @param controller Command controller for the command
-     */
-    public OpenWindow(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -44,15 +43,6 @@ public final class ReloadActions extends Command implements IntelligentCommand {
             "reloadactions - reloads actions from disk",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the ReloadActions command
-     *
-     * @param controller Command controller for the command
-     */
-    public ReloadActions(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/global/ReloadIdentities.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.config.IdentityManager;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -44,15 +43,6 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
             "reloadidentities - reloads user identities (configuration files)",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the ReloadIdentities command
-     *
-     * @param controller Command controller for the command
-     */
-    public ReloadIdentities(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -44,15 +43,6 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
             "reloadplugin <plugin> - Reloads the specified plugin",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the ReloadPlugin command
-     *
-     * @param controller Command controller for the command
-     */
-    public ReloadPlugin(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/global/SaveConfig.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.config.IdentityManager;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -44,15 +43,6 @@ public final class SaveConfig extends Command implements IntelligentCommand {
             "saveconfig - force the client to save its configuration to disk",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the SaveConfig command
-     *
-     * @param controller Command controller for the command
-     */
-    public SaveConfig(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -38,7 +38,6 @@ import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
@@ -68,11 +67,9 @@ public class Set extends Command implements IntelligentCommand {
 
     /**
      * Creates a new instance of Set.
-     *
-     * @param controller Command controller for this command
      */
-    public Set(final CommandController controller) {
-        super(controller);
+    public Set() {
+        super();
 
         unsetFlag.addDisabled(appendFlag);
         appendFlag.addDisabled(unsetFlag);

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -44,15 +43,6 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
             "unloadplugin <plugin> - Unloads the specified plugin",
             CommandType.TYPE_GLOBAL);
 
-    /**
-     * Creates a new instance of the UnloadPlugin command
-     *
-     * @param controller Command controller for the command
-     */
-    public UnloadPlugin(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -47,15 +46,6 @@ public class AllChannels extends Command implements IntelligentCommand {
            "allchannels <command> - executes the command as though it had"
             + " been entered on all channels", CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the AllChannels command
-     *
-     * @param controller Command controller for the command
-     */
-    public AllChannels(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Away.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The away command allows the user to set their away message.
@@ -44,15 +43,6 @@ public class Away extends Command {
     public static final CommandInfo INFO = new BaseCommandInfo("away",
            "away <reason> - marks you as away", CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Away command
-     *
-     * @param controller Command controller for the command
-     */
-    public Away(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Back.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -46,15 +45,6 @@ public class Back extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("back",
            "back - unsets your away status", CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Back command
-     *
-     * @param controller Command controller for the command
-     */
-    public Back(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.commandparser.commands.global.NewServer;
-import com.dmdirc.interfaces.CommandController;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -47,15 +46,6 @@ public class ChangeServer extends Command {
             "server <host[:[+]port]> [password] - connect to a different server",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the ChangeServer command
-     *
-     * @param controller Command controller for the command
-     */
-    public ChangeServer(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -48,15 +47,6 @@ public class Ctcp extends Command implements IntelligentCommand {
             "ctcp <target> <type> [arguments] - sends a CTCP message",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Ctcp command
-     *
-     * @param controller Command controller for the command
-     */
-    public Ctcp(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Disconnect.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The disconnect command disconnects from the current server.
@@ -43,15 +42,6 @@ public class Disconnect extends Command {
             "disconnect [reason] - disconnect from this server",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Disconnect command
-     *
-     * @param controller Command controller for the command
-     */
-    public Disconnect(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -51,15 +50,6 @@ public class Ignore extends Command implements IntelligentCommand {
             "ignore [--remove|--regex] [host] - manages the network's ignore list",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Ignore command
-     *
-     * @param controller Command controller for the command
-     */
-    public Ignore(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -35,7 +35,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -64,11 +63,9 @@ public class JoinChannelCommand extends Command implements
 
     /**
      * Creates a new instance of the join channel command.
-     *
-     * @param controller Command controller for the command
      */
-    public JoinChannelCommand(final CommandController controller) {
-        super(controller);
+    public JoinChannelCommand() {
+        super();
 
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_LINE_ADDED);

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -35,7 +35,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -52,15 +51,6 @@ public class Message extends Command implements IntelligentCommand,
             "msg <target> <message> - sends a private message",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Message command
-     *
-     * @param controller Command controller for the command
-     */
-    public Message(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Nick.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -48,15 +47,6 @@ public class Nick extends Command implements IntelligentCommand {
             "nick <new nickname> - attempts to change your nickname to the one specified",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Nick command
-     *
-     * @param controller Command controller for the command
-     */
-    public Nick(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Notice.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -48,15 +47,6 @@ public class Notice extends Command implements IntelligentCommand {
             "notice <target> <message> - sends a notice",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Notice command
-     *
-     * @param controller Command controller for the command
-     */
-    public Notice(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -35,7 +35,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
@@ -51,15 +50,6 @@ public class OpenQuery extends Command implements IntelligentCommand,
             "query <user> [message] - opens a query with the specified user",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the OpenQuery command
-     *
-     * @param controller Command controller for the command
-     */
-    public OpenQuery(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Raw.java

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The raw command allows the user to send a raw line of text directly to the
@@ -46,15 +45,6 @@ public class Raw extends Command {
             "raw <text> - sends the specified text directly to the server",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Raw command
-     *
-     * @param controller Command controller for the command
-     */
-    public Raw(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/RawServerCommand.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * Implements a raw server command (i.e., a command that is sent to the server
@@ -46,11 +45,10 @@ public class RawServerCommand extends Command implements CommandInfo {
     /**
      * Creates a new instance of RawServerCommand.
      *
-     * @param controller Command controller for the command
      * @param command The command name for this raw command
      */
-    public RawServerCommand(final CommandController controller, final String command) {
-        super(controller);
+    public RawServerCommand(final String command) {
+        super();
 
         myName = command;
     }

src/com/dmdirc/commandparser/commands/server/Reconnect.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * The reconnect command reconnects to the current server.
@@ -43,15 +42,6 @@ public class Reconnect extends Command {
             "reconnect [reason] - reconnect to this server",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Reconnect command
-     *
-     * @param controller Command controller for the command
-     */
-    public Reconnect(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/Umode.java

@@ -33,7 +33,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 /**
  * Allows the user to change user modes.
@@ -46,15 +45,6 @@ public class Umode extends Command {
             "umode [modes] - sets or displays your user modes",
             CommandType.TYPE_SERVER);
 
-    /**
-     * Creates a new instance of the Umode command
-     *
-     * @param controller Command controller for the command
-     */
-    public Umode(final CommandController controller) {
-        super(controller);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -204,7 +204,7 @@ public abstract class CommandParser implements Serializable {
                     if (actCommand != null && actCommand.getValue() instanceof ExternalCommand) {
                         ((ExternalCommand) actCommand.getValue()).execute(
                                 origin, server, channel, silent,
-                                new CommandArguments(commandManager, args.getCommandName()
+                                new CommandArguments(args.getCommandName()
                                 + " " + args.getWordsAsString(2)));
                     }
                 }

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;
@@ -46,8 +45,6 @@ public class URLHandler {
     private static Date lastLaunch;
     /** The UI Controller that owns this handler. */
     private final UIController controller;
-    /** Server manager used to create servers. */
-    private final ServerManager serverManager;
     /** Config manager. */
     private final ConfigManager config;
     /** Desktop handler. */
@@ -57,11 +54,9 @@ public class URLHandler {
      * Instantiates a new URL Handler.
      *
      * @param controller The UI controller to show dialogs etc on
-     * @param serverManager Server manager used to create servers
      */
-    public URLHandler(final UIController controller, final ServerManager serverManager) {
+    public URLHandler(final UIController controller) {
         this.controller = controller;
-        this.serverManager = serverManager;
         this.config = IdentityManager.getIdentityManager().getGlobalConfiguration();
         this.desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
     }
@@ -160,7 +155,7 @@ public class URLHandler {
             StatusBarManager.getStatusBarManager().setMessage(
                     new StatusMessage("Connecting to: " + uri.toString(),
                     config));
-            serverManager.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,8 +110,8 @@ public abstract class InputHandler implements ConfigChangeListener {
     private CompositionState state = CompositionState.IDLE;
     /** Timer used to manage timeouts of composition state. */
     private Timer compositionTimer;
-    /** Plugin managed used to retrieve tab completers. */
-    private final PluginManager pluginManager;
+    /** UIController that owns this InputHandler. */
+    private final UIController controller;
 
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target
@@ -120,14 +120,12 @@ public abstract class InputHandler implements ConfigChangeListener {
      * @param thisTarget The text field this input handler is dealing with.
      * @param thisCommandParser The command parser to use for this text field.
      * @param thisParentWindow The window that owns this input handler
-     * @param pluginManager pluginManager used to retrieve tab completers
      */
-    public InputHandler(final InputField thisTarget,
+    public InputHandler(final UIController controller, final InputField thisTarget,
             final CommandParser thisCommandParser,
-            final WritableFrameContainer thisParentWindow,
-            final PluginManager pluginManager) {
+            final WritableFrameContainer thisParentWindow) {
 
-        this.pluginManager = pluginManager;
+        this.controller = controller;
         buffer = new RollingList<String>(thisParentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");
 
@@ -193,7 +191,7 @@ public abstract class InputHandler implements ConfigChangeListener {
      * Sets this inputhandler's tab completion style.
      */
     private void setStyle() {
-        style = (TabCompletionStyle) pluginManager
+        style = (TabCompletionStyle) controller.getMain().getPluginManager()
                 .getServiceProvider("tabcompletion", parentWindow
                 .getConfigManager().getOption("tabcompletion", "style"))
                 .getExportedService("getCompletionStyle").execute(tabCompleter,

test/com/dmdirc/ServerTest.java

@@ -22,15 +22,16 @@
 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 
+import com.dmdirc.plugins.PluginManager;
 import java.net.URI;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
 
 public class ServerTest {
 
@@ -39,9 +40,7 @@ public class ServerTest {
     @BeforeClass
     public static void setUp() throws Exception {
         TestMain.getTestMain();
-        server = new Server(mock(ParserFactory.class),
-                mock(ServerManager.class),
-                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,10 +28,10 @@ public class TestMain extends Main {
             // DON'T do anything to the user's configuration... (so no calls
             // to handleInvalidConfigFile(); here)
         }
+        serverManager = new ServerManager(this);
         ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
         pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
         pluginManager.refreshPlugins();
-        serverManager = new ServerManager(new ParserFactory(pluginManager));
         CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this);
 
         ActionManager.getActionManager().initialise();

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -27,7 +27,6 @@ import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.ServerFactory;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -37,7 +36,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
 
 @RunWith(Parameterized.class)
 public class HelpTest {
@@ -59,7 +57,7 @@ public class HelpTest {
         final List<Object[]> res = new LinkedList<Object[]>();
 
         TestMain.getTestMain();
-        new CommandLoader(mock(ServerFactory.class)).loadCommands(CommandManager.getCommandManager());
+        new CommandLoader().loadCommands(CommandManager.getCommandManager());
 
         for (CommandType type : CommandType.values()) {
             for (CommandInfo command : CommandManager.getCommandManager().getCommands(type).keySet()) {

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -19,48 +19,43 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class BanTest {
 
-    private CommandController controller;
-    private Ban command;
-
-    @Before
-    public void setUp() throws Exception {
-        controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('/');
-        when(controller.getSilenceChar()).thenReturn('.');
-        command = new Ban(controller);
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
     }
 
+    private final Ban command = new Ban();
+
     @Test
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
-        command.execute(tiw, new CommandArguments(controller, "/ban"),
+        command.execute(tiw, new CommandArguments("/ban"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
 
-    /**
-     * Tests that the ban command uses the correct hostname if given a user.
-     */
+    /** Tests that the ban command uses the correct hostname if given a user. */
     @Test
     public void testKnownUser() {
         final FrameContainer container = mock(FrameContainer.class);
@@ -74,16 +69,14 @@ public class BanTest {
         when(ccInfo.getClient()).thenReturn(clientInfo);
         when(clientInfo.getHostname()).thenReturn("my.host.name");
 
-        command.execute(container, new CommandArguments(controller, "/ban user"),
+        command.execute(container, new CommandArguments("/ban user"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");
         verify(channelInfo).flushModes();
     }
 
-    /**
-     * Tests that the ban command works if given a mask not a username.
-     */
+    /** Tests that the ban command works if given a mask not a username. */
     @Test
     public void testHostmask() {
         final FrameContainer container = mock(FrameContainer.class);
@@ -92,7 +85,7 @@ public class BanTest {
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
 
-        command.execute(container, new CommandArguments(controller, "/ban *!*@my.host.name"),
+        command.execute(container, new CommandArguments("/ban *!*@my.host.name"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -22,37 +22,34 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class KickReasonTest {
 
-    private CommandController controller;
-    private KickReason command;
-
-    @Before
-    public void setUp() throws Exception {
-        controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('/');
-        command = new KickReason(controller);
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
     }
 
+    private final KickReason command = new KickReason();
+
     @Test
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
-        command.execute(tiw, new CommandArguments(controller, "/kick"),
+        command.execute(tiw, new CommandArguments("/kick"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -67,7 +64,7 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient(anyString())).thenReturn(null);
 
-        command.execute(tiw, new CommandArguments(controller, "/kick user1"),
+        command.execute(tiw, new CommandArguments("/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(tiw).addLine(eq("commandError"), matches(".*user1"));
@@ -83,7 +80,7 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
 
-        command.execute(tiw, new CommandArguments(controller, "/kick user1 reason here"),
+        command.execute(tiw, new CommandArguments("/kick user1 reason here"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(cci).kick("reason here");
@@ -102,7 +99,7 @@ public class KickReasonTest {
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
         when(manager.getOption("general", "kickmessage")).thenReturn("reason here");
 
-        command.execute(tiw, new CommandArguments(controller, "/kick user1"),
+        command.execute(tiw, new CommandArguments("/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(cci).kick("reason here");

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -25,10 +25,10 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
@@ -39,7 +39,6 @@ import static org.mockito.Mockito.*;
 
 public class ModeTest {
 
-    private CommandController controller;
     private Mode command;
     private IRCChannelInfo channelinfo;
     private Channel channel;
@@ -48,27 +47,27 @@ public class ModeTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        controller = mock(CommandController.class);
+        TestMain.getTestMain();
+
         parser = mock(IRCParser.class);
         server = mock(Server.class);
         channel = mock(Channel.class);
         channelinfo = mock(IRCChannelInfo.class);
 
-        when(controller.getCommandChar()).thenReturn('/');
         when(channel.getServer()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");
         when(channelinfo.toString()).thenReturn("#chan");
 
-        command = new Mode(controller);
+        command = new Mode();
     }
 
     @Test
     public void testWithoutArgs() {
         final FrameContainer origin = mock(FrameContainer.class);
 
-        command.execute(origin, new CommandArguments(controller, "/mode"),
+        command.execute(origin, new CommandArguments("/mode"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(origin).addLine("channelModeDiscovered", "my mode string!", channelinfo);
@@ -78,7 +77,7 @@ public class ModeTest {
     public void testWithArgs() {
         final FrameContainer origin = mock(FrameContainer.class);
 
-        command.execute(origin, new CommandArguments(controller, "/mode +hello -bye"),
+        command.execute(origin, new CommandArguments("/mode +hello -bye"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
@@ -88,7 +87,7 @@ public class ModeTest {
     public void testExternalWithArgs() {
         final FrameContainer origin = mock(FrameContainer.class);
 
-        command.execute(origin, new CommandArguments(controller, "/mode +hello -bye"),
+        command.execute(origin, new CommandArguments("/mode +hello -bye"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
@@ -99,7 +98,7 @@ public class ModeTest {
         final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, server, "#chan", false,
-                new CommandArguments(controller, "/mode"));
+                new CommandArguments("/mode"));
 
         verify(parser).sendRawMessage("MODE #chan");
     }

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -24,10 +24,10 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.*;
 
 public class NamesTest {
 
-    private CommandController controller;
     private Names command;
     private IRCChannelInfo channelinfo;
     private Channel channel;
@@ -47,24 +46,24 @@ public class NamesTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        controller = mock(CommandController.class);
+        TestMain.getTestMain();
+
         parser = mock(IRCParser.class);
         server = mock(Server.class);
         channel = mock(Channel.class);
         channelinfo = mock(IRCChannelInfo.class);
 
-        when(controller.getCommandChar()).thenReturn('/');
         when(channel.getServer()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");
 
-        command = new Names(controller);
+        command = new Names();
     }
 
     @Test
     public void testNormal() {
-        command.execute(null, new CommandArguments(controller, "/names"),
+        command.execute(null, new CommandArguments("/names"),
                 new ChannelCommandContext(null, Names.INFO, channel));
 
         verify(parser).sendRawMessage("NAMES #chan");
@@ -72,7 +71,7 @@ public class NamesTest {
 
     @Test
     public void testExternal() {
-        command.execute(null, server, "#chan", false, new CommandArguments(controller, "/names #chan"));
+        command.execute(null, server, "#chan", false, new CommandArguments("/names #chan"));
 
         verify(parser).sendRawMessage("NAMES #chan");
     }

test/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.CommandController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +37,6 @@ import static org.mockito.Mockito.*;
 
 public class PartTest {
 
-    private CommandController controller;
     private Part command;
     private Channel channel;
     private FrameContainer origin;
@@ -45,21 +44,21 @@ public class PartTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        controller = mock(CommandController.class);
+        TestMain.getTestMain();
+
         channel = mock(Channel.class);
         origin = mock(FrameContainer.class);
         manager = mock(ConfigManager.class);
 
-        when(controller.getCommandChar()).thenReturn('/');
         when(origin.getConfigManager()).thenReturn(manager);
         when(manager.getOption("general", "partmessage")).thenReturn("config part message");
 
-        command = new Part(controller);
+        command = new Part();
     }
 
     @Test
     public void testWithoutArgs() {
-        command.execute(origin, new CommandArguments(controller, "/part"),
+        command.execute(origin, new CommandArguments("/part"),
                 new ChannelCommandContext(null, Part.INFO, channel));
 
         verify(channel).part("config part message");
@@ -68,7 +67,7 @@ public class PartTest {
 
     @Test
     public void testWithArgs() {
-        command.execute(origin, new CommandArguments(controller, "/part custom part"),
+        command.execute(origin, new CommandArguments("/part custom part"),
                 new ChannelCommandContext(null, Part.INFO, channel));
 
         verify(channel).part("custom part");

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -21,35 +21,38 @@
  */
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class SetNickColourTest {
 
-    private CommandController controller;
     private Channel channel;
-    private SetNickColour command;
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
+    }
 
     @Before
     public void setUp() {
-        controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('/');
         channel = mock(Channel.class);
-        command = new SetNickColour(controller);
     }
 
+    private final SetNickColour command = new SetNickColour();
+
     @Test
     public void testUsageNoArgs() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments(controller, "/foo"),
+        command.execute(tiw, new CommandArguments("/foo"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -58,7 +61,7 @@ public class SetNickColourTest {
     @Test
     public void testUsageNicklist() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments(controller, "/foo --nicklist"),
+        command.execute(tiw, new CommandArguments("/foo --nicklist"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -67,7 +70,7 @@ public class SetNickColourTest {
     @Test
     public void testUsageText() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments(controller, "/foo --text"),
+        command.execute(tiw, new CommandArguments("/foo --text"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,35 +21,37 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
-import com.dmdirc.interfaces.CommandController;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class MeTest {
 
-    private CommandController controller;
-    private Me command;
+    private final Me command = new Me();
     private MessageTarget mtt;
 
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
+    }
+
     @Before
     public void setUp() {
-        controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('/');
         mtt = mock(MessageTarget.class);
-        command = new Me(controller);
     }
 
     @Test
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments(controller, "/foo"),
+        command.execute(tiw, new CommandArguments("/foo"),
                 new ChatCommandContext(null, Me.INFO, mtt));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -57,7 +59,7 @@ public class MeTest {
 
     @Test
     public void testSend() {
-        command.execute(null, new CommandArguments(controller, "/foo hello meep moop"),
+        command.execute(null, new CommandArguments("/foo hello meep moop"),
                 new ChatCommandContext(null, Me.INFO, mtt));
 
         verify(mtt).sendAction("hello meep moop");

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -21,33 +21,30 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class AliasCommandTest {
 
-    private CommandController controller;
-    private AliasCommand command;
+    private final AliasCommand command = new AliasCommand();
 
-    @Before
-    public void setUp() throws Exception {
-        controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('/');
-        command = new AliasCommand(controller);
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
     }
 
     @Test
     public void testUsageNoArgs() {
         final FrameContainer tiw = mock(FrameContainer.class);
 
-        command.execute(tiw, new CommandArguments(controller, "/foo"),
+        command.execute(tiw, new CommandArguments("/foo"),
                 new CommandContext(null, AliasCommand.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -57,7 +54,7 @@ public class AliasCommandTest {
     public void testUsageOneArg() {
         final FrameContainer tiw = mock(FrameContainer.class);
 
-        command.execute(tiw, new CommandArguments(controller, "/foo --remove"),
+        command.execute(tiw, new CommandArguments("/foo --remove"),
                 new CommandContext(null, AliasCommand.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -21,32 +21,29 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.CommandController;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class IfpluginTest {
 
-    private CommandController controller;
-    private Ifplugin command;
+    private final Ifplugin command = new Ifplugin();
 
-    @Before
-    public void setUpClass() throws Exception {
-        controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('/');
-        command = new Ifplugin(controller);
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
     }
 
     @Test
     public void testUsageNoArgs() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments(controller, "/foo"),
+        command.execute(tiw, new CommandArguments("/foo"),
                 new CommandContext(null, Ifplugin.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -55,7 +52,7 @@ public class IfpluginTest {
     @Test
     public void testUsageOneArg() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments(controller, "/foo bar"),
+        command.execute(tiw, new CommandArguments("/foo bar"),
                 new CommandContext(null, Ifplugin.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -21,13 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.Identity;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ServerFactory;
 
 import java.net.URI;
@@ -46,7 +45,6 @@ public class NewServerTest {
         TestMain.getTestMain();
     }
 
-    private CommandController controller;
     private FrameContainer container;
     private ServerFactory factory;
     private Server server;
@@ -54,20 +52,18 @@ public class NewServerTest {
 
     @Before
     public void setup() {
-        controller = mock(CommandController.class);
         container = mock(FrameContainer.class);
         factory = mock(ServerFactory.class);
         server = mock(Server.class);
 
-        when(controller.getCommandChar()).thenReturn('/');
         when(factory.createServer(any(URI.class), any(Identity.class))).thenReturn(server);
 
-        command = new NewServer(controller, factory);
+        command = new NewServer(factory);
     }
 
     @Test
     public void testBasicUsage() throws URISyntaxException {
-        command.execute(container, new CommandArguments(controller, "/foo irc.foo.com"),
+        command.execute(container, new CommandArguments("/foo irc.foo.com"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("irc://irc.foo.com:6667")), any(Identity.class));
@@ -76,7 +72,7 @@ public class NewServerTest {
 
     @Test
     public void testPortUsage() throws URISyntaxException {
-        command.execute(container, new CommandArguments(controller, "/foo irc.foo.com:1234"),
+        command.execute(container, new CommandArguments("/foo irc.foo.com:1234"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), any(Identity.class));
@@ -85,7 +81,7 @@ public class NewServerTest {
 
     @Test
     public void testUriUsage() throws URISyntaxException {
-        command.execute(container, new CommandArguments(controller, "/foo otheruri://foo.com:123/blah"),
+        command.execute(container, new CommandArguments("/foo otheruri://foo.com:123/blah"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("otheruri://foo.com:123/blah")), any(Identity.class));
@@ -94,7 +90,7 @@ public class NewServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        command.execute(container, new CommandArguments(controller, "/foo"),
+        command.execute(container, new CommandArguments("/foo"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -102,7 +98,7 @@ public class NewServerTest {
 
     @Test
     public void testInvalidPort() {
-        command.execute(container, new CommandArguments(controller, "/foo foo:abc"),
+        command.execute(container, new CommandArguments("/foo foo:abc"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandError"), anyString());
@@ -110,7 +106,7 @@ public class NewServerTest {
 
     @Test
     public void testOutOfRangePort1() {
-        command.execute(container, new CommandArguments(controller, "/foo foo:0"),
+        command.execute(container, new CommandArguments("/foo foo:0"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandError"), anyString());
@@ -118,7 +114,7 @@ public class NewServerTest {
 
     @Test
     public void testOutOfRangePort2() {
-        command.execute(container, new CommandArguments(controller, "/foo foo:65537"),
+        command.execute(container, new CommandArguments("/foo foo:65537"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandError"), anyString());

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -21,43 +21,45 @@
  */
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.config.Identity;
-import com.dmdirc.interfaces.CommandController;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.mockito.Mockito.*;
 
 public class ChangeServerTest {
 
-    private CommandController controller;
-    private ChangeServer command;
+    private final ChangeServer command = new ChangeServer();
     private FrameContainer tiw;
     private Identity profile;
     private Server server;
 
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TestMain.getTestMain();
+    }
+
     @Before
     public void setUp() {
-        controller = mock(CommandController.class);
         tiw = mock(FrameContainer.class);
         profile = mock(Identity.class);
         server = mock(Server.class);
-        when(controller.getCommandChar()).thenReturn('/');
         when(server.getProfile()).thenReturn(profile);
-        command = new ChangeServer(controller);
     }
 
     @Test
     public void testUsageNoArgs() {
-        command.execute(tiw, new CommandArguments(controller, "/server"),
+        command.execute(tiw, new CommandArguments("/server"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -65,7 +67,7 @@ public class ChangeServerTest {
 
     @Test
     public void testInvalidPort() {
-        command.execute(tiw, new CommandArguments(controller, "/server foo:abc"),
+        command.execute(tiw, new CommandArguments("/server foo:abc"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -73,7 +75,7 @@ public class ChangeServerTest {
 
     @Test
     public void testOutOfRangePort1() {
-        command.execute(tiw, new CommandArguments(controller, "/server foo:0"),
+        command.execute(tiw, new CommandArguments("/server foo:0"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -81,7 +83,7 @@ public class ChangeServerTest {
 
     @Test
     public void testOutOfRangePort2() {
-        command.execute(tiw, new CommandArguments(controller, "/server foo:65537"),
+        command.execute(tiw, new CommandArguments("/server foo:65537"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -89,7 +91,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteBasic() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments(controller, "/server foo:1234"),
+        command.execute(tiw, new CommandArguments("/server foo:1234"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("irc://foo:1234")), same(profile));
@@ -97,7 +99,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments(controller, "/server foo"),
+        command.execute(tiw, new CommandArguments("/server foo"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("irc://foo:6667")), same(profile));
@@ -105,7 +107,7 @@ public class ChangeServerTest {
 
     @Test
     public void testDeprecatedSSL() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments(controller, "/server --ssl foo"),
+        command.execute(tiw, new CommandArguments("/server --ssl foo"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("ircs://foo:6667")), same(profile));
@@ -113,7 +115,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteComplex() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments(controller, "/server foo:+1234 password"),
+        command.execute(tiw, new CommandArguments("/server foo:+1234 password"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("ircs://password@foo:1234")), same(profile));

test/com/dmdirc/ui/WindowManagerTest.java

@@ -60,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 DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
 
         manager.addListener(tfm);
 
@@ -77,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 DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), 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);
 
@@ -92,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 DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), 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);
 
@@ -105,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 DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), 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);
@@ -123,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 DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), 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);