Change Plugin to an interface and add BasePlugin abstract class.

Issue CLIENT-241

Depends-On: Ie1b3277bb1c667ee99a1b203c2ff1094616ceaff
Change-Id: If0fd1c74a19c488cb7853d69deae9f75bab43d41
Reviewed-on: http://gerrit.dmdirc.com/1923
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -23,28 +23,18 @@
 package com.dmdirc.addons.audio;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 /**
  * Adds Audio playing facility to client.
- *
- * @author Shane 'Dataforce' McCormack
  */
-public final class AudioPlugin extends Plugin {
+public final class AudioPlugin extends BasePlugin {
 
     /** The AudioCommand we created */
     private AudioCommand audioCommand = null;
-
     /** The BeepCommand we created */
     private BeepCommand beepCommand = null;
 
-    /**
-     * Creates a new instance of the Audio Plugin.
-     */
-    public AudioPlugin() {
-        super();
-    }
-
     /**
      * Called when the plugin is loaded.
      */

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

@@ -23,14 +23,14 @@
 package com.dmdirc.addons.calc;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 /**
  * A plugin which parses and evaluates various mathematical expressions.
  *
  * @author chris
  */
-public class CalcPlugin extends Plugin {
+public class CalcPlugin extends BasePlugin {
 
     /** The command we register when loaded. */
     private final CalcCommand command = new CalcCommand();

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

@@ -46,7 +46,7 @@ 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.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 
@@ -61,7 +61,7 @@ import javax.swing.JOptionPane;
 /**
  * This plugin adds DCC to dmdirc.
  */
-public final class DCCPlugin extends Plugin implements ActionListener {
+public final class DCCPlugin extends BasePlugin implements ActionListener {
 
     /** The DCCCommand we created. */
     private DCCCommand command;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.dcop;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -36,7 +36,7 @@ import java.util.List;
  *
  * @author chris
  */
-public final class DcopPlugin extends Plugin {
+public final class DcopPlugin extends BasePlugin {
     /** The DcopCommand we created */
     private DcopCommand command = null;
 

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

@@ -26,7 +26,7 @@ import com.dmdirc.addons.debug.commands.*; //NOPMD
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,7 +36,7 @@ import java.util.Map;
 /**
  * Debug plugin providing commands to aid in debugging the client.
  */
-public class DebugPlugin extends Plugin {
+public class DebugPlugin extends BasePlugin {
 
     /** List of build in debug commands to load. */
     private static final Class[] CLASSES = {

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.dns;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -34,7 +34,7 @@ import java.util.List;
 /**
  * DNS plugin.
  */
-public final class DNSPlugin extends Plugin {
+public final class DNSPlugin extends BasePlugin {
 
     /** The DNSCommand we've registered. */
     private DNSCommand command;

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

@@ -24,12 +24,12 @@
 package com.dmdirc.addons.exec;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 /**
  * A plugin which provides an execute command.
  */
-public class ExecPlugin extends Plugin {
+public class ExecPlugin extends BasePlugin {
 
     /** The command we register when loaded. */
     private final ExecCommand command = new ExecCommand();

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

@@ -33,7 +33,7 @@ import com.dmdirc.util.StreamReader;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -47,7 +47,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 /**
  * This plugin adds freedesktop Style Notifications to dmdirc.
  */
-public final class FreeDesktopNotificationsPlugin extends Plugin implements ConfigChangeListener {
+public final class FreeDesktopNotificationsPlugin extends BasePlugin implements ConfigChangeListener {
     /** The DcopCommand we created */
     private FDNotifyCommand command = null;
     /** notification timeout. */

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

@@ -34,7 +34,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.util.validators.PortValidator;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,7 @@ import java.util.List;
 /**
  * The Identd plugin answers ident requests from IRC servers.
  */
-public class IdentdPlugin extends Plugin implements ActionListener {
+public class IdentdPlugin extends BasePlugin implements ActionListener {
 
     /** Array list to store all the servers in that need ident replies. */
     private final List<Server> servers = new ArrayList<Server>();

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

@@ -38,7 +38,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.RollingList;
@@ -50,34 +50,24 @@ import java.util.WeakHashMap;
 
 /**
  * Displays the current server's lag in the status bar.
- * @author chris
  */
-public final class LagDisplayPlugin extends Plugin implements ActionListener, ConfigChangeListener {
+public final class LagDisplayPlugin extends BasePlugin implements
+        ActionListener, ConfigChangeListener {
 
     /** The panel we use in the status bar. */
     private final LagDisplayPanel panel = new LagDisplayPanel(this);
-
     /** A cache of ping times. */
     private final Map<Server, String> pings = new WeakHashMap<Server, String>();
-
     /** Ping history. */
     private final Map<Server, RollingList<Long>> history
             = new HashMap<Server, RollingList<Long>>();
-
     /** Whether or not to show a graph in the info popup. */
     private boolean showGraph = true;
-
     /** Whether or not to show labels on that graph. */
     private boolean showLabels = true;
-
     /** The length of history to keep per-server. */
     private int historySize = 100;
 
-    /** Creates a new instance of LagDisplayPlugin. */
-    public LagDisplayPlugin() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onLoad() {

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

@@ -36,19 +36,10 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * The dcop command retrieves information from a dcop application.
- *
- * @author Shane "Dataforce" Mc Cormack
  */
 public final class LoggingCommand extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of LoggingCommand.
-     */
-    public LoggingCommand() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -45,7 +45,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.StreamUtil;
 
@@ -75,7 +75,7 @@ import java.util.TimerTask;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class LoggingPlugin extends Plugin implements ActionListener,
+public class LoggingPlugin extends BasePlugin implements ActionListener,
         ConfigChangeListener {
 
     /** The command we registered. */

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

@@ -26,7 +26,7 @@ import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -41,7 +41,7 @@ import java.util.Map;
 /**
  * Provides a media source for dbus players.
  */
-public class DBusMediaSource extends Plugin implements MediaSourceManager {
+public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
 
     /** The sources used by this media source. */
     private List<MediaSource> sources;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.mediasource_dcop;
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.plugins.NoSuchProviderException;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
@@ -34,7 +34,7 @@ import java.util.List;
 /**
  * Manages all DCOP based media sources.
  */
-public class DcopMediaSourcePlugin extends Plugin
+public class DcopMediaSourcePlugin extends BasePlugin
         implements MediaSourceManager {
 
     /** Media sources. */

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.mediasource_linux_title;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +35,7 @@ import java.util.List;
  *
  * @author chris
  */
-public class TitleMediaSourcePlugin extends Plugin implements MediaSourceManager {
+public class TitleMediaSourcePlugin extends BasePlugin implements MediaSourceManager {
 
     /** The sources to be returned. */
     private List<MediaSource> sources = null;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.mediasource_mplayer;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -38,7 +38,7 @@ import java.util.List;
  *
  * @author chris
  */
-public class MplayerMediaSourcePlugin extends Plugin implements MediaSource {
+public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource {
 
     /**
      * Creates a new instance of MplayerMediaSourcePlugin.

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

@@ -30,7 +30,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.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.util.Downloader;
 
 import java.io.File;
@@ -45,7 +45,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
+public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
 
     /** The information obtained from VLC. */
     private final Map<String, String> information

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.util.StreamReader;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.resourcemanager.ResourceManager;
@@ -39,7 +39,7 @@ import java.util.List;
 /**
  * Manages all Windows based media sources.
  */
-public class WindowsMediaSourcePlugin extends Plugin implements MediaSourceManager {
+public class WindowsMediaSourcePlugin extends BasePlugin implements MediaSourceManager {
 
     /** Media sources. */
     private final List<MediaSource> sources;

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

@@ -40,7 +40,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.ReturnableThread;
@@ -55,7 +55,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public final class NickColourPlugin extends Plugin implements ActionListener,
+public final class NickColourPlugin extends BasePlugin implements ActionListener,
         ConfigChangeListener {
 
     /** "Random" colours to use to colour nicknames. */

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

@@ -31,7 +31,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.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ReturnableThread;
@@ -43,7 +43,7 @@ import java.util.List;
  * Notification Manager plugin, aggregates notification sources exposing them
  * via a single command.
  */
-public class NotificationsPlugin extends Plugin implements ActionListener {
+public class NotificationsPlugin extends BasePlugin implements ActionListener {
 
     /** The notification methods that we know of. */
     private final List<String> methods = new ArrayList<String>();

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

@@ -32,6 +32,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.plugins.BasePlugin;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -44,30 +45,18 @@ import java.util.List;
 /**
  * Plugin that allows users to advertise what they're currently playing or
  * listening to.
- *
- * @author chris
  */
-public class NowPlayingPlugin extends Plugin implements ActionListener  {
+public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
 
     /** The sources that we know of. */
     private final List<MediaSource> sources = new ArrayList<MediaSource>();
-
     /** The managers that we know of. */
     private final List<MediaSourceManager> managers = new ArrayList<MediaSourceManager>();
-
     /** The now playing command we're registering. */
     private NowPlayingCommand command;
-
     /** The user's preferred order for source usage. */
     private List<String> order;
 
-    /**
-     * Creates a new instance of NowPlayingPlugin.
-     */
-    public NowPlayingPlugin() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
@@ -318,4 +307,4 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
 
         return res;
     }
-}
+}

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

@@ -34,7 +34,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,7 +42,7 @@ import java.util.Map;
  * Allows the user to display on-screen-display messages.
  * @author chris
  */
-public final class OsdPlugin extends Plugin implements CategoryChangeListener,
+public final class OsdPlugin extends BasePlugin implements CategoryChangeListener,
         PreferencesInterface, SettingChangeListener {
 
     /** Config OSD Window. */

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

@@ -27,7 +27,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.IRCProtocolDescription;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.net.URI;
 
@@ -37,7 +37,7 @@ import java.net.URI;
  * @since 0.6.4
  * @author chris
  */
-public class IrcPlugin extends Plugin {
+public class IrcPlugin extends BasePlugin {
 
     /** {@inheritDoc} */
     @Override

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

@@ -75,7 +75,8 @@ public class TwitterClientInfo implements LocalClientInfo {
      * @param plugin Plugin to use to get domain from.
      * @return String array of nick, ident and host.
      */
-    static String[] parseHostFull(final String hostname, final Plugin plugin, final Twitter parser) {
+    static String[] parseHostFull(final String hostname, final Plugin plugin,
+            final Twitter parser) {
         boolean hadAt = false;
         String sanitisedHostname = hostname;
 

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

@@ -32,7 +32,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -42,7 +42,7 @@ import java.util.ArrayList;
  *
  * @author shane
  */
-public class TwitterPlugin extends Plugin {
+public class TwitterPlugin extends BasePlugin {
 
     /** Are we currently unloading? */
     private volatile boolean unloading = false;

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

@@ -25,13 +25,13 @@ package com.dmdirc.addons.parser_xmpp;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import java.net.URI;
 
 /**
  * Plugin that provides a parser to connect to XMPP services.
  */
-public class XmppPlugin extends Plugin {
+public class XmppPlugin extends BasePlugin {
 
     /** {@inheritDoc} */
     @Override

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

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -42,7 +42,7 @@ import java.util.Map;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class DebugPlugin extends Plugin implements DebugInfoListener, ActionListener {
+public final class DebugPlugin extends BasePlugin implements DebugInfoListener, ActionListener {
 
     /** The ParserDebugCommand we created. */
     private ParserDebugCommand command = null;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.redirect;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 
 /**
@@ -32,7 +32,7 @@ import com.dmdirc.plugins.Plugin;
  *
  * @author chris
  */
-public final class RedirectPlugin extends Plugin {
+public final class RedirectPlugin extends BasePlugin {
 
     private final RedirectCommand command;
 

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

@@ -40,7 +40,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ReturnableThread;
 
@@ -54,7 +54,7 @@ import java.util.Map;
  *
  * @author shane
  */
-public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChangeListener {
+public class RelayBotPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
     /** Known RelayChannelHandlers. */
     private final Map<Channel, RelayChannelHandler> handlers = new HashMap<Channel, RelayChannelHandler>();
 

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

@@ -62,7 +62,6 @@ public class RelayChannelPanel extends JPanel implements ActionListener,
     private final transient RelayBotPlugin plugin;
     /** The table headings. */
     private static final String[] HEADERS = {"Channel", "Nickname", };
-
     /** Delete button. */
     private final JButton deleteButton;
 

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

@@ -31,7 +31,7 @@ import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.util.StreamUtil;
 
 import java.io.File;
@@ -49,7 +49,7 @@ import javax.script.ScriptEngineManager;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class ScriptPlugin extends Plugin implements ActionListener {
+public final class ScriptPlugin extends BasePlugin implements ActionListener {
     /** The ScriptCommand we created */
     private ScriptCommand command = null;
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.serverlists;
 
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 
 /**
@@ -30,7 +30,7 @@ import com.dmdirc.plugins.Plugin;
  *
  * @author chris
  */
-public class ServerListPlugin extends Plugin {
+public class ServerListPlugin extends BasePlugin {
 
     /** {@inheritDoc} */
     @Override

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

@@ -26,7 +26,7 @@ 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.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -45,7 +45,7 @@ import net.miginfocom.swing.MigLayout;
  * Swing debug plugin. Provides long running EDT task violation detection and
  * a console for System.out and System.err.
  */
-public class SwingDebugPlugin extends Plugin implements ActionListener {
+public class SwingDebugPlugin extends BasePlugin implements ActionListener {
 
     /** Swing controller. */
     private SwingController controller;

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

@@ -35,7 +35,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -55,7 +55,7 @@ import java.awt.event.MouseListener;
  * The Systray plugin shows DMDirc in the user's system tray, and allows
  * notifications to be disabled.
  */
-public final class SystrayPlugin extends Plugin implements ActionListener,
+public final class SystrayPlugin extends BasePlugin implements ActionListener,
         MouseListener, com.dmdirc.interfaces.ActionListener {
 
     /** The tray icon we're currently using. */

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-public class BashStylePlugin extends Plugin {
+public class BashStylePlugin extends BasePlugin {
 
     /** {@inheritDoc} */
     @Override

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.tabcompletion_mirc;
 
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-public class MircStylePlugin extends Plugin {
+public class MircStylePlugin extends BasePlugin {
 
     /** {@inheritDoc} */
     @Override

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.time;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.util.Calendar;
 import java.util.Timer;
@@ -35,7 +35,7 @@ import java.util.TimerTask;
  * Provides various time-related features.
  * @author chris
  */
-public final class TimePlugin  extends Plugin {
+public final class TimePlugin  extends BasePlugin {
 
     /** Have we registered our types already? */
     private static boolean registered;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_dummy;
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.interfaces.UIController;
 
@@ -34,7 +34,7 @@ import java.net.URI;
 /**
  * Implements a dummy UI controller.
  */
-public final class DummyController extends Plugin implements UIController {
+public final class DummyController extends BasePlugin implements UIController {
 
     /**
      * Creates a new instance of DummyController.

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

@@ -51,7 +51,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
@@ -83,7 +83,7 @@ import net.miginfocom.layout.PlatformDefaults;
 /**
  * Controls the main swing UI.
  */
-public class SwingController extends Plugin implements UIController {
+public class SwingController extends BasePlugin implements UIController {
 
     /**
      * A version number for this class. It should be changed whenever the class

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.interfaces.UIController;
 
 import org.mortbay.jetty.Handler;
@@ -32,7 +32,7 @@ import org.mortbay.jetty.Handler;
  *
  * @author chris
  */
-public class WebInterfacePlugin extends Plugin {
+public class WebInterfacePlugin extends BasePlugin {
 
     /** The UI that we're using. */
     private WebInterfaceUI ui;

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

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.util.HashMap;
@@ -43,7 +43,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public class UrlCatcherPlugin extends Plugin implements ActionListener,
+public class UrlCatcherPlugin extends BasePlugin implements ActionListener,
         ConfigChangeListener {
 
     private final Map<String, Integer> urls = new HashMap<String, Integer>();

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

@@ -31,7 +31,7 @@ import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -42,7 +42,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public class UserLevelPlugin extends Plugin implements ActionListener,
+public class UserLevelPlugin extends BasePlugin implements ActionListener,
         ConfigChangeListener {
 
     /** The domain used for userlevels. */

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

@@ -32,7 +32,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 
 import com.sun.jna.Native;
@@ -46,7 +46,7 @@ import com.sun.jna.platform.win32.WinUser.FLASHWINFO;
 /**
  * Native notification plugin to make DMDirc support windows task bar flashing.
  */
-public class WindowFlashing extends Plugin implements ConfigChangeListener {
+public class WindowFlashing extends BasePlugin implements ConfigChangeListener {
 
     /** Library instance. */
     private User32 user32;

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

@@ -42,7 +42,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.ReturnableThread;
@@ -56,7 +56,7 @@ import java.util.Map.Entry;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class WindowStatusPlugin extends Plugin implements ActionListener, ConfigChangeListener {
+public final class WindowStatusPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
 
     /** The panel we use in the status bar. */
     private final WindowStatusPanel panel;