Stop using deprecated Command constructor

Change-Id: I65539646852b5e1542f23a069a1fe2d68cbf4fa6
Reviewed-on: http://gerrit.dmdirc.com/2591
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/activewindow/ActiveCommand.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;
 
@@ -51,10 +52,12 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new active command.
      *
+     * @param commandController Command controller
      * @param mainFrame Parent MainFrame
      */
-    public ActiveCommand(final MainFrame mainFrame) {
-        super();
+    public ActiveCommand(final CommandController commandController,
+            final MainFrame mainFrame) {
+        super(commandController);
         this.mainFrame = mainFrame;
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.activewindow;
 
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.plugins.BasePlugin;
 
@@ -35,14 +36,16 @@ public final class ActiveWindowPlugin extends BasePlugin {
     /**
      * Creates a new instance of this plugin.
      *
+     * @param commandController Command controller
      * @param controller The controller to use to find active windows
      */
-    public ActiveWindowPlugin(final SwingController controller) {
+    public ActiveWindowPlugin(final CommandController commandController,
+            final SwingController controller) {
         super();
 
         sink = new ActiveWindowMessageSink(controller.getMainFrame());
 
-        registerCommand(new ActiveCommand(controller.getMainFrame()),
+        registerCommand(new ActiveCommand(commandController, controller.getMainFrame()),
                 ActiveCommand.INFO);
     }
 

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -29,6 +29,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 java.io.File;
 
@@ -41,6 +42,15 @@ public class AudioCommand extends Command {
     public static final CommandInfo INFO = new BaseCommandInfo("audio",
             "audio <file> - plays the specified file", CommandType.TYPE_GLOBAL);
 
+    /**
+     * Creates a new instance of the AudioCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public AudioCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/audio/AudioPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.audio;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 /**
@@ -29,10 +30,14 @@ import com.dmdirc.plugins.BasePlugin;
  */
 public final class AudioPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public AudioPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public AudioPlugin(final CommandController commandController) {
         super();
-        registerCommand(new AudioCommand(), AudioCommand.INFO);
-        registerCommand(new BeepCommand(), BeepCommand.INFO);
+        registerCommand(new AudioCommand(commandController), AudioCommand.INFO);
+        registerCommand(new BeepCommand(commandController), BeepCommand.INFO);
     }
 }

src/com/dmdirc/addons/audio/BeepCommand.java

@@ -29,6 +29,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 java.awt.Toolkit;
 
@@ -41,6 +42,15 @@ public class BeepCommand extends Command {
     public static final CommandInfo INFO = new BaseCommandInfo("beep",
             "beep - emits a beep", CommandType.TYPE_GLOBAL);
 
+    /**
+     * Creates a new instance of the BeepCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public BeepCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/calc/CalcCommand.java

@@ -29,6 +29,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 java.text.ParseException;
 
@@ -41,7 +42,16 @@ public class CalcCommand extends Command {
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("calc",
             "calc [--showexpr] <expr> - evaluate mathematical expression",
-            CommandType.TYPE_GLOBAL) ;
+            CommandType.TYPE_GLOBAL);
+
+    /**
+     * Creates a new instance of the CalcCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public CalcCommand(final CommandController controller) {
+        super(controller);
+    }
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/calc/CalcPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.calc;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 /**
@@ -29,9 +30,13 @@ import com.dmdirc.plugins.BasePlugin;
  */
 public class CalcPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public CalcPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param controller Command controller
+     */
+    public CalcPlugin(final CommandController controller) {
         super();
-        registerCommand(new CalcCommand(), CalcCommand.INFO);
+        registerCommand(new CalcCommand(controller), CalcCommand.INFO);
     }
 }

src/com/dmdirc/addons/contactlist/ContactListCommand.java

@@ -31,6 +31,7 @@ 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.ui.input.AdditionalTabTargets;
 
 /**
@@ -41,7 +42,16 @@ public class ContactListCommand extends Command implements IntelligentCommand {
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("contactlist",
             "contactlist - show a contact list for the current channel",
-            CommandType.TYPE_CHANNEL) ;
+            CommandType.TYPE_CHANNEL);
+
+    /**
+     * Creates a new instance of the ContactListCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public ContactListCommand(final CommandController controller) {
+        super(controller);
+    }
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/contactlist/ContactListPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.contactlist;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 /**
@@ -29,9 +30,13 @@ import com.dmdirc.plugins.BasePlugin;
  */
 public final class ContactListPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public ContactListPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public ContactListPlugin(final CommandController commandController) {
         super();
-        registerCommand(new ContactListCommand(), ContactListCommand.INFO);
+        registerCommand(new ContactListCommand(commandController), ContactListCommand.INFO);
     }
 }

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

@@ -40,6 +40,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.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -68,11 +69,13 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of DCCCommand.
      *
+     * @param commandController Command controller
      * @param mainFrame mainFrame instance to use
      * @param plugin The DCC Plugin that this command belongs to
      */
-    public DCCCommand(final MainFrame mainFrame, final DCCPlugin plugin) {
-        super();
+    public DCCCommand(final CommandController commandController,
+            final MainFrame mainFrame, final DCCPlugin plugin) {
+        super(commandController);
         this.mainFrame = mainFrame;
         myPlugin = plugin;
     }

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

@@ -42,6 +42,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -83,18 +84,19 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      * @param controller The controller to register UI implementations with
      * @param pluginInfo This plugin's plugin info
      * @param identityManager The Identity Manager that controls the current config
+     * @param commandController Command controller
      */
     public DCCPlugin(final SwingController controller,
             final PluginInfo pluginInfo,
-            final IdentityManager identityManager
-            ) {
+            final IdentityManager identityManager,
+            final CommandController commandController) {
         super();
         this.identityManager = identityManager;
         this.controller = controller;
         config = controller.getGlobalConfig();
         this.pluginInfo = pluginInfo;
-        registerCommand(new DCCCommand(controller.getMainFrame(), this),
-                DCCCommand.INFO);
+        registerCommand(new DCCCommand(commandController,
+                controller.getMainFrame(), this), DCCCommand.INFO);
         final SwingWindowFactory factory = controller.getWindowFactory();
         factory.registerImplementation(new HashSet<String>(Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -29,6 +29,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 java.util.List;
 
@@ -42,6 +43,15 @@ public final class DcopCommand extends Command {
             "dcop <app> <object> <function> - retrieves information from a DCOP aplication",
             CommandType.TYPE_SERVER);
 
+    /**
+     * Creates a new instance of the DcopCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public DcopCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/dcop/DcopPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcop;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 import java.io.BufferedReader;
@@ -35,10 +36,14 @@ import java.util.List;
  */
 public final class DcopPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public DcopPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public DcopPlugin(final CommandController commandController) {
         super();
-        registerCommand(new DcopCommand(), DcopCommand.INFO);
+        registerCommand(new DcopCommand(commandController), DcopCommand.INFO);
     }
 
     /**

src/com/dmdirc/addons/debug/Debug.java

@@ -26,11 +26,11 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 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 java.util.Arrays;
@@ -51,10 +51,12 @@ public class Debug extends Command implements IntelligentCommand {
     /**
      * Creates a new debug command with the specified parent plugin.
      *
+     * @param commandController Command controller
      * @param plugin Parent debug plugin
      */
-    public Debug(final DebugPlugin plugin) {
-        super();
+    public Debug(final CommandController commandController,
+            final DebugPlugin plugin) {
+        super(commandController);
 
         this.plugin = plugin;
     }
@@ -74,7 +76,7 @@ public class Debug extends Command implements IntelligentCommand {
                         "Unknown debug action.");
             } else {
                 final CommandArguments newArgs = new CommandArguments(
-                        Arrays.asList((CommandManager.getCommandManager().getCommandChar()
+                        Arrays.asList((getController().getCommandChar()
                         + command.getName() + " "
                         + args.getArgumentsAsString(1)).split(" ")));
                 command.execute(origin, newArgs, context);

src/com/dmdirc/addons/debug/DebugPlugin.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.debug;
 
 import com.dmdirc.addons.debug.commands.*; //NOPMD
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
@@ -66,16 +67,18 @@ public class DebugPlugin extends BasePlugin {
     /**
      * Creates a new debug plugin.
      *
+     * @param commandController Command controller
      * @param identityManager Identity manager instance
      * @param pluginManager Plugin manager instance.
      */
-    public DebugPlugin(final IdentityManager identityManager,
+    public DebugPlugin(final CommandController commandController,
+            final IdentityManager identityManager,
             final PluginManager pluginManager) {
         super();
         this.identityManager = identityManager;
         this.pluginManager = pluginManager;
         commands = new HashMap<String, DebugCommand>();
-        debugCommand = new Debug(this);
+        debugCommand = new Debug(commandController, this);
         registerCommand(debugCommand, Debug.INFO);
     }
 

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -29,6 +29,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 java.util.Timer;
 import java.util.TimerTask;
@@ -43,6 +44,15 @@ public class DNSCommand extends Command {
             "dns <IP|hostname> - Performs DNS lookup of the specified ip/hostname/nickname",
             CommandType.TYPE_GLOBAL);
 
+    /**
+     * Creates a new instance of the DNSCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public DNSCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/dns/DNSPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dns;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 import java.net.InetAddress;
@@ -35,10 +36,14 @@ import java.util.List;
  */
 public final class DNSPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public DNSPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public DNSPlugin(final CommandController commandController) {
         super();
-        registerCommand(new DNSCommand(), DNSCommand.INFO);
+        registerCommand(new DNSCommand(commandController), DNSCommand.INFO);
     }
 
     /**

src/com/dmdirc/addons/exec/ExecCommand.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.CommandUtils;
@@ -48,6 +49,15 @@ public class ExecCommand extends Command {
             "exec <command> [<parameters>] - executes an external program "
             + "and displays the output", CommandType.TYPE_GLOBAL);
 
+    /**
+     * Creates a new instance of the ExecCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public ExecCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/exec/ExecPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.exec;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 /**
@@ -29,9 +30,13 @@ import com.dmdirc.plugins.BasePlugin;
  */
 public class ExecPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public ExecPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public ExecPlugin(final CommandController commandController) {
         super();
-        registerCommand(new ExecCommand(), ExecCommand.INFO);
+        registerCommand(new ExecCommand(commandController), ExecCommand.INFO);
     }
 }

src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 
 /**
  * The FDNotify Command shows a nice popup on using the FreeDesktop
@@ -45,10 +46,12 @@ public final class FDNotifyCommand extends Command {
     /**
      * Creates a new instance of FDNotifyCommand.
      *
+     * @param commandController Command controller
      * @param myPlugin the plugin creating this command.
      */
-    public FDNotifyCommand(final FreeDesktopNotificationsPlugin myPlugin) {
-        super();
+    public FDNotifyCommand(final CommandController commandController,
+            final FreeDesktopNotificationsPlugin myPlugin) {
+        super(commandController);
         this.myPlugin = myPlugin;
     }
 

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -30,12 +30,12 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BaseFileDependantPlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
@@ -67,24 +67,23 @@ public final class FreeDesktopNotificationsPlugin
     private final ConfigManager config;
     /** Addon identity. */
     private final Identity identity;
-    /** Plugin manager instance. */
-    private final PluginManager pluginManager;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
      * @param identityManager Identity Manager instance
+     * @param commandController Command controller
      */
     public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo,
             final IdentityManager identityManager,
-            final PluginManager pluginManager) {
+            final CommandController commandController) {
         super(pluginInfo.getMetaData());
         this.pluginInfo = pluginInfo;
-        this.pluginManager = pluginManager;
         config = identityManager.getGlobalConfiguration();
         identity = identityManager.getGlobalAddonIdentity();
-        registerCommand(new FDNotifyCommand(this), FDNotifyCommand.INFO);
+        registerCommand(new FDNotifyCommand(commandController, this),
+                FDNotifyCommand.INFO);
     }
 
     /**
@@ -161,14 +160,11 @@ public final class FreeDesktopNotificationsPlugin
         config.addChangeListener(getDomain(), this);
         setCachedSettings();
 
-        // Extract required Files
-        final PluginInfo pi = pluginManager.getPluginInfoByName("freedesktop_notifications");
-
         // This shouldn't actually happen, but check to make sure.
-        if (pi != null) {
+        if (pluginInfo != null) {
             // Now get the RM
             try {
-                final ResourceManager res = pi.getResourceManager();
+                final ResourceManager res = pluginInfo.getResourceManager();
 
                 // Extract the files needed
                 try {

src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -29,14 +29,12 @@ 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 lombok.AllArgsConstructor;
-
 /**
  * The dcop command retrieves information from a dcop application.
  */
-@AllArgsConstructor
 public final class LoggingCommand extends Command implements
         IntelligentCommand {
 
@@ -49,6 +47,18 @@ public final class LoggingCommand extends Command implements
     /** Logging plugin. */
     private final LoggingPlugin plugin;
 
+    /**
+     * Creates a new instance of the LoggingCommand command
+     *
+     * @param controller Command controller for the command
+     * @param plugin Parent plugin
+     */
+    public LoggingCommand(final CommandController controller,
+            final LoggingPlugin plugin) {
+        super(controller);
+        this.plugin = plugin;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -39,6 +39,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -112,10 +113,12 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
      * @param pluginInfo This plugin's plugin info
      * @param actionController The action controller to register listeners with
      * @param identityManager The Identity Manager that controls the current config
+     * @param commandController Command controller
      */
     public LoggingPlugin(final PluginInfo pluginInfo,
             final ActionController actionController,
-            final IdentityManager identityManager) {
+            final IdentityManager identityManager,
+            final CommandController commandController) {
         super();
         this.identityManager = identityManager;
 
@@ -124,7 +127,8 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
         config = identityManager.getGlobalConfiguration();
         identity = identityManager.getGlobalAddonIdentity();
 
-        registerCommand(new LoggingCommand(this), LoggingCommand.INFO);
+        registerCommand(new LoggingCommand(commandController, this),
+                LoggingCommand.INFO);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 
 import java.io.IOException;
 
@@ -51,6 +52,15 @@ public class NotifyMyAndroidCommand extends Command {
     @Setter
     private String configDomain;
 
+    /**
+     * Creates a new instance of the NotifyMyAndroidCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public NotifyMyAndroidCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/nma/NotifyMyAndroidPlugin.java

@@ -27,6 +27,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 
@@ -36,7 +37,7 @@ import com.dmdirc.plugins.PluginInfo;
 public class NotifyMyAndroidPlugin extends BasePlugin {
 
     /** The command to register. */
-    private final NotifyMyAndroidCommand command = new NotifyMyAndroidCommand();
+    private final NotifyMyAndroidCommand command;
 
     /** Our info object. */
     private final PluginInfo pluginInfo;
@@ -44,9 +45,12 @@ public class NotifyMyAndroidPlugin extends BasePlugin {
     /**
      * Creates a new instance of the {@link NotifyMyAndroidPlugin}.
      *
+     * @param commandController Command controller
      * @param pluginInfo The plugin info object for this plugin.
      */
-    public NotifyMyAndroidPlugin(final PluginInfo pluginInfo) {
+    public NotifyMyAndroidPlugin(final CommandController commandController,
+            final PluginInfo pluginInfo) {
+        command = new NotifyMyAndroidCommand(commandController);
         registerCommand(command, NotifyMyAndroidCommand.INFO);
 
         this.pluginInfo = pluginInfo;

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

@@ -29,6 +29,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.ExportedService;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -54,10 +55,12 @@ public class NotificationCommand extends Command implements
     /**
      * Creates a new instance of this notification command.
      *
+     * @param commandController Command controller
      * @param parent The plugin that's instantiating this command
      */
-    public NotificationCommand(final NotificationsPlugin parent) {
-        super();
+    public NotificationCommand(final CommandController commandController,
+            final NotificationsPlugin parent) {
+        super(commandController);
 
         this.parent = parent;
     }

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

@@ -29,6 +29,7 @@ import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
@@ -53,12 +54,14 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
     /**
      * Creates a new instance of this plugin.
      *
+     * @param commandController Command controller
      * @param pluginInfo This plugin's plugin info
      */
-    public NotificationsPlugin(final PluginInfo pluginInfo) {
+    public NotificationsPlugin(final CommandController commandController,
+            final PluginInfo pluginInfo) {
         super();
         this.pluginInfo = pluginInfo;
-        registerCommand(new NotificationCommand(this),
+        registerCommand(new NotificationCommand(commandController, this),
                 NotificationCommand.INFO);
     }
 

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -56,10 +57,12 @@ public final class NowPlayingCommand extends Command implements
     /**
      * Creates a new instance of NowPlayingCommand.
      *
+     * @param commandController Command controller
      * @param parent The plugin that's instantiating this command
      */
-    public NowPlayingCommand(final NowPlayingPlugin parent) {
-        super();
+    public NowPlayingCommand(final CommandController commandController,
+            final NowPlayingPlugin parent) {
+        super(commandController);
 
         this.parent = parent;
     }

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

@@ -30,6 +30,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.Plugin;
@@ -60,17 +61,20 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
     /**
      * Creates a new instance of this plugin.
      *
+     * @param commandController Command controller
      * @param pluginInfo This plugin's plugin info
      * @param actionController The action controller to register listeners with
      */
-    public NowPlayingPlugin(final PluginInfo pluginInfo,
+    public NowPlayingPlugin(final CommandController commandController,
+            final PluginInfo pluginInfo,
             final ActionController actionController) {
         super();
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
 
-        registerCommand(new NowPlayingCommand(this), NowPlayingCommand.INFO);
+        registerCommand(new NowPlayingCommand(commandController, this),
+                NowPlayingCommand.INFO);
     }
 
     /** {@inheritDoc} */

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

@@ -29,6 +29,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.messages.Styliser;
 
@@ -49,10 +50,12 @@ public final class OsdCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of OsdCommand.
      *
+     * @param commandController Command controller
      * @param osdManager OSD Manager used to control OSD windows
      */
-    public OsdCommand(final OsdManager osdManager) {
-        super();
+    public OsdCommand(final CommandController commandController,
+            final OsdManager osdManager) {
+        super(commandController);
 
         this.osdManager = osdManager;
     }

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

@@ -31,6 +31,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.validators.NumericalValidator;
@@ -62,13 +63,16 @@ public final class OsdPlugin extends BasePlugin implements
     /**
      * Creates a new instance of this plugin.
      *
+     * @param commandController Command controller
      * @param pluginInfo This plugin's plugin info
      */
-    public OsdPlugin(final PluginInfo pluginInfo) {
+    public OsdPlugin(final CommandController commandController,
+            final PluginInfo pluginInfo) {
         super();
         this.pluginInfo = pluginInfo;
         osdManager = new OsdManager(this);
-        registerCommand(new OsdCommand(osdManager), OsdCommand.INFO);
+        registerCommand(new OsdCommand(commandController, osdManager),
+                OsdCommand.INFO);
     }
 
     /**

src/com/dmdirc/addons/osx_integration/DockBounceCommand.java

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 
 /**
  * A command to bounce the icon in the OSX dock.
@@ -52,9 +53,12 @@ public class DockBounceCommand extends Command {
     /**
      * Creates an instance of {@link DockBounceCommand}.
      *
+     * @param commandController Command controller
      * @param apple The UI wrapper for Apple-specific things
      */
-    public DockBounceCommand(final Apple apple) {
+    public DockBounceCommand(final CommandController commandController,
+            final Apple apple) {
+        super(commandController);
         this.apple = apple;
     }
 

src/com/dmdirc/addons/osx_integration/OsxIntegrationPlugin.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.osx_integration;
 
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 /**
@@ -34,10 +35,12 @@ public class OsxIntegrationPlugin extends BasePlugin {
     /**
      * Creates an instance of {@link OsxIntegrationPlugin}.
      *
+     * @param commandController Command controller
      * @param controller The Swing UI which runs on the OS X environment
      */
-    public OsxIntegrationPlugin(final SwingController controller) {
-        registerCommand(new DockBounceCommand(controller.getApple()),
-                DockBounceCommand.INFO);
+    public OsxIntegrationPlugin(final CommandController commandController,
+            final SwingController controller) {
+        registerCommand(new DockBounceCommand(commandController,
+                controller.getApple()), DockBounceCommand.INFO);
     }
 }

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -26,6 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 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.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
@@ -50,14 +51,17 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
     /**
      * Creates a new instance of this plugin.
      *
+     * @param commandController Command controller
      * @param actionController The action controller to register listeners with
      */
-    public DebugPlugin(final ActionController actionController) {
+    public DebugPlugin(final CommandController commandController,
+            final ActionController actionController) {
         super();
 
         this.actionController = actionController;
 
-        registerCommand(new ParserDebugCommand(this), ParserDebugCommand.INFO);
+        registerCommand(new ParserDebugCommand(commandController, this),
+                ParserDebugCommand.INFO);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -30,6 +30,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 com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 
@@ -50,10 +51,12 @@ public final class ParserDebugCommand extends Command {
     /**
      * Creates a new instance of ParserDebugCommand.
      *
+     * @param commandController Command controller
      * @param plugin Plugin that owns this command
      */
-    public ParserDebugCommand(final DebugPlugin plugin) {
-        super();
+    public ParserDebugCommand(final CommandController commandController,
+            final DebugPlugin plugin) {
+        super(commandController);
         myPlugin = plugin;
     }
 

src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -47,6 +48,15 @@ public class RedirectCommand extends Command implements IntelligentCommand {
                 + "channel or query window",
             CommandType.TYPE_CHAT);
 
+    /**
+     * Creates a new instance of the RedirectCommand command
+     *
+     * @param controller Command controller for the command
+     */
+    public RedirectCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/redirect/RedirectPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.redirect;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 /**
@@ -30,9 +31,14 @@ import com.dmdirc.plugins.BasePlugin;
  */
 public final class RedirectPlugin extends BasePlugin {
 
-    /** Creates a new instance of this plugin. */
-    public RedirectPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public RedirectPlugin(final CommandController commandController) {
         super();
-        registerCommand(new RedirectCommand(), RedirectCommand.INFO);
+        registerCommand(new RedirectCommand(commandController),
+                RedirectCommand.INFO);
     }
 }

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -31,6 +31,7 @@ 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;
 
 import java.io.File;
@@ -57,10 +58,12 @@ public final class ScriptCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of ScriptCommand.
      *
+     * @param commandController Command controller
      * @param plugin Parent plugin
      */
-    public ScriptCommand(final ScriptPlugin plugin) {
-        super();
+    public ScriptCommand(final CommandController commandController,
+            final ScriptPlugin plugin) {
+        super(commandController);
         myPlugin = plugin;
     }
 

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

@@ -26,6 +26,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -64,10 +65,13 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
     /**
      * Creates a new instance of the Script Plugin.
      *
+     * @param commandController Command controller
      * @param actionController The action controller to register listeners with
      * @param identityManager The Identity Manager that controls the current config
      */
-    public ScriptPlugin(final ActionController actionController, final IdentityManager identityManager) {
+    public ScriptPlugin(final CommandController commandController,
+            final ActionController actionController,
+            final IdentityManager identityManager) {
         super();
         scriptDir = identityManager.getConfigDir() + "scripts/";
         this.actionController = actionController;
@@ -75,7 +79,8 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
         // Add the JS Helper to the scriptFactory
         getScriptFactory().put("globalHelper", getJavaScriptHelper());
         getScriptFactory().put("globalVariables", getGlobalVariables());
-        registerCommand(new ScriptCommand(this), ScriptCommand.INFO);
+        registerCommand(new ScriptCommand(commandController, this),
+                ScriptCommand.INFO);
     }
 
     /** {@inheritDoc} */

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

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 
 /**
  * The /popup command allows the user to show a popup message from the system
@@ -44,10 +45,13 @@ public final class PopupCommand extends Command {
 
     /**
      * Creates a new instance of PopupCommand.
+     *
+     * @param commandController Command controller
      * @param newParent The plugin that this command belongs to
      */
-    public PopupCommand(final SystrayPlugin newParent) {
-        super();
+    public PopupCommand(final CommandController commandController,
+            final SystrayPlugin newParent) {
+        super(commandController);
 
         this.parent = newParent;
     }

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

@@ -33,6 +33,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.IconManager;
@@ -69,10 +70,12 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
     /**
      * Creates a new system tray plugin.
      *
+     * @param commandController Command controller
      * @param pluginInfo This plugin's plugin info
      * @param actionController The action controller to use
      */
-    public SystrayPlugin(final PluginInfo pluginInfo,
+    public SystrayPlugin(final CommandController commandController,
+            final PluginInfo pluginInfo,
             final ActionController actionController) {
         super();
 
@@ -93,7 +96,8 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
                 .getImage("logo"), "DMDirc", menu);
         icon.setImageAutoSize(true);
         icon.addMouseListener(this);
-        registerCommand(new PopupCommand(this), PopupCommand.INFO);
+        registerCommand(new PopupCommand(commandController, this),
+                PopupCommand.INFO);
     }
 
     /**

src/com/dmdirc/addons/time/TimePlugin.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.time;
 
 import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.BasePlugin;
 
 import java.util.Calendar;
@@ -46,14 +47,17 @@ public final class TimePlugin extends BasePlugin {
     /**
      * Creates a new instance of this plugin.
      *
+     * @param commandController Command controller
      * @param actionController The action controller to register listeners with
      */
-    public TimePlugin(final ActionController actionController) {
+    public TimePlugin(final CommandController commandController,
+            final ActionController actionController) {
         super();
 
         this.actionController = actionController;
         manager = new TimerManager();
-        registerCommand(new TimerCommand(manager), TimerCommand.INFO);
+        registerCommand(new TimerCommand(commandController, manager),
+                TimerCommand.INFO);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/time/TimerCommand.java

@@ -29,6 +29,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 java.util.Map.Entry;
@@ -53,10 +54,12 @@ public final class TimerCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of TimerCommand.
      *
+     * @param commandController Command controller
      * @param manager The instance of TimerManager associated with this command
      */
-    public TimerCommand(final TimerManager manager) {
-        super();
+    public TimerCommand(final CommandController commandController,
+            final TimerManager manager) {
+        super(commandController);
 
         this.manager = manager;
     }

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

@@ -55,6 +55,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
@@ -163,11 +164,16 @@ public class SwingController extends BasePlugin implements UIController {
     /**
      * Instantiates a new SwingController.
      *
+     * @param commandController Command controller
      * @param pluginInfo Plugin info
      * @param identityManager Identity Manager
-     * @param main Main
+     * @param pluginManager Plugin manager
+     * @param serverManager Server manager
+     * @param main Main instance (used to quit the client)
+     * @param actionManager Action manager
      */
-    public SwingController(final PluginInfo pluginInfo,
+    public SwingController(final CommandController commandController,
+            final PluginInfo pluginInfo,
             final IdentityManager identityManager,
             final PluginManager pluginManager,
             final ActionManager actionManager,
@@ -190,11 +196,16 @@ public class SwingController extends BasePlugin implements UIController {
         dialogManager = new DialogManager(this);
         setAntiAlias();
         windows = new ArrayList<java.awt.Window>();
-        registerCommand(new ServerSettings(), ServerSettings.INFO);
-        registerCommand(new ChannelSettings(), ChannelSettings.INFO);
-        registerCommand(new Input(windowFactory), Input.INFO);
-        registerCommand(new PopOutCommand(this), PopOutCommand.INFO);
-        registerCommand(new PopInCommand(this), PopInCommand.INFO);
+        registerCommand(new ServerSettings(commandController),
+                ServerSettings.INFO);
+        registerCommand(new ChannelSettings(commandController),
+                ChannelSettings.INFO);
+        registerCommand(new Input(commandController, windowFactory),
+                Input.INFO);
+        registerCommand(new PopOutCommand(commandController, this),
+                PopOutCommand.INFO);
+        registerCommand(new PopInCommand(commandController, this),
+                PopInCommand.INFO);
     }
 
     /**

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

@@ -33,6 +33,7 @@ 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.ui.input.AdditionalTabTargets;
 
 /**
@@ -47,6 +48,15 @@ public class ChannelSettings extends Command implements
             "channelsettings - opens the channel settings window",
             CommandType.TYPE_CHANNEL);
 
+    /**
+     * Creates a new instance of the ChannelSettings command
+     *
+     * @param controller Command controller for the command
+     */
+    public ChannelSettings(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/ui_swing/commands/Input.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.interfaces.ui.InputWindow;
 
@@ -52,10 +53,12 @@ public class Input extends Command implements IntelligentCommand {
     /**
      * Creates a new input command.
      *
+     * @param commandController Command controller
      * @param windowFactory Window factory to get windows from
      */
-    public Input(final SwingWindowFactory windowFactory) {
-        super();
+    public Input(final CommandController commandController,
+            final SwingWindowFactory windowFactory) {
+        super(commandController);
         this.windowFactory = windowFactory;
     }
 
@@ -66,7 +69,6 @@ public class Input extends Command implements IntelligentCommand {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "input",
                     "[--clear] <text to insert into inputfield");
-            return;
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
             ((InputWindow) windowFactory.getSwingWindow(origin))

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

@@ -32,6 +32,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;
 
 /**
  * Command to pop in windows.
@@ -49,10 +50,12 @@ public class PopInCommand extends Command {
     /**
      * Create a new instance of PopInCommand.
      *
+     * @param commandController Command controller
      * @param controller SwingWindowController associated with this command
      */
-    public PopInCommand(final SwingController controller) {
-        super();
+    public PopInCommand(final CommandController commandController,
+            final SwingController controller) {
+        super(commandController);
         this.controller = controller;
     }
 

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

@@ -32,6 +32,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;
 
 /**
  * Command to pop out windows.
@@ -49,10 +50,12 @@ public class PopOutCommand extends Command {
     /**
      * Create a new instance of PopOutCommand.
      *
+     * @param commandController Command controller
      * @param controller SwingWindowController associated with this command
      */
-    public PopOutCommand(final SwingController controller) {
-        super();
+    public PopOutCommand(final CommandController commandController,
+            final SwingController controller) {
+        super(commandController);
         this.controller = controller;
     }
 

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -47,6 +48,15 @@ public class ServerSettings extends Command implements IntelligentCommand {
             "serversettings - opens the server settings window",
             CommandType.TYPE_SERVER);
 
+    /**
+     * Creates a new instance of the ServerSettings command
+     *
+     * @param controller Command controller for the command
+     */
+    public ServerSettings(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java

@@ -29,6 +29,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.messages.Styliser;
@@ -48,10 +49,14 @@ public class UrlCatcherPlugin extends BasePlugin implements ActionListener,
     /** Whether to capture URLs from the raw window. */
     private boolean captureRaw = false;
 
-    /** Creates a new instance of this plugin. */
-    public UrlCatcherPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller
+     */
+    public UrlCatcherPlugin(final CommandController commandController) {
         super();
-        registerCommand(new UrlListCommand(this), UrlListCommand.INFO);
+        registerCommand(new UrlListCommand(commandController, this), UrlListCommand.INFO);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/urlcatcher/UrlListCommand.java

@@ -29,6 +29,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 java.util.Map;
@@ -49,9 +50,12 @@ public class UrlListCommand extends Command implements IntelligentCommand {
      * Creates a new URL List command, outputting all known URLs seen by the URL
      * catcher plugin to the active window.
      *
+     * @param commandController Command controller
      * @param plugin Parent plugin
      */
-    public UrlListCommand(final UrlCatcherPlugin plugin) {
+    public UrlListCommand(final CommandController commandController,
+            final UrlCatcherPlugin plugin) {
+        super(commandController);
         this.plugin = plugin;
     }
 

src/com/dmdirc/addons/windowflashing/FlashWindow.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 
 /**
  * Command to flash an inactive window under Windows.
@@ -44,10 +45,11 @@ public class FlashWindow extends Command {
     /**
      * Creates a new flash window command.
      *
+     * @param controller Command controller
      * @param plugin Parent plugin to trigger window flashing
      */
-    public FlashWindow(final WindowFlashing plugin) {
-        super();
+    public FlashWindow(final CommandController controller, final WindowFlashing plugin) {
+        super(controller);
         this.plugin = plugin;
     }
 

src/com/dmdirc/addons/windowflashing/WindowFlashing.java

@@ -35,6 +35,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
@@ -86,17 +87,19 @@ public class WindowFlashing extends BasePlugin implements ActionListener {
      * @param identityManager Identity Manager
      * @param controller Parent swing controller
      * @param actionManager Action manager
+     * @param commandController Command controller
      */
     public WindowFlashing(final PluginInfo pluginInfo,
             final IdentityManager identityManager,
             final SwingController controller,
-            final ActionManager actionManager) {
+            final ActionManager actionManager,
+            final CommandController commandController) {
         super();
         this.pluginInfo = pluginInfo;
         this.controller = controller;
         this.actionManager = actionManager;
         binder = identityManager.getGlobalConfiguration().getBinder();
-        registerCommand(new FlashWindow(this), FlashWindow.INFO);
+        registerCommand(new FlashWindow(commandController, this), FlashWindow.INFO);
     }
 
     /**

test/com/dmdirc/addons/debug/DebugTest.java

@@ -22,13 +22,11 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static com.dmdirc.harness.CommandArgsMatcher.*;
@@ -36,13 +34,6 @@ import static org.mockito.Mockito.*;
 
 public class DebugTest {
 
-    @BeforeClass
-    public static void setUp() throws InvalidIdentityFileException {
-        // Command has a dependency on CommandManager (to get the command char)
-        // And CommandManager has a dependency on IdentityManager for the same
-        TestMain.getTestMain();
-    }
-
     /** Checks the debug command with no arguments shows usage. */
     @Test
     public void testNoArgs() {
@@ -52,7 +43,7 @@ public class DebugTest {
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[0]);
 
-        final Debug debug = new Debug(null);
+        final Debug debug = new Debug(mock(CommandController.class), null);
 
         debug.execute(container, arguments, null);
         verify(container).addLine(eq("commandUsage"), anyObject(),
@@ -70,7 +61,7 @@ public class DebugTest {
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[]{"test"});
 
-        final Debug debug = new Debug(plugin);
+        final Debug debug = new Debug(mock(CommandController.class), plugin);
 
         debug.execute(container, arguments, null);
         verify(container).addLine(eq("commandError"), anyObject());
@@ -84,14 +75,16 @@ public class DebugTest {
         final FrameContainer container = mock(FrameContainer.class);
         final DebugCommand command = mock(DebugCommand.class);
         final CommandContext context = mock(CommandContext.class);
+        final CommandController commandController = mock(CommandController.class);
 
         when(plugin.getCommand("test")).thenReturn(command);
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[]{"test"});
         when(arguments.getArgumentsAsString(1)).thenReturn("");
         when(command.getName()).thenReturn("test");
+        when(commandController.getCommandChar()).thenReturn('/');
 
-        final Debug debug = new Debug(plugin);
+        final Debug debug = new Debug(commandController, plugin);
 
         debug.execute(container, arguments, context);
 
@@ -107,14 +100,16 @@ public class DebugTest {
         final FrameContainer container = mock(FrameContainer.class);
         final DebugCommand command = mock(DebugCommand.class);
         final CommandContext context = mock(CommandContext.class);
+        final CommandController commandController = mock(CommandController.class);
 
         when(plugin.getCommand("test")).thenReturn(command);
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[]{"test", "1", "2", "3"});
         when(arguments.getArgumentsAsString(1)).thenReturn("1 2 3");
         when(command.getName()).thenReturn("test");
+        when(commandController.getCommandChar()).thenReturn('/');
 
-        final Debug debug = new Debug(plugin);
+        final Debug debug = new Debug(commandController, plugin);
 
         debug.execute(container, arguments, context);
 

test/com/dmdirc/addons/urlcatcher/UrlCatcherPluginTest.java

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.urlcatcher;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.messages.Styliser;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -53,9 +52,7 @@ public class UrlCatcherPluginTest {
 
     @Test
     public void testURLCounting() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-
-        final UrlCatcherPlugin plugin = new UrlCatcherPlugin();
+        final UrlCatcherPlugin plugin = new UrlCatcherPlugin(mock(CommandController.class));
 
         plugin.processEvent(CoreActionType.CHANNEL_MESSAGE, null,
                 container, "This is a message - http://www.google.com/ foo");
@@ -70,9 +67,7 @@ public class UrlCatcherPluginTest {
 
     @Test
     public void testURLCatching() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-
-        final UrlCatcherPlugin plugin = new UrlCatcherPlugin();
+        final UrlCatcherPlugin plugin = new UrlCatcherPlugin(mock(CommandController.class));
 
         plugin.processEvent(CoreActionType.CHANNEL_MESSAGE, null,
                 container, "http://www.google.com/ www.example.com foo://bar.baz");