Pass in CommandControllers to some plugin commands

I got bored about half way through, so more to go at some point.

Change-Id: Id1d18950a69090439ee66ae9e5c8ae874bd30fc4
Reviewed-on: http://gerrit.dmdirc.com/2807
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@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 controller The controller to use for command information.
      * @param mainFrame Parent MainFrame
      */
-    public ActiveCommand(final MainFrame mainFrame) {
-        super();
+    public ActiveCommand(final CommandController controller, final MainFrame mainFrame) {
+        super(controller);
+
         this.mainFrame = mainFrame;
     }
 

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

@@ -45,7 +45,7 @@ public final class ActiveWindowPlugin extends BaseCommandPlugin {
 
         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 this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public AudioCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,7 +37,7 @@ public final class AudioPlugin extends BaseCommandPlugin {
      */
     public AudioPlugin(final CommandController commandController) {
         super(commandController);
-        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 this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    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;
 
@@ -43,6 +44,15 @@ public class CalcCommand extends Command {
             "calc [--showexpr] <expr> - evaluate mathematical expression",
             CommandType.TYPE_GLOBAL) ;
 
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public CalcCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,6 +37,6 @@ public class CalcPlugin extends BaseCommandPlugin {
      */
     public CalcPlugin(final CommandController commandController) {
         super(commandController);
-        registerCommand(new CalcCommand(), CalcCommand.INFO);
+        registerCommand(new CalcCommand(commandController), CalcCommand.INFO);
     }
 }

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -29,6 +29,8 @@ 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.util.HashMap;
 import java.util.Map;
 
@@ -38,11 +40,21 @@ import java.util.Map;
  */
 public class ConditionalExecuteCommand extends Command {
 
+    /** A command info object for this command. */
+    public static final BaseCommandInfo INFO = new BaseCommandInfo("conditionalexecute",
+            "conditionalexecute <args> - Conditionally execute a command", CommandType.TYPE_GLOBAL);
+
     /** Store details about current namespaces. */
-    private final Map<String, ConditionalExecuteNamespace> namespaces = new HashMap<String, ConditionalExecuteNamespace>();
+    private final Map<String, ConditionalExecuteNamespace> namespaces = new HashMap<>();
 
-    /** A command info object for this command. */
-    public static final BaseCommandInfo INFO = new BaseCommandInfo("conditionalexecute", "conditionalexecute <args> - Conditionally execute a command", CommandType.TYPE_GLOBAL);
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public ConditionalExecuteCommand(final CommandController controller) {
+        super(controller);
+    }
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/conditional_execute/ConditionalExecutePlugin.java

@@ -38,6 +38,6 @@ public final class ConditionalExecutePlugin extends BaseCommandPlugin {
      */
     public ConditionalExecutePlugin(final CommandController commandController) {
         super(commandController);
-        registerCommand(new ConditionalExecuteCommand(), ConditionalExecuteCommand.INFO);
+        registerCommand(new ConditionalExecuteCommand(commandController), ConditionalExecuteCommand.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;
 
 /**
@@ -43,6 +44,15 @@ public class ContactListCommand extends Command implements IntelligentCommand {
             "contactlist - show a contact list for the current channel",
             CommandType.TYPE_CHANNEL) ;
 
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public ContactListCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,6 +37,6 @@ public final class ContactListPlugin extends BaseCommandPlugin {
      */
     public ContactListPlugin(final CommandController commandController) {
         super(commandController);
-        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,10 +69,12 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of DCCCommand.
      *
+     * @param controller The controller to use for command information.
      * @param mainFrame mainFrame instance to use
      * @param plugin The DCC Plugin that this command belongs to
      */
-    public DCCCommand(final MainFrame mainFrame, final DCCPlugin plugin) {
+    public DCCCommand(final CommandController controller, final MainFrame mainFrame, final DCCPlugin plugin) {
+        super(controller);
         this.mainFrame = mainFrame;
         myPlugin = plugin;
     }

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

@@ -95,7 +95,7 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
         this.controller = controller;
         config = controller.getGlobalConfig();
         this.pluginInfo = pluginInfo;
-        registerCommand(new DCCCommand(controller.getMainFrame(), this),
+        registerCommand(new DCCCommand(commandController, controller.getMainFrame(), this),
                 DCCCommand.INFO);
         final SwingWindowFactory factory = controller.getWindowFactory();
         factory.registerImplementation(new HashSet<>(Arrays.asList(

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

@@ -29,19 +29,29 @@ 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;
 
 /**
  * The dcop command retrieves information from a dcop application.
  */
-public final class DcopCommand extends Command {
+public class DcopCommand extends Command {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("dcop",
             "dcop <app> <object> <function> - retrieves information from a DCOP aplication",
             CommandType.TYPE_SERVER);
 
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public DcopCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -43,7 +43,7 @@ public final class DcopPlugin extends BaseCommandPlugin {
      */
     public DcopPlugin(final CommandController commandController) {
         super(commandController);
-        registerCommand(new DcopCommand(), DcopCommand.INFO);
+        registerCommand(new DcopCommand(commandController), DcopCommand.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 this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public DNSCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -43,7 +43,7 @@ public final class DNSPlugin extends BaseCommandPlugin {
      */
     public DNSPlugin(final CommandController commandController) {
         super(commandController);
-        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 this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public ExecCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,6 +37,6 @@ public class ExecPlugin extends BaseCommandPlugin {
      */
     public ExecPlugin(final CommandController commandController) {
         super(commandController);
-        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,11 @@ public final class FDNotifyCommand extends Command {
     /**
      * Creates a new instance of FDNotifyCommand.
      *
+     * @param controller The controller to use for command information.
      * @param myPlugin the plugin creating this command.
      */
-    public FDNotifyCommand(final FreeDesktopNotificationsPlugin myPlugin) {
-        super();
+    public FDNotifyCommand(final CommandController controller, final FreeDesktopNotificationsPlugin myPlugin) {
+        super(controller);
         this.myPlugin = myPlugin;
     }
 

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

@@ -84,7 +84,7 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
         this.filesHelper = new PluginFilesHelper(pluginInfo);
         config = identityController.getGlobalConfiguration();
         identity = identityController.getAddonSettings();
-        registerCommand(new FDNotifyCommand(this), FDNotifyCommand.INFO);
+        registerCommand(new FDNotifyCommand(commandController, this), FDNotifyCommand.INFO);
     }
 
     /**

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

@@ -29,16 +29,13 @@ 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 {
+public class LoggingCommand extends Command implements IntelligentCommand {
 
     /** Command name. */
     private static final String LOGGING = "logging";
@@ -49,6 +46,17 @@ public final class LoggingCommand extends Command implements
     /** Logging plugin. */
     private final LoggingPlugin plugin;
 
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     * @param plugin The plugin providing logging services.
+     */
+    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

@@ -126,7 +126,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         config = identityController.getGlobalConfiguration();
         identity = identityController.getAddonSettings();
 
-        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,12 +52,21 @@ public class NotifyMyAndroidCommand extends Command {
     @Setter
     private String configDomain;
 
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public NotifyMyAndroidCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String[] parts = args.getArgumentsAsString().split("\\s+--\\s+", 2);
-        log.trace("Split input: {}", parts);
+        log.trace("Split input: {}", (Object[]) parts);
 
         if (parts.length != 2) {
             showUsage(origin, args.isSilent(), INFO.getName(), INFO.getHelp());

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

@@ -37,7 +37,7 @@ import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
 
     /** The command to register. */
-    private final NotifyMyAndroidCommand command = new NotifyMyAndroidCommand();
+    private final NotifyMyAndroidCommand command;
 
     /** Our info object. */
     private final PluginInfo pluginInfo;
@@ -51,6 +51,8 @@ public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
     public NotifyMyAndroidPlugin(final PluginInfo pluginInfo,
             final CommandController commandController) {
         super(commandController);
+
+        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,11 @@ public class NotificationCommand extends Command implements
     /**
      * Creates a new instance of this notification command.
      *
+     * @param controller The controller to use for command information.
      * @param parent The plugin that's instantiating this command
      */
-    public NotificationCommand(final NotificationsPlugin parent) {
-        super();
+    public NotificationCommand(final CommandController controller, final NotificationsPlugin parent) {
+        super(controller);
 
         this.parent = parent;
     }

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

@@ -67,7 +67,7 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
         super(commandController);
         this.pluginInfo = pluginInfo;
         this.identityController = identityController;
-        registerCommand(new NotificationCommand(this),
+        registerCommand(new NotificationCommand(commandController, this),
                 NotificationCommand.INFO);
     }
 

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.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.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
@@ -38,15 +39,11 @@ import com.dmdirc.ui.input.TabCompleter;
 import java.util.Arrays;
 import java.util.List;
 
-import lombok.RequiredArgsConstructor;
-
 /**
  * The now playing command retrieves the currently playing song from a
  * variety of media players.
  */
-@RequiredArgsConstructor
-public final class NowPlayingCommand extends Command implements
-        IntelligentCommand {
+public class NowPlayingCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("nowplaying",
@@ -58,6 +55,22 @@ public final class NowPlayingCommand extends Command implements
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
 
+    /**
+     * Creates a new instance of this command.
+     *
+     * @param controller The controller to use for command information.
+     * @param parent The plugin that owns this command.
+     * @param identityController The controller to use to read/write settings.
+     */
+    public NowPlayingCommand(
+            final CommandController controller,
+            final NowPlayingPlugin parent,
+            final IdentityController identityController) {
+        super(controller);
+        this.parent = parent;
+        this.identityController = identityController;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -78,7 +78,7 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
         this.actionController = actionController;
         this.identityController = identityController;
 
-        registerCommand(new NowPlayingCommand(this, identityController), NowPlayingCommand.INFO);
+        registerCommand(new NowPlayingCommand(commandController, this, identityController), NowPlayingCommand.INFO);
     }
 
     /** {@inheritDoc} */

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

@@ -29,13 +29,14 @@ 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;
 
 /**
  * The osd command shows an on screen message.
  */
-public final class OsdCommand extends Command implements IntelligentCommand {
+public class OsdCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("osd",
@@ -49,10 +50,11 @@ public final class OsdCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of OsdCommand.
      *
+     * @param controller The controller to use for command information.
      * @param osdManager OSD Manager used to control OSD windows
      */
-    public OsdCommand(final OsdManager osdManager) {
-        super();
+    public OsdCommand(final CommandController controller, final OsdManager osdManager) {
+        super(controller);
 
         this.osdManager = osdManager;
     }

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

@@ -76,7 +76,7 @@ public final class OsdPlugin extends BaseCommandPlugin implements
         this.pluginInfo = pluginInfo;
         this.identityController = identityController;
         osdManager = new OsdManager(identityController, 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,17 +53,20 @@ public class DockBounceCommand extends Command {
     /**
      * Creates an instance of {@link DockBounceCommand}.
      *
+     * @param controller The controller to use for command information.
      * @param apple The UI wrapper for Apple-specific things
      */
-    public DockBounceCommand(final Apple apple) {
+    public DockBounceCommand(final CommandController controller, final Apple apple) {
+        super(controller);
         this.apple = apple;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin,
-                        final CommandArguments args,
-                        final CommandContext context) {
+    public void execute(
+            final FrameContainer origin,
+            final CommandArguments args,
+            final CommandContext context) {
         apple.requestUserAttention(false);
     }
 }

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

@@ -41,7 +41,7 @@ public class OsxIntegrationPlugin extends BaseCommandPlugin {
     public OsxIntegrationPlugin(final SwingController controller,
             final CommandController commandController) {
         super(commandController);
-        registerCommand(new DockBounceCommand(controller.getApple()),
+        registerCommand(new DockBounceCommand(commandController, controller.getApple()),
                 DockBounceCommand.INFO);
     }
 }

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

@@ -61,7 +61,7 @@ public final class DebugPlugin extends BaseCommandPlugin implements
 
         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,11 @@ public final class ParserDebugCommand extends Command {
     /**
      * Creates a new instance of ParserDebugCommand.
      *
+     * @param controller The controller to use for command information.
      * @param plugin Plugin that owns this command
      */
-    public ParserDebugCommand(final DebugPlugin plugin) {
-        super();
+    public ParserDebugCommand(final CommandController controller, final DebugPlugin plugin) {
+        super(controller);
         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 this command.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public RedirectCommand(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -38,6 +38,6 @@ public final class RedirectPlugin extends BaseCommandPlugin {
      */
     public RedirectPlugin(final CommandController commandController) {
         super(commandController);
-        registerCommand(new RedirectCommand(), RedirectCommand.INFO);
+        registerCommand(new RedirectCommand(commandController), RedirectCommand.INFO);
     }
 }

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -76,7 +76,7 @@ public class RedirectCommandTest {
 
     @Test
     public void testExecute() {
-        final RedirectCommand command = new RedirectCommand();
+        final RedirectCommand command = new RedirectCommand(commandController);
 
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));