Make all core commands provide a controller.

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

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

@@ -52,7 +52,10 @@ public abstract class Command {
     /**
      * Creates a new instance of Command using the default CommandManager
      * provided by {@link CommandManager#getCommandManager()}.
+     *
+     * @deprecated All commands should provide a command controller.
      */
+    @Deprecated
     public Command() {
         this(CommandManager.getCommandManager());
     }

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

@@ -66,6 +66,7 @@ import com.dmdirc.commandparser.commands.server.Raw;
 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.CommandController.CommandDetails;
 
 import java.util.HashSet;
@@ -361,13 +362,14 @@ public class CommandModule {
     /**
      * Provides a set of raw commands.
      *
+     * @param controller The controller to use for command info.
      * @return A set of the commands' details.
      */
     @Provides(type = Provides.Type.SET_VALUES)
-    public Set<CommandDetails> getRawCommands() {
+    public Set<CommandDetails> getRawCommands(final CommandController controller) {
         final Set<CommandDetails> results = new HashSet<>();
         for (String name : new String[] { "lusers", "map", "motd", "oper", "whois", "who" }) {
-            final RawServerCommand rawCommand = new RawServerCommand(name);
+            final RawServerCommand rawCommand = new RawServerCommand(controller, name);
             results.add(new SimpleCommandDetails(rawCommand, rawCommand));
         }
         return results;

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

@@ -38,12 +38,10 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
 import javax.inject.Inject;
-import lombok.NoArgsConstructor;
 
 /**
  * The kick command bans a specified user or host from the channel.
  */
-@NoArgsConstructor
 public class Ban extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */

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

@@ -32,6 +32,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -46,9 +47,14 @@ public class Cycle extends Command {
             "cycle [message] - parts and rejoins the channel",
             CommandType.TYPE_CHANNEL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Cycle() {
+    public Cycle(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -34,6 +34,7 @@ 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;
 
 import javax.inject.Inject;
@@ -51,9 +52,14 @@ public class Invite extends Command implements ExternalCommand {
             "invite <user> - invites user to a channel",
             CommandType.TYPE_CHANNEL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Invite() {
+    public Invite(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -39,13 +39,11 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
 import javax.inject.Inject;
-import lombok.NoArgsConstructor;
 
 /**
  * The kick command kicks a specified user from the channel.
  * This version allows the user to specify a reason.
  */
-@NoArgsConstructor
 @CommandOptions(allowOffline = false)
 public class KickReason extends Command implements IntelligentCommand {
 

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

@@ -35,6 +35,7 @@ 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;
@@ -53,9 +54,14 @@ public class Mode extends Command implements IntelligentCommand,
             "mode [changes] - displays or changes the current channel modes",
             CommandType.TYPE_CHANNEL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Mode() {
+    public Mode(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -35,6 +35,7 @@ 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;
 
 import javax.inject.Inject;
@@ -51,9 +52,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Names() {
+    public Names(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -32,6 +32,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -46,9 +47,14 @@ public class Part extends Command {
             "part [reason] - parts the channel",
             CommandType.TYPE_CHANNEL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Part() {
+    public Part(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -56,15 +56,6 @@ public class SetNickColour extends Command implements IntelligentCommand {
     /** Manager to use to convert colours. */
     private final ColourManager colourManager;
 
-    /**
-     * Creates a new instance of the {@link SetNickColour} command.
-     *
-     * @param colourManager The colour manager to use to convert colours.
-     */
-    public SetNickColour(final ColourManager colourManager) {
-        this.colourManager = colourManager;
-    }
-
     /**
      * Creates a new instance of the {@link SetNickColour} command.
      *

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

@@ -34,6 +34,7 @@ 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;
 
 import javax.inject.Inject;
@@ -49,9 +50,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public ShowTopic() {
+    public ShowTopic(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -33,6 +33,7 @@ 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;
 
 import javax.inject.Inject;
@@ -47,9 +48,14 @@ public class Me extends Command implements ValidatingCommand {
             "me <action> - sends the specified action",
             CommandType.TYPE_CHAT);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of {@link Ban} using the given command controller.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Me() {
+    public Me(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -53,15 +53,6 @@ public class AliasCommand extends Command implements IntelligentCommand {
     /** Wrapper to use to modify aliases. */
     private final AliasWrapper aliasWrapper;
 
-    /**
-     * Creates a new instance of {@link AliasCommand}.
-     *
-     * @param aliasWrapper The wrapper to use to modify aliases.
-     */
-    public AliasCommand(final AliasWrapper aliasWrapper) {
-        this.aliasWrapper = aliasWrapper;
-    }
-
     /**
      * Creates a new instance of {@link AliasCommand}.
      *

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

@@ -32,6 +32,7 @@ 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;
 
@@ -53,10 +54,12 @@ public class AllServers extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link AllServers} command.
      *
+     * @param controller The controller that owns this command.
      * @param serverManager The server manager to use to iterate servers.
      */
     @Inject
-    public AllServers(final ServerManager serverManager) {
+    public AllServers(final CommandController controller, final ServerManager serverManager) {
+        super(controller);
         this.serverManager = serverManager;
     }
 

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

@@ -30,6 +30,7 @@ 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 javax.inject.Inject;
@@ -44,9 +45,14 @@ public class Clear extends Command implements IntelligentCommand {
             "clear - clears the current window's text area",
             CommandType.TYPE_GLOBAL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Clear() {
+    public Clear(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -63,15 +63,6 @@ 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

@@ -30,6 +30,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -51,11 +52,13 @@ public class Exit extends Command {
     /**
      * Creates a new instance of the {@link Exit} command.
      *
-     * @param controller The controller to use to quit the app.
+     * @param controller Command controller
+     * @param lifecycleController The controller to use to quit the app.
      */
     @Inject
-    public Exit(final LifecycleController controller) {
-        this.controller = controller;
+    public Exit(final CommandController controller, final LifecycleController lifecycleController) {
+        super(controller);
+        this.controller = lifecycleController;
     }
 
     /** {@inheritDoc} */

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

@@ -31,6 +31,7 @@ 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;
@@ -54,9 +55,14 @@ public class Help extends Command implements IntelligentCommand {
             "help [command] - shows client command help",
             CommandType.TYPE_GLOBAL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Help() {
+    public Help(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */
@@ -77,7 +83,7 @@ public class Help extends Command implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      */
     private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
-        final List<String> commands = new ArrayList<String>(((WritableFrameContainer) origin)
+        final List<String> commands = new ArrayList<>(((WritableFrameContainer) origin)
                 .getCommandParser().getCommands().keySet());
 
         Collections.sort(commands);
@@ -115,7 +121,7 @@ public class Help extends Command implements IntelligentCommand {
      */
     private void showCommand(final FrameContainer origin, final boolean isSilent,
             final String name) {
-        Map.Entry<CommandInfo, Command> command = null;
+        Map.Entry<CommandInfo, Command> command;
 
         if (name.length() > 0 && name.charAt(0) == getController().getCommandChar()) {
             command = getController().getCommand(name.substring(1));

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

@@ -33,6 +33,7 @@ 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.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -58,10 +59,12 @@ public class Ifplugin extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link Ifplugin} command.
      *
+     * @param controller The controller to use for command information.
      * @param pluginManager The plugin manager to use to query plugins.
      */
     @Inject
-    public Ifplugin(final PluginManager pluginManager) {
+    public Ifplugin(final CommandController controller, final PluginManager pluginManager) {
+        super(controller);
         this.pluginManager = pluginManager;
     }
 

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

@@ -30,6 +30,7 @@ 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.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
@@ -53,10 +54,12 @@ public class LoadPlugin extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link LoadPlugin} command.
      *
+     * @param controller The controller to use for command information.
      * @param pluginManager The plugin manager to load plugins with.
      */
     @Inject
-    public LoadPlugin(final PluginManager pluginManager) {
+    public LoadPlugin(final CommandController controller, final PluginManager pluginManager) {
+        super(controller);
         this.pluginManager = pluginManager;
     }
 

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

@@ -31,6 +31,7 @@ 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.interfaces.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
@@ -69,15 +70,18 @@ public class NewServer extends Command implements IntelligentCommand {
      * Creates a new newserver command which will use the specified factory
      * to construct servers.
      *
-     * @param serverFactory The factory to use to construct servers
+     * @param controller The controller to use for command information.
+     * @param serverFactory The factory to use to construct servers.
      * @param pluginManager The plugin manager to use to query available services.
      * @param identityController Identity controller to use to find profiles.
      */
     @Inject
     public NewServer(
+            final CommandController controller,
             final ServerFactory serverFactory,
             final PluginManager pluginManager,
             final IdentityController identityController) {
+        super(controller);
         this.serverFactory = serverFactory;
         this.pluginManager = pluginManager;
         this.identityController = identityController;

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

@@ -30,6 +30,7 @@ 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;
@@ -53,10 +54,12 @@ public class Notify extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link Notify} command.
      *
+     * @param controller The controller to use for command information.
      * @param colourManager The colour manager to use to convert colours.
      */
     @Inject
-    public Notify(final ColourManager colourManager) {
+    public Notify(final CommandController controller, final ColourManager colourManager) {
+        super(controller);
         this.colourManager = colourManager;
     }
 

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

@@ -31,6 +31,7 @@ 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;
 
@@ -47,9 +48,14 @@ public class OpenWindow extends Command implements IntelligentCommand {
             + "- opens a window with the specified name and title",
             CommandType.TYPE_GLOBAL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public OpenWindow() {
+    public OpenWindow(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -31,6 +31,7 @@ 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 javax.inject.Inject;
@@ -45,9 +46,14 @@ public final class ReloadActions extends Command implements IntelligentCommand {
             "reloadactions - reloads actions from disk",
             CommandType.TYPE_GLOBAL);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public ReloadActions() {
+    public ReloadActions(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -30,6 +30,7 @@ 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.interfaces.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -51,10 +52,12 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link ReloadIdentities} command.
      *
+     * @param controller The controller to use for command information.
      * @param identityController The controller to reload identities on.
      */
     @Inject
-    public ReloadIdentities(final IdentityController identityController) {
+    public ReloadIdentities(final CommandController controller, final IdentityController identityController) {
+        super(controller);
         this.identityController = identityController;
     }
 

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

@@ -30,6 +30,7 @@ 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.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -52,10 +53,12 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link ReloadPlugin} command.
      *
+     * @param controller The controller to use for command information.
      * @param pluginManager The plugin manager to reload plugins with.
      */
     @Inject
-    public ReloadPlugin(final PluginManager pluginManager) {
+    public ReloadPlugin(final CommandController controller, final PluginManager pluginManager) {
+        super(controller);
         this.pluginManager = pluginManager;
     }
 

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

@@ -30,6 +30,7 @@ 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.interfaces.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -51,10 +52,12 @@ public final class SaveConfig extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link SaveConfig} command.
      *
+     * @param controller The controller to use for command information.
      * @param identityController The controller to save identities on.
      */
     @Inject
-    public SaveConfig(final IdentityController identityController) {
+    public SaveConfig(final CommandController controller, final IdentityController identityController) {
+        super(controller);
         this.identityController = identityController;
     }
 

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

@@ -37,6 +37,7 @@ import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -76,14 +77,16 @@ public class SetCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of Set.
      *
+     * @param controller The controller to use for command information.
      * @param identityController The controller to use to set settings.
      * @param identityFactory The factory to use to create new identities.
      */
     @Inject
     public SetCommand(
+            final CommandController controller,
             final IdentityController identityController,
             final IdentityFactory identityFactory) {
-        super();
+        super(controller);
 
         this.identityController = identityController;
         this.identityFactory = identityFactory;

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

@@ -30,6 +30,7 @@ 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.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -52,10 +53,12 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of the {@link UnloadPlugin} command.
      *
+     * @param controller The controller to use for command information.
      * @param pluginManager The plugin manager to unload plugins with.
      */
     @Inject
-    public UnloadPlugin(final PluginManager pluginManager) {
+    public UnloadPlugin(final CommandController controller, final PluginManager pluginManager) {
+        super(controller);
         this.pluginManager = pluginManager;
     }
 

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

@@ -32,6 +32,7 @@ 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;
 
@@ -48,9 +49,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public AllChannels() {
+    public AllChannels(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -32,6 +32,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -45,9 +46,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Away() {
+    public Away(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -33,6 +33,7 @@ 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 javax.inject.Inject;
@@ -47,9 +48,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Back() {
+    public Back(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -32,6 +32,7 @@ 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;
@@ -48,9 +49,14 @@ public class ChangeServer extends Command {
             "server <host[:[+]port]> [password] - connect to a different server",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public ChangeServer() {
+    public ChangeServer(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -33,6 +33,7 @@ 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;
 
@@ -49,9 +50,14 @@ public class Ctcp extends Command implements IntelligentCommand {
             "ctcp <target> <type> [arguments] - sends a CTCP message",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Ctcp() {
+    public Ctcp(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -31,6 +31,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -44,9 +45,14 @@ public class Disconnect extends Command {
             "disconnect [reason] - disconnect from this server",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Disconnect() {
+    public Disconnect(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -32,6 +32,7 @@ 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;
@@ -52,9 +53,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Ignore() {
+    public Ignore(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -35,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.ActionController;
 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;
@@ -65,13 +66,13 @@ public class JoinChannelCommand extends Command implements
     /**
      * Creates a new instance of the join channel command.
      *
-     * @param controller The action controller to register listeners with.
+     * @param controller The controller to use to retrieve command information.
+     * @param actionController The action controller to register listeners with.
      */
     @Inject
-    public JoinChannelCommand(final ActionController controller) {
-        super();
-
-        controller.registerListener(this, CoreActionType.CLIENT_LINE_ADDED);
+    public JoinChannelCommand(final CommandController controller, final ActionController actionController) {
+        super(controller);
+        actionController.registerListener(this, CoreActionType.CLIENT_LINE_ADDED);
     }
 
     /** {@inheritDoc} */

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

@@ -35,6 +35,7 @@ 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;
@@ -53,9 +54,14 @@ public class Message extends Command implements IntelligentCommand,
             "msg <target> <message> - sends a private message",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Message() {
+    public Message(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -33,6 +33,7 @@ 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;
 
@@ -49,9 +50,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Nick() {
+    public Nick(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -33,6 +33,7 @@ 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;
 
@@ -49,9 +50,14 @@ public class Notice extends Command implements IntelligentCommand {
             "notice <target> <message> - sends a notice",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Notice() {
+    public Notice(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -35,6 +35,7 @@ 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;
@@ -52,9 +53,14 @@ 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 this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public OpenQuery() {
+    public OpenQuery(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -32,6 +32,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -47,9 +48,14 @@ public class Raw extends Command {
             "raw <text> - sends the specified text directly to the server",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Raw() {
+    public Raw(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -31,6 +31,7 @@ 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
@@ -45,11 +46,11 @@ public class RawServerCommand extends Command implements CommandInfo {
     /**
      * Creates a new instance of RawServerCommand.
      *
+     * @param controller The controller to use for command info.
      * @param command The command name for this raw command
      */
-    public RawServerCommand(final String command) {
-        super();
-
+    public RawServerCommand(final CommandController controller, final String command) {
+        super(controller);
         myName = command;
     }
 

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

@@ -31,6 +31,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -44,9 +45,14 @@ public class Reconnect extends Command {
             "reconnect [reason] - reconnect to this server",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Reconnect() {
+    public Reconnect(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -33,6 +33,7 @@ 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;
 
 import javax.inject.Inject;
 
@@ -47,9 +48,14 @@ public class Umode extends Command {
             "umode [modes] - sets or displays your user modes",
             CommandType.TYPE_SERVER);
 
-    /** Creates a new instance of this command. */
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
     @Inject
-    public Umode() {
+    public Umode(final CommandController controller) {
+        super(controller);
     }
 
     /** {@inheritDoc} */

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

@@ -25,49 +25,46 @@ 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.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ModeTest {
 
+    @Mock private FrameContainer origin;
+    @Mock private CommandController controller;
+    @Mock private ChannelInfo channelinfo;
+    @Mock private Channel channel;
+    @Mock private Server server;
+    @Mock private Parser parser;
     private Mode command;
-    private IRCChannelInfo channelinfo;
-    private Channel channel;
-    private Server server;
-    private IRCParser parser;
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-
-        parser = mock(IRCParser.class);
-        server = mock(Server.class);
-        channel = mock(Channel.class);
-        channelinfo = mock(IRCChannelInfo.class);
-
         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();
+        command = new Mode(controller);
     }
 
     @Test
     public void testWithoutArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
-
-        command.execute(origin, new CommandArguments("/mode"),
+        command.execute(origin, new CommandArguments(controller, "/mode"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(origin).addLine("channelModeDiscovered", "my mode string!", channelinfo);
@@ -75,9 +72,7 @@ public class ModeTest {
 
     @Test
     public void testWithArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
-
-        command.execute(origin, new CommandArguments("/mode +hello -bye"),
+        command.execute(origin, new CommandArguments(controller, "/mode +hello -bye"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
@@ -85,9 +80,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
-
-        command.execute(origin, new CommandArguments("/mode +hello -bye"),
+        command.execute(origin, new CommandArguments(controller, "/mode +hello -bye"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
@@ -95,10 +88,8 @@ public class ModeTest {
 
     @Test
     public void testExternalWithoutArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
-
         command.execute(origin, server, "#chan", false,
-                new CommandArguments("/mode"));
+                new CommandArguments(controller,"/mode"));
 
         verify(parser).sendRawMessage("MODE #chan");
     }

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

@@ -24,46 +24,45 @@ 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.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class NamesTest {
 
+    @Mock private CommandController controller;
+    @Mock private ChannelInfo channelinfo;
+    @Mock private Channel channel;
+    @Mock private Server server;
+    @Mock private Parser parser;
+
     private Names command;
-    private IRCChannelInfo channelinfo;
-    private Channel channel;
-    private Server server;
-    private IRCParser parser;
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-
-        parser = mock(IRCParser.class);
-        server = mock(Server.class);
-        channel = mock(Channel.class);
-        channelinfo = mock(IRCChannelInfo.class);
-
         when(channel.getServer()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");
 
-        command = new Names();
+        command = new Names(controller);
     }
 
     @Test
     public void testNormal() {
-        command.execute(null, new CommandArguments("/names"),
+        command.execute(null, new CommandArguments(controller, "/names"),
                 new ChannelCommandContext(null, Names.INFO, channel));
 
         verify(parser).sendRawMessage("NAMES #chan");
@@ -71,7 +70,8 @@ public class NamesTest {
 
     @Test
     public void testExternal() {
-        command.execute(null, server, "#chan", false, new CommandArguments("/names #chan"));
+        command.execute(null, server, "#chan", false,
+                new CommandArguments(controller, "/names #chan"));
 
         verify(parser).sendRawMessage("NAMES #chan");
     }

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

@@ -22,43 +22,42 @@
 
 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;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PartTest {
 
+    @Mock private Channel channel;
+    @Mock private FrameContainer origin;
+    @Mock private ConfigManager manager;
+    @Mock private CommandController controller;
     private Part command;
-    private Channel channel;
-    private FrameContainer origin;
-    private ConfigManager manager;
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-
-        channel = mock(Channel.class);
-        origin = mock(FrameContainer.class);
-        manager = mock(ConfigManager.class);
-
         when(origin.getConfigManager()).thenReturn(manager);
         when(manager.getOption("general", "partmessage")).thenReturn("config part message");
 
-        command = new Part();
+        command = new Part(controller);
     }
 
     @Test
     public void testWithoutArgs() {
-        command.execute(origin, new CommandArguments("/part"),
+        command.execute(origin, new CommandArguments(controller, "/part"),
                 new ChannelCommandContext(null, Part.INFO, channel));
 
         verify(channel).part("config part message");
@@ -67,7 +66,7 @@ public class PartTest {
 
     @Test
     public void testWithArgs() {
-        command.execute(origin, new CommandArguments("/part custom part"),
+        command.execute(origin, new CommandArguments(controller, "/part custom part"),
                 new ChannelCommandContext(null, Part.INFO, channel));
 
         verify(channel).part("custom part");

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

@@ -21,45 +21,42 @@
  */
 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 org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class MeTest {
 
-    private final Me command = new Me();
-    private MessageTarget mtt;
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        TestMain.getTestMain();
-    }
+    @Mock private MessageTarget mtt;
+    @Mock private CommandController controller;
+    private Me command;
 
     @Before
     public void setUp() {
-        mtt = mock(MessageTarget.class);
+        command = new Me(controller);
     }
 
     @Test
     public void testUsage() {
-        final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments("/foo"),
+        command.execute(mtt, new CommandArguments(controller, "/foo"),
                 new ChatCommandContext(null, Me.INFO, mtt));
 
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(mtt).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
 
     @Test
     public void testSend() {
-        command.execute(null, new CommandArguments("/foo hello meep moop"),
+        command.execute(null, new CommandArguments(controller, "/foo hello meep moop"),
                 new ChatCommandContext(null, Me.INFO, mtt));
 
         verify(mtt).sendAction("hello meep moop");

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

@@ -22,34 +22,35 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginManager;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class IfpluginTest {
 
+    @Mock private CommandController controller;
     @Mock private PluginManager pluginManager;
+    @Mock private FrameContainer tiw;
     private Ifplugin command;
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        TestMain.getTestMain();
-        command = new Ifplugin(pluginManager);
+        command = new Ifplugin(controller, pluginManager);
     }
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments("/foo"),
+        command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new CommandContext(null, Ifplugin.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -57,8 +58,7 @@ public class IfpluginTest {
 
     @Test
     public void testUsageOneArg() {
-        final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments("/foo bar"),
+        command.execute(tiw, new CommandArguments(controller, "/foo bar"),
                 new CommandContext(null, Ifplugin.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

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

@@ -23,16 +23,17 @@ package com.dmdirc.commandparser.commands.global;
 
 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.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.plugins.PluginManager;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,12 +41,12 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import clover.retrotranslator.edu.emory.mathcs.backport.java.util.Arrays;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class NewServerTest {
 
+    @Mock private CommandController controller;
     @Mock private IdentityController identityController;
     @Mock private Identity identity;
     @Mock private FrameContainer container;
@@ -56,15 +57,14 @@ public class NewServerTest {
 
     @Before
     public void setup() {
-        TestMain.getTestMain();
         when(factory.createServer(any(URI.class), any(Identity.class))).thenReturn(server);
         when(identityController.getIdentitiesByType("profile")).thenReturn(Arrays.asList(new Identity[] { identity }));
-        command = new NewServer(factory, pluginManager, identityController);
+        command = new NewServer(controller, factory, pluginManager, identityController);
     }
 
     @Test
     public void testBasicUsage() throws URISyntaxException {
-        command.execute(container, new CommandArguments("/foo irc.foo.com"),
+        command.execute(container, new CommandArguments(controller, "/foo irc.foo.com"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("irc://irc.foo.com:6667")), any(Identity.class));
@@ -73,7 +73,7 @@ public class NewServerTest {
 
     @Test
     public void testPortUsage() throws URISyntaxException {
-        command.execute(container, new CommandArguments("/foo irc.foo.com:1234"),
+        command.execute(container, new CommandArguments(controller, "/foo irc.foo.com:1234"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), any(Identity.class));
@@ -82,7 +82,7 @@ public class NewServerTest {
 
     @Test
     public void testUriUsage() throws URISyntaxException {
-        command.execute(container, new CommandArguments("/foo otheruri://foo.com:123/blah"),
+        command.execute(container, new CommandArguments(controller, "/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));
@@ -91,7 +91,7 @@ public class NewServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        command.execute(container, new CommandArguments("/foo"),
+        command.execute(container, new CommandArguments(controller, "/foo"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -99,7 +99,7 @@ public class NewServerTest {
 
     @Test
     public void testInvalidPort() {
-        command.execute(container, new CommandArguments("/foo foo:abc"),
+        command.execute(container, new CommandArguments(controller, "/foo foo:abc"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandError"), anyString());
@@ -107,7 +107,7 @@ public class NewServerTest {
 
     @Test
     public void testOutOfRangePort1() {
-        command.execute(container, new CommandArguments("/foo foo:0"),
+        command.execute(container, new CommandArguments(controller, "/foo foo:0"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandError"), anyString());
@@ -115,7 +115,7 @@ public class NewServerTest {
 
     @Test
     public void testOutOfRangePort2() {
-        command.execute(container, new CommandArguments("/foo foo:65537"),
+        command.execute(container, new CommandArguments(controller, "/foo foo:65537"),
                 new CommandContext(null, NewServer.INFO));
 
         verify(container).addLine(eq("commandError"), anyString());

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

@@ -21,45 +21,52 @@
  */
 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 com.dmdirc.logger.ErrorManager;
+import com.dmdirc.logger.Logger;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ChangeServerTest {
 
-    private final ChangeServer command = new ChangeServer();
-    private FrameContainer tiw;
-    private Identity profile;
-    private Server server;
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        TestMain.getTestMain();
-    }
+    @Mock private ErrorManager errorManager;
+    @Mock private CommandController controller;
+    @Mock private FrameContainer tiw;
+    @Mock private Identity profile;
+    @Mock private Server server;
+    private ChangeServer command;
 
     @Before
     public void setUp() {
+        Logger.setErrorManager(errorManager);
+
         tiw = mock(FrameContainer.class);
         profile = mock(Identity.class);
         server = mock(Server.class);
+
         when(server.getProfile()).thenReturn(profile);
+
+        command = new ChangeServer(controller);
     }
 
     @Test
     public void testUsageNoArgs() {
-        command.execute(tiw, new CommandArguments("/server"),
+        command.execute(tiw, new CommandArguments(controller, "/server"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -67,7 +74,7 @@ public class ChangeServerTest {
 
     @Test
     public void testInvalidPort() {
-        command.execute(tiw, new CommandArguments("/server foo:abc"),
+        command.execute(tiw, new CommandArguments(controller, "/server foo:abc"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -75,7 +82,7 @@ public class ChangeServerTest {
 
     @Test
     public void testOutOfRangePort1() {
-        command.execute(tiw, new CommandArguments("/server foo:0"),
+        command.execute(tiw, new CommandArguments(controller, "/server foo:0"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -83,7 +90,7 @@ public class ChangeServerTest {
 
     @Test
     public void testOutOfRangePort2() {
-        command.execute(tiw, new CommandArguments("/server foo:65537"),
+        command.execute(tiw, new CommandArguments(controller, "/server foo:65537"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -91,7 +98,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteBasic() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments("/server foo:1234"),
+        command.execute(tiw, new CommandArguments(controller, "/server foo:1234"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("irc://foo:1234")), same(profile));
@@ -99,7 +106,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments("/server foo"),
+        command.execute(tiw, new CommandArguments(controller, "/server foo"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("irc://foo:6667")), same(profile));
@@ -107,7 +114,7 @@ public class ChangeServerTest {
 
     @Test
     public void testDeprecatedSSL() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments("/server --ssl foo"),
+        command.execute(tiw, new CommandArguments(controller, "/server --ssl foo"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("ircs://foo:6667")), same(profile));
@@ -115,7 +122,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteComplex() throws URISyntaxException {
-        command.execute(tiw, new CommandArguments("/server foo:+1234 password"),
+        command.execute(tiw, new CommandArguments(controller, "/server foo:+1234 password"),
                 new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("ircs://password@foo:1234")), same(profile));