Add base command plugins

Change-Id: I8bb1e5bc9e2ca965ff3687d365a167c9b5ccc746
Depends-On: I1d49bc2e572e44466193b4851646edb01d303998
Reviewed-on: http://gerrit.dmdirc.com/2613
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

 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;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /** Plugin to provide an active window command to the Swing UI. */
-public final class ActiveWindowPlugin extends BasePlugin {
+public final class ActiveWindowPlugin extends BaseCommandPlugin {
 
     /** The message sink to register and unregister. */
     private final ActiveWindowMessageSink sink;
      * Creates a new instance of this plugin.
      *
      * @param controller The controller to use to find active windows
+     * @param commandController Command controller to register commands
      */
-    public ActiveWindowPlugin(final SwingController controller) {
-        super();
+    public ActiveWindowPlugin(final SwingController controller,
+            final CommandController commandController) {
+        super(commandController);
 
         sink = new ActiveWindowMessageSink(controller.getMainFrame());
 

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

 
 package com.dmdirc.addons.audio;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * Adds Audio playing facility to client.
  */
-public final class AudioPlugin extends BasePlugin {
+public final class AudioPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public AudioPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public AudioPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new AudioCommand(), AudioCommand.INFO);
         registerCommand(new BeepCommand(), BeepCommand.INFO);
     }

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

 
 package com.dmdirc.addons.calc;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * A plugin which parses and evaluates various mathematical expressions.
  */
-public class CalcPlugin extends BasePlugin {
+public class CalcPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public CalcPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public CalcPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new CalcCommand(), CalcCommand.INFO);
     }
 }

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

 
 package com.dmdirc.addons.contactlist;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * Plugin to provide a POC contact list.
  */
-public final class ContactListPlugin extends BasePlugin {
+public final class ContactListPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public ContactListPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public ContactListPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new ContactListCommand(), ContactListCommand.INFO);
     }
 }

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

 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;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.WindowManager;
 
 import java.io.File;
 /**
  * This plugin adds DCC to DMDirc.
  */
-public final class DCCPlugin extends BasePlugin implements ActionListener {
+public final class DCCPlugin extends BaseCommandPlugin implements ActionListener {
 
     /** Our DCC Container window. */
     private PlaceholderContainer container;
      * @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 to register commands
      */
     public DCCPlugin(final SwingController controller,
             final PluginInfo pluginInfo,
-            final IdentityManager identityManager
-            ) {
-        super();
+            final IdentityManager identityManager,
+            final CommandController commandController) {
+        super(commandController);
         this.identityManager = identityManager;
         this.controller = controller;
         config = controller.getGlobalConfig();

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

 
 package com.dmdirc.addons.dcop;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 /**
  * Allows the user to execute dcop commands (and read the results).
  */
-public final class DcopPlugin extends BasePlugin {
+public final class DcopPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public DcopPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public DcopPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new DcopCommand(), DcopCommand.INFO);
     }
 

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

 
 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;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.util.ArrayList;
 import java.util.HashMap;
  * Debug plugin providing commands to aid in debugging the client.
  */
 @SuppressWarnings("unused")
-public class DebugPlugin extends BasePlugin {
+public class DebugPlugin extends BaseCommandPlugin {
 
     /** List of build in debug commands to load. */
     private static final Class[] CLASSES = {
      *
      * @param identityManager Identity manager instance
      * @param pluginManager Plugin manager instance.
+     * @param commandController Command controller to register commands
      */
     public DebugPlugin(final IdentityManager identityManager,
-            final PluginManager pluginManager) {
-        super();
+            final PluginManager pluginManager,
+            final CommandController commandController) {
+        super(commandController);
         this.identityManager = identityManager;
         this.pluginManager = pluginManager;
         commands = new HashMap<String, DebugCommand>();

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

 
 package com.dmdirc.addons.dns;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 /**
  * DNS plugin.
  */
-public final class DNSPlugin extends BasePlugin {
+public final class DNSPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public DNSPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public DNSPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new DNSCommand(), DNSCommand.INFO);
     }
 

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

 
 package com.dmdirc.addons.exec;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * A plugin which provides an execute command.
  */
-public class ExecPlugin extends BasePlugin {
+public class ExecPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public ExecPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public ExecPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new ExecCommand(), ExecCommand.INFO);
     }
 }

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

 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.plugins.implementations.BaseCommandPlugin;
+import com.dmdirc.plugins.implementations.PluginFilesHelper;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
  * This plugin adds freedesktop Style Notifications to dmdirc.
  */
 public final class FreeDesktopNotificationsPlugin
-        extends BaseFileDependantPlugin implements ConfigChangeListener {
+        extends BaseCommandPlugin implements ConfigChangeListener {
 
     /** notification timeout. */
     private int timeout;
     private final Identity identity;
     /** Plugin manager instance. */
     private final PluginManager pluginManager;
+    /** Plugin files helper. */
+    private final PluginFilesHelper filesHelper;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
      * @param identityManager Identity Manager instance
+     * @param pluginManager Plugin manager
+     * @param commandController Command controller to register commands
      */
     public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo,
             final IdentityManager identityManager,
-            final PluginManager pluginManager) {
-        super(pluginInfo.getMetaData());
+            final PluginManager pluginManager,
+            final CommandController commandController) {
+        super(commandController);
         this.pluginInfo = pluginInfo;
         this.pluginManager = pluginManager;
+        this.filesHelper = new PluginFilesHelper(pluginInfo.getMetaData());
         config = identityManager.getGlobalConfiguration();
         identity = identityManager.getGlobalAddonIdentity();
         registerCommand(new FDNotifyCommand(this), FDNotifyCommand.INFO);
      * @return True if the notification was shown.
      */
     public boolean showNotification(final String title, final String message) {
-        if (getFilesDir() == null) { return false; }
+        if (filesHelper.getFilesDir() == null) { return false; }
 
         final ArrayList<String> args = new ArrayList<String>();
 
         args.add("/usr/bin/env");
         args.add("python");
-        args.add(getFilesDirString() + "notify.py");
+        args.add(filesHelper.getFilesDirString() + "notify.py");
         args.add("-a");
         args.add("DMDirc");
         args.add("-i");
 
                 // Extract the files needed
                 try {
-                    res.extractResoucesEndingWith(getFilesDir(), ".py");
-                    res.extractResoucesEndingWith(getFilesDir(), ".png");
+                    res.extractResoucesEndingWith(filesHelper.getFilesDir(), ".py");
+                    res.extractResoucesEndingWith(filesHelper.getFilesDir(), ".png");
                 } catch (IOException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for Free desktop notifications: " + ex.getMessage(), ex);
                 }
     @Override
     public void domainUpdated() {
         identity.setOption(getDomain(),
-                "general.icon", getFilesDirString() + "icon.png");
+                "general.icon", filesHelper.getFilesDirString() + "icon.png");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/identd/IdentdPlugin.java

 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.validators.PortValidator;
 

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.collections.RollingList;
 

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

 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;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.StreamUtils;
 
 /**
  * Adds logging facility to client.
  */
-public class LoggingPlugin extends BasePlugin implements ActionListener,
+public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         ConfigChangeListener {
 
     /** Cached boolean settings. */
      * @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 to register commands
      */
     public LoggingPlugin(final PluginInfo pluginInfo,
             final ActionController actionController,
-            final IdentityManager identityManager) {
-        super();
+            final IdentityManager identityManager,
+            final CommandController commandController) {
+        super(commandController);
         this.identityManager = identityManager;
 
         this.pluginInfo = pluginInfo;

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

 import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.io.BufferedReader;
 import java.io.File;

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.NoSuchProviderException;
 import com.dmdirc.plugins.PluginManager;
 

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSourcePlugin.java

 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java

 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.io.Downloader;
 

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

 import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.BaseFileDependantPlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BasePlugin;
+import com.dmdirc.plugins.implementations.PluginFilesHelper;
 import com.dmdirc.util.io.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 /**
  * Manages all Windows based media sources.
  */
-public class WindowsMediaSourcePlugin extends BaseFileDependantPlugin
+public class WindowsMediaSourcePlugin extends BasePlugin
         implements MediaSourceManager {
 
     /** Media sources. */
     /** My plugin info. */
     private final PluginInfo pluginInfo;
 
+    /** Plugin files helper. */
+    private final PluginFilesHelper filesHelper;
+
     /**
      * Creates a new instance of DcopMediaSourcePlugin.
      *
      * @param pluginInfo This plugin's plugin info
      */
     public WindowsMediaSourcePlugin(final PluginInfo pluginInfo) {
-        super(pluginInfo.getMetaData());
+        super();
         this.pluginInfo = pluginInfo;
+        this.filesHelper = new PluginFilesHelper(pluginInfo.getMetaData());
         sources = new ArrayList<MediaSource>();
         sources.add(new DllSource(this, "Winamp", true));
         sources.add(new DllSource(this, "iTunes", false));
      */
     protected MediaInfoOutput getOutput(final String player, final String method) {
         try {
-            final Process myProcess = Runtime.getRuntime().exec(new String[]{getFilesDirString() + "GetMediaInfo.exe", player, method});
+            final Process myProcess = Runtime.getRuntime().exec(new String[]{
+                filesHelper.getFilesDirString() + "GetMediaInfo.exe",
+                player,
+                method});
             final StringBuffer data = new StringBuffer();
             new StreamReader(myProcess.getErrorStream()).start();
             new StreamReader(myProcess.getInputStream(), data).start();
 
             // Extract the .dlls and .exe
             try {
-                res.extractResoucesEndingWith(getFilesDir(), ".dll");
-                res.extractResoucesEndingWith(getFilesDir(), ".exe");
+                res.extractResoucesEndingWith(filesHelper.getFilesDir(), ".dll");
+                res.extractResoucesEndingWith(filesHelper.getFilesDir(), ".exe");
             } catch (IOException ex) {
                 Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for windows media source: " + ex.getMessage(), ex);
             }

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;

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

 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * Plugin to allow pushing notifications to NotifyMyAndroid.
  */
-public class NotifyMyAndroidPlugin extends BasePlugin {
+public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
 
     /** The command to register. */
     private final NotifyMyAndroidCommand command = new NotifyMyAndroidCommand();
      * Creates a new instance of the {@link NotifyMyAndroidPlugin}.
      *
      * @param pluginInfo The plugin info object for this plugin.
+     * @param commandController Command controller to register commands
      */
-    public NotifyMyAndroidPlugin(final PluginInfo pluginInfo) {
+    public NotifyMyAndroidPlugin(final PluginInfo pluginInfo,
+            final CommandController commandController) {
+        super(commandController);
         registerCommand(command, NotifyMyAndroidCommand.INFO);
 
         this.pluginInfo = pluginInfo;

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

 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;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.util.ArrayList;
 import java.util.List;
  * Notification Manager plugin, aggregates notification sources exposing them
  * via a single command.
  */
-public class NotificationsPlugin extends BasePlugin implements ActionListener {
+public class NotificationsPlugin extends BaseCommandPlugin implements ActionListener {
 
     /** The notification methods that we know of. */
     private final List<String> methods = new ArrayList<String>();
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param commandController Command controller to register commands
      */
-    public NotificationsPlugin(final PluginInfo pluginInfo) {
-        super();
+    public NotificationsPlugin(final PluginInfo pluginInfo,
+            final CommandController commandController) {
+        super(commandController);
         this.pluginInfo = pluginInfo;
         registerCommand(new NotificationCommand(this),
                 NotificationCommand.INFO);

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

 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;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.util.ArrayList;
 import java.util.Collections;
  * Plugin that allows users to advertise what they're currently playing or
  * listening to.
  */
-public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
+public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListener  {
 
     /** The sources that we know of. */
     private final List<MediaSource> sources = new ArrayList<MediaSource>();
      *
      * @param pluginInfo This plugin's plugin info
      * @param actionController The action controller to register listeners with
+     * @param commandController Command controller to register commands
      */
     public NowPlayingPlugin(final PluginInfo pluginInfo,
-            final ActionController actionController) {
-        super();
+            final ActionController actionController,
+            final CommandController commandController) {
+        super(commandController);
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;

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

 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
 /**
  * Allows the user to display on-screen-display messages.
  */
-public final class OsdPlugin extends BasePlugin implements
+public final class OsdPlugin extends BaseCommandPlugin implements
         CategoryChangeListener, PreferencesInterface, SettingChangeListener {
 
     /** Config OSD Window. */
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param commandController Command controller to register commands
      */
-    public OsdPlugin(final PluginInfo pluginInfo) {
-        super();
+    public OsdPlugin(final PluginInfo pluginInfo,
+            final CommandController commandController) {
+        super(commandController);
         this.pluginInfo = pluginInfo;
         osdManager = new OsdManager(this);
         registerCommand(new OsdCommand(osdManager), OsdCommand.INFO);

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

 package com.dmdirc.addons.osx_integration;
 
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * A plugin which provides extra commands that integrate with the OS X
  * environment.
  */
-public class OsxIntegrationPlugin extends BasePlugin {
+public class OsxIntegrationPlugin extends BaseCommandPlugin {
 
     /**
      * Creates an instance of {@link OsxIntegrationPlugin}.
      *
      * @param controller The Swing UI which runs on the OS X environment
+     * @param commandController Command controller to register commands
      */
-    public OsxIntegrationPlugin(final SwingController controller) {
+    public OsxIntegrationPlugin(final SwingController controller,
+            final CommandController commandController) {
+        super(commandController);
         registerCommand(new DockBounceCommand(controller.getApple()),
                 DockBounceCommand.INFO);
     }

src/com/dmdirc/addons/parser_irc/IrcPlugin.java

 import com.dmdirc.parser.interfaces.ProtocolDescription;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.IRCProtocolDescription;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.net.URI;
 

src/com/dmdirc/addons/parser_msn/MSNPlugin.java

 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.net.URI;
 

src/com/dmdirc/addons/parser_twitter/TwitterPlugin.java

 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 
 import java.net.URI;

src/com/dmdirc/addons/parser_xmpp/XmppPlugin.java

 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.net.URI;
 

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

 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;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.util.ArrayList;
 import java.util.Date;
 /**
  * This causes parser debugging to be spammed to the console.
  */
-public final class DebugPlugin extends BasePlugin implements DebugInfoListener, ActionListener {
+public final class DebugPlugin extends BaseCommandPlugin implements
+        DebugInfoListener, ActionListener {
 
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers
      * Creates a new instance of this plugin.
      *
      * @param actionController The action controller to register listeners with
+     * @param commandController Command controller to register commands
      */
-    public DebugPlugin(final ActionController actionController) {
-        super();
+    public DebugPlugin(final ActionController actionController,
+            final CommandController commandController) {
+        super(commandController);
 
         this.actionController = actionController;
 

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

 
 package com.dmdirc.addons.redirect;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 /**
  * The redirect plugin allows the suer to redirect the output of commands that
  * would normally echo their results locally to a channel or chat window instead.
  */
-public final class RedirectPlugin extends BasePlugin {
+public final class RedirectPlugin extends BaseCommandPlugin {
 
-    /** Creates a new instance of this plugin. */
-    public RedirectPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public RedirectPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new RedirectCommand(), RedirectCommand.INFO);
     }
 }

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 

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

 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;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.util.io.StreamUtils;
 import com.dmdirc.util.validators.ValidationResponse;
 
 /**
  * This allows javascript scripts to be used in DMDirc.
  */
-public final class ScriptPlugin extends BasePlugin implements ActionListener {
+public final class ScriptPlugin extends BaseCommandPlugin implements ActionListener {
 
     /** Script Directory */
     private final String scriptDir;
      *
      * @param actionController The action controller to register listeners with
      * @param identityManager The Identity Manager that controls the current config
+     * @param commandController Command controller to register commands
      */
-    public ScriptPlugin(final ActionController actionController, final IdentityManager identityManager) {
-        super();
+    public ScriptPlugin(final ActionController actionController,
+            final IdentityManager identityManager,
+            final CommandController commandController) {
+        super(commandController);
         scriptDir = identityManager.getConfigDir() + "scripts/";
         this.actionController = actionController;
 

src/com/dmdirc/addons/serverlistdialog/ServerListDialogPlugin.java

 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 /**
  * Server list dialog plugin.
  */
-public class ServerListDialogPlugin implements ActionListener {
+public class ServerListDialogPlugin extends BasePlugin implements ActionListener {
 
     /** Swing controller. */
     private final SwingController controller;

src/com/dmdirc/addons/serverlists/ServerListPlugin.java

 
 package com.dmdirc.addons.serverlists;
 
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 /** Dummy plugin for server lists. */
 public class ServerListPlugin extends BasePlugin {}

src/com/dmdirc/addons/sessionlock/SessionLock.java

 package com.dmdirc.addons.sessionlock;
 
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import com.greboid.lock.LockAdapter;
 import com.greboid.lock.LockListener;

src/com/dmdirc/addons/swingdebug/SwingDebugPlugin.java

 import com.dmdirc.addons.ui_swing.DMDircEventQueue;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.CheckBoxMenuItem;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;

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

 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.validators.ValidationResponse;
  * The Systray plugin shows DMDirc in the user's system tray, and allows
  * notifications to be disabled.
  */
-public final class SystrayPlugin extends BasePlugin implements ActionListener,
-        MouseListener, com.dmdirc.interfaces.ActionListener {
+public final class SystrayPlugin extends BaseCommandPlugin implements
+        ActionListener, MouseListener, com.dmdirc.interfaces.ActionListener {
 
     /** The tray icon we're currently using. */
     private final TrayIcon icon;
      *
      * @param pluginInfo This plugin's plugin info
      * @param actionController The action controller to use
+     * @param commandController Command controller to register commands
      */
     public SystrayPlugin(final PluginInfo pluginInfo,
-            final ActionController actionController) {
-        super();
+            final ActionController actionController,
+            final CommandController commandController) {
+        super(commandController);
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;

src/com/dmdirc/addons/tabcompletion_bash/BashStylePlugin.java

 package com.dmdirc.addons.tabcompletion_bash;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 

src/com/dmdirc/addons/tabcompletion_mirc/MircStylePlugin.java

 package com.dmdirc.addons.tabcompletion_mirc;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 

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

 package com.dmdirc.addons.time;
 
 import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.util.Calendar;
 import java.util.Timer;
 /**
  * Provides various time-related features.
  */
-public final class TimePlugin extends BasePlugin {
+public final class TimePlugin extends BaseCommandPlugin {
 
     /** Have we registered our types already? */
     private static boolean registered;
      * Creates a new instance of this plugin.
      *
      * @param actionController The action controller to register listeners with
+     * @param commandController Command controller to register commands
      */
-    public TimePlugin(final ActionController actionController) {
-        super();
+    public TimePlugin(final ActionController actionController,
+            final CommandController commandController) {
+        super(commandController);
 
         this.actionController = actionController;
         manager = new TimerManager();

src/com/dmdirc/addons/ui_dummy/DummyController.java

 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;

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

 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;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
  * Controls the main swing UI.
  */
 @SuppressWarnings("PMD.UnusedPrivateField")
-public class SwingController extends BasePlugin implements UIController {
+public class SwingController extends BaseCommandPlugin implements UIController {
     /** Window factory. */
     @Getter
     private final SwingWindowFactory windowFactory =
      *
      * @param pluginInfo Plugin info
      * @param identityManager Identity Manager
+     * @param pluginManager Plugin manager
+     * @param main Main instance
+     * @param actionManager Action manager
+     * @param commandController Command controller to register commands
      */
     public SwingController(final PluginInfo pluginInfo,
             final IdentityManager identityManager,
             final PluginManager pluginManager,
             final Main main,
-            final ActionManager actionManager) {
-        super();
+            final ActionManager actionManager,
+            final CommandController commandController) {
+        super(commandController);
         this.main = main;
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;

src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java

 package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Main;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import lombok.Getter;
 

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

 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.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.util.HashMap;
  * A plugin which logs all observed URLs and allows the user to list them
  * later.
  */
-public class UrlCatcherPlugin extends BasePlugin implements ActionListener,
-        ConfigChangeListener {
+public class UrlCatcherPlugin extends BaseCommandPlugin implements
+        ActionListener, ConfigChangeListener {
 
     /* URLs and the number of times they were mentioned. */
     private final Map<String, Integer> urls = new HashMap<String, Integer>();
     /** Whether to capture URLs from the raw window. */
     private boolean captureRaw = false;
 
-    /** Creates a new instance of this plugin. */
-    public UrlCatcherPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param commandController Command controller to register commands
+     */
+    public UrlCatcherPlugin(final CommandController commandController) {
+        super(commandController);
         registerCommand(new UrlListCommand(this), UrlListCommand.INFO);
     }
 

src/com/dmdirc/addons/userlevel/UserLevelPlugin.java

 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.util.HashMap;
 import java.util.Map;

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

 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;
+import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import com.sun.jna.Native;
 import com.sun.jna.NativeLibrary;
 /**
  * Native notification plugin to make DMDirc support windows task bar flashing.
  */
-public class WindowFlashing extends BasePlugin implements ActionListener {
+public class WindowFlashing extends BaseCommandPlugin implements ActionListener {
 
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
      * @param identityManager Identity Manager
      * @param controller Parent swing controller
      * @param actionManager Action manager
+     * @param commandController command controller to register commands
      */
     public WindowFlashing(final PluginInfo pluginInfo,
             final IdentityManager identityManager,
             final SwingController controller,
-            final ActionManager actionManager) {
-        super();
+            final ActionManager actionManager,
+            final CommandController commandController) {
+        super(commandController);
         this.pluginInfo = pluginInfo;
         this.controller = controller;
         this.actionManager = actionManager;

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 
 import java.util.HashMap;

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

 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;
     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");
     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");