Fix fallout from plugin deprecations.

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

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

@@ -48,6 +48,7 @@ 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.PluginManager;
 import com.dmdirc.ui.WindowManager;
 
@@ -68,14 +69,19 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
 
     /** Our DCC Container window. */
     private PlaceholderContainer container;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param controller The controller to register UI implementations with
+     * @param pluginInfo This plugin's plugin info
      */
-    public DCCPlugin(final SwingController controller) {
+    public DCCPlugin(final SwingController controller,
+            final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         registerCommand(new DCCCommand(this), DCCCommand.INFO);
         final SwingWindowFactory factory = controller.getWindowFactory();
         factory.registerImplementation(new HashSet<String>(Arrays.asList(
@@ -724,13 +730,13 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "DCC", "", "category-dcc");
+                pluginInfo, "DCC", "", "category-dcc");
         final PreferencesCategory firewall = new PluginPreferencesCategory(
-                getPluginInfo(), "Firewall", "");
+                pluginInfo, "Firewall", "");
         final PreferencesCategory sending = new PluginPreferencesCategory(
-                getPluginInfo(), "Sending", "");
+                pluginInfo, "Sending", "");
         final PreferencesCategory receiving = new PluginPreferencesCategory(
-                getPluginInfo(), "Receiving", "");
+                pluginInfo, "Receiving", "");
 
         manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
         general.addSubCategory(firewall.setInline());

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

@@ -31,7 +31,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.BaseFileDependantPlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -46,8 +46,8 @@ import org.apache.commons.lang.StringEscapeUtils;
 /**
  * This plugin adds freedesktop Style Notifications to dmdirc.
  */
-public final class FreeDesktopNotificationsPlugin extends BasePlugin
-        implements ConfigChangeListener {
+public final class FreeDesktopNotificationsPlugin
+        extends BaseFileDependantPlugin implements ConfigChangeListener {
 
     /** notification timeout. */
     private int timeout;
@@ -59,10 +59,17 @@ public final class FreeDesktopNotificationsPlugin extends BasePlugin
     private boolean strictescape;
     /** Strip codes. */
     private boolean stripcodes;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new instance of this plugin. */
-    public FreeDesktopNotificationsPlugin() {
-        super();
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo) {
+        super(pluginInfo.getMetaData());
+        this.pluginInfo = pluginInfo;
         registerCommand(new FDNotifyCommand(this), FDNotifyCommand.INFO);
     }
 
@@ -175,29 +182,47 @@ public final class FreeDesktopNotificationsPlugin extends BasePlugin
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        IdentityManager.getAddonIdentity().setOption(getDomain(), "general.icon", getFilesDirString() + "icon.png");
+        IdentityManager.getAddonIdentity().setOption(getDomain(),
+                "general.icon", getFilesDirString() + "icon.png");
     }
 
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "FreeDesktop Notifications", "General configuration for FreeDesktop Notifications plugin.");
-
-        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "general.timeout", "Timeout", "Length of time in seconds before the notification popup closes."));
-        general.addSetting(new PreferencesSetting(PreferencesType.FILE, getDomain(), "general.icon", "icon", "Path to icon to use on the notification."));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.escapehtml", "Escape HTML", "Some Implementations randomly parse HTML, escape it before showing?"));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.strictescape", "Strict Escape HTML", "Strictly escape HTML or just the basic characters? (&, < and >)"));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.stripcodes", "Strip Control Codes", "Strip IRC Control codes from messages?"));
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "FreeDesktop Notifications",
+                "General configuration for FreeDesktop Notifications plugin.");
+
+        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "general.timeout", "Timeout",
+                "Length of time in seconds before the notification popup closes."));
+        general.addSetting(new PreferencesSetting(PreferencesType.FILE,
+                getDomain(), "general.icon", "icon",
+                "Path to icon to use on the notification."));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.escapehtml", "Escape HTML",
+                "Some Implementations randomly parse HTML, escape it before showing?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.strictescape", "Strict Escape HTML",
+                "Strictly escape HTML or just the basic characters? (&, < and >)"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.stripcodes", "Strip Control Codes",
+                "Strip IRC Control codes from messages?"));
 
         manager.getCategory("Plugins").addSubCategory(general);
     }
 
     private void setCachedSettings() {
-        timeout = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "general.timeout");
-        icon = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.icon");
-        escapehtml = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.escapehtml");
-        strictescape = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.strictescape");
-        stripcodes = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.stripcodes");
+        timeout = IdentityManager.getGlobalConfig().getOptionInt(getDomain(),
+                "general.timeout");
+        icon = IdentityManager.getGlobalConfig().getOption(getDomain(),
+                "general.icon");
+        escapehtml = IdentityManager.getGlobalConfig().getOptionBool(
+                getDomain(), "advanced.escapehtml");
+        strictescape = IdentityManager.getGlobalConfig().getOptionBool(
+                getDomain(), "advanced.strictescape");
+        stripcodes = IdentityManager.getGlobalConfig().getOptionBool(
+                getDomain(), "advanced.stripcodes");
     }
 
     /** {@inheritDoc} */

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

@@ -34,6 +34,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.validators.PortValidator;
 
 import java.util.ArrayList;
@@ -48,6 +49,18 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     private final List<Server> servers = new ArrayList<Server>();
     /** The IdentdServer that we use. */
     private IdentdServer myServer;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public IdentdPlugin(final PluginInfo pluginInfo) {
+        super();
+        this.pluginInfo = pluginInfo;
+    }
 
     /**
      * Called when the plugin is loaded.
@@ -97,7 +110,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
         } else if (type == CoreActionType.SERVER_CONNECTED
                 || type == CoreActionType.SERVER_CONNECTERROR) {
             synchronized (servers) {
-                servers.remove(arguments[0]);
+                servers.remove((Server) arguments[0]);
 
                 if (servers.isEmpty() && !IdentityManager.getGlobalConfig()
                         .getOptionBool(getDomain(), "advanced.alwaysOn")) {
@@ -111,11 +124,11 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "Identd",
+                pluginInfo, "Identd",
                 "General Identd Plugin config ('Lower' options take priority " +
                 "over those above them)");
         final PreferencesCategory advanced = new PluginPreferencesCategory(
-                getPluginInfo(), "Advanced",
+                pluginInfo, "Advanced",
                 "Advanced Identd Plugin config - Only edit these if you need " +
                 "to/know what you are doing. Editing these could prevent " +
                 "access to some servers. ('Lower' options take priority over " +

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

@@ -41,6 +41,7 @@ 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.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.RollingList;
 
@@ -70,14 +71,20 @@ public final class LagDisplayPlugin extends BasePlugin implements
     private boolean showLabels = true;
     /** The length of history to keep per-server. */
     private int historySize = 100;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
     /**
      * Creates a new LagDisplayPlugin.
      *
      * @param controller The controller to add components to
+     * @param pluginInfo This plugin's plugin info
      */
-    public LagDisplayPlugin(final SwingController controller) {
+    public LagDisplayPlugin(final SwingController controller,
+            final PluginInfo pluginInfo) {
+        super();
         this.controller = controller;
+        this.pluginInfo = pluginInfo;
     }
 
     /** {@inheritDoc} */
@@ -264,7 +271,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory cat = new PluginPreferencesCategory(
-                getPluginInfo(), "Lag display plugin", "");
+                pluginInfo, "Lag display plugin", "");
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "usealternate",
                 "Alternate method", "Use an alternate method of determining "

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

@@ -45,6 +45,7 @@ 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.ui.messages.Styliser;
 import com.dmdirc.util.StreamUtil;
 
@@ -82,6 +83,8 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
     private String timestamp, usedateformat, logDirectory, colour;
     /** Cached int settings. */
     private int historyLines, backbufferLines;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
     /** Open File. */
     protected static class OpenFile {
@@ -113,9 +116,14 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
     /** Date format used for "File Opened At" log. */
     final DateFormat openedAtFormat = new SimpleDateFormat("EEEE MMMM dd, yyyy - HH:mm:ss");
 
-    /** Creates a new instance of this plugin. */
-    public LoggingPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public LoggingPlugin(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         registerCommand(new LoggingCommand(), LoggingCommand.INFO);
     }
 
@@ -227,11 +235,11 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "Logging", "General configuration for Logging plugin.");
+                pluginInfo, "Logging", "General configuration for Logging plugin.");
         final PreferencesCategory backbuffer = new PluginPreferencesCategory(
-                getPluginInfo(), "Back Buffer", "Options related to the automatic backbuffer");
+                pluginInfo, "Back Buffer", "Options related to the automatic backbuffer");
         final PreferencesCategory advanced = new PluginPreferencesCategory(
-                getPluginInfo(), "Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
+                pluginInfo, "Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
 
         general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY, getDomain(), "general.directory", "Directory", "Directory for log files"));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.networkfolders", "Separate logs by network", "Should the files be stored in a sub-dir with the networks name?"));

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

@@ -31,6 +31,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.Downloader;
 
 import java.io.File;
@@ -50,6 +51,18 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
     /** The information obtained from VLC. */
     private final Map<String, String> information
             = new HashMap<String, String>();
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public VlcMediaSourcePlugin(final PluginInfo pluginInfo) {
+        super();
+        this.pluginInfo = pluginInfo;
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -193,7 +206,7 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "VLC Media Source",
+                pluginInfo, "VLC Media Source",
                 "", "category-vlc");
 
         final PreferencesSetting setting = new PreferencesSetting(

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.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.BasePlugin;
+import com.dmdirc.plugins.BaseFileDependantPlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.StreamReader;
@@ -39,16 +39,19 @@ import java.util.List;
 /**
  * Manages all Windows based media sources.
  */
-public class WindowsMediaSourcePlugin extends BasePlugin implements MediaSourceManager {
+public class WindowsMediaSourcePlugin extends BaseFileDependantPlugin
+        implements MediaSourceManager {
 
     /** Media sources. */
     private final List<MediaSource> sources;
 
     /**
      * Creates a new instance of DcopMediaSourcePlugin.
+     *
+     * @param pluginInfo This plugin's plugin info
      */
-    public WindowsMediaSourcePlugin() {
-        super();
+    public WindowsMediaSourcePlugin(final PluginInfo pluginInfo) {
+        super(pluginInfo.getMetaData());
         sources = new ArrayList<MediaSource>();
         sources.add(new DllSource(this, "Winamp", true));
         sources.add(new DllSource(this, "iTunes", false));

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

@@ -41,6 +41,7 @@ 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.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.ReturnableThread;
@@ -52,8 +53,6 @@ import java.util.Map;
 
 /**
  * Provides various features related to nickname colouring.
- *
- * @author chris
  */
 public final class NickColourPlugin extends BasePlugin implements ActionListener,
         ConfigChangeListener {
@@ -67,6 +66,18 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
     private boolean userandomcolour;
     private boolean settext;
     private boolean setnicklist;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public NickColourPlugin(final PluginInfo pluginInfo) {
+        super();
+        this.pluginInfo = pluginInfo;
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -247,10 +258,10 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "Nick Colours",
+                pluginInfo, "Nick Colours",
                 "General configuration for NickColour plugin.");
         final PreferencesCategory colours = new PluginPreferencesCategory(
-                getPluginInfo(), "Colours",
+                pluginInfo, "Colours",
                 "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
                 new ReturnableThread<NickColourPanel>() {
 

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

@@ -48,10 +48,17 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
     private final List<String> methods = new ArrayList<String>();
     /** The user's preferred order for method usage. */
     private List<String> order;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new instance of this plugin. */
-    public NotificationsPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public NotificationsPlugin(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         registerCommand(new NotificationCommand(this),
                 NotificationCommand.INFO);
     }
@@ -95,7 +102,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
         });
 
         final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "Notifications", "", "category-notifications",
+                pluginInfo, "Notifications", "", "category-notifications",
                 configPanel);
         manager.getCategory("Plugins").addSubCategory(category);
     }

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

@@ -53,10 +53,17 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
     private final List<MediaSourceManager> managers = new ArrayList<MediaSourceManager>();
     /** The user's preferred order for source usage. */
     private List<String> order;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new instance of this plugin. */
-    public NowPlayingPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public NowPlayingPlugin(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         registerCommand(new NowPlayingCommand(this), NowPlayingCommand.INFO);
     }
 
@@ -101,7 +108,7 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
         });
 
         final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "Now Playing",
+                pluginInfo, "Now Playing",
                 "", "category-nowplaying", configPanel);
         manager.getCategory("Plugins").addSubCategory(category);
     }

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

@@ -32,6 +32,7 @@ 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.plugins.PluginInfo;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
@@ -55,10 +56,17 @@ public final class OsdPlugin extends BasePlugin implements
     /** Setting objects with registered change listeners.*/
     private PreferencesSetting fontSizeSetting, backgroundSetting,
             foregroundSetting, widthSetting, timeoutSetting, maxWindowsSetting;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new instance of this plugin. */
-    public OsdPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public OsdPlugin(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         osdManager = new OsdManager(this);
         registerCommand(new OsdCommand(osdManager), OsdCommand.INFO);
     }
@@ -70,7 +78,7 @@ public final class OsdPlugin extends BasePlugin implements
         y = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationY");
 
         final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "OSD",
+                pluginInfo, "OSD",
                 "General configuration for OSD plugin.", "category-osd");
 
         fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,

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

@@ -33,19 +33,30 @@ 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.PluginInfo;
 
 import java.net.URI;
 import java.util.ArrayList;
 
 /**
  * Facilitates creation of Twitter parsers.
- *
- * @author shane
  */
 public class TwitterPlugin extends BasePlugin {
 
     /** Are we currently unloading? */
     private volatile boolean unloading = false;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public TwitterPlugin(final PluginInfo pluginInfo) {
+        super();
+        this.pluginInfo = pluginInfo;
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -87,8 +98,8 @@ public class TwitterPlugin extends BasePlugin {
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(getPluginInfo(), "Twitter Plugin", "Settings related to the twitter plugin", "category-twitter");
-        final PreferencesCategory advanced = new PluginPreferencesCategory(getPluginInfo(), "Advanced", "Advanced Settings related to the twitter plugin", "category-twitter");
+        final PreferencesCategory category = new PluginPreferencesCategory(pluginInfo, "Twitter Plugin", "Settings related to the twitter plugin", "category-twitter");
+        final PreferencesCategory advanced = new PluginPreferencesCategory(pluginInfo, "Advanced", "Advanced Settings related to the twitter plugin", "category-twitter");
 
         category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "statuscount", "Statuses to request", "How many statuses to request at a time?"));
         category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "apicalls", "API Calls", "Aim to only use how many API Calls per hour? (Twitter has a max of 350)"));

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

@@ -41,6 +41,7 @@ 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.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ReturnableThread;
 
@@ -56,6 +57,18 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
 
     /** Known RelayChannelHandlers. */
     private final Map<Channel, RelayChannelHandler> handlers = new HashMap<Channel, RelayChannelHandler>();
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public RelayBotPlugin(final PluginInfo pluginInfo) {
+        super();
+        this.pluginInfo = pluginInfo;
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -263,11 +276,11 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "Relay Bot",
+                pluginInfo, "Relay Bot",
                 "General configuration for the Relay bot plugin.");
 
         final PreferencesCategory colours = new PluginPreferencesCategory(
-                getPluginInfo(), "Channels",
+                pluginInfo, "Channels",
                 "Identifies where and who the bot is in channels.",
                 UIUtilities.invokeAndWait(
                 new ReturnableThread<RelayChannelPanel>() {

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

@@ -34,6 +34,7 @@ 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.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -61,10 +62,17 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
     private final TrayIcon icon;
     /** Main frame instance. */
     private MainFrame mainFrame;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new system tray plugin. */
-    public SystrayPlugin() {
+    /**
+     * Creates a new system tray plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public SystrayPlugin(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         final MenuItem show = new MenuItem("Show/hide");
         final MenuItem quit = new MenuItem("Quit");
 
@@ -153,7 +161,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
             continueLoading = false;
         }
         if (!continueLoading || mainFrame == null) {
-            getPluginInfo().unloadPlugin();
+            pluginInfo.unloadPlugin();
         }
         super.onLoad();
     }
@@ -170,7 +178,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "System Tray",
+                pluginInfo, "System Tray",
                 "General configuration settings");
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,

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

@@ -54,12 +54,14 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.updater.Version;
 import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.validators.NumericalValidator;
 
@@ -115,10 +117,17 @@ public class SwingController extends BasePlugin implements UIController {
     private DMDircEventQueue eventQueue;
     /** Key listener to handle dialog key events. */
     private DialogKeyListener keyListener;
+    /** This plugin's plugin info object. */
+    private final PluginInfo pluginInfo;
 
-    /** Instantiates a new SwingController. */
-    public SwingController() {
+    /**
+     * Instantiates a new SwingController.
+     *
+     * @param pluginInfo Plugin info
+     */
+    public SwingController(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         setAntiAlias();
         windows = new ArrayList<java.awt.Window>();
         registerCommand(new ServerSettings(), ServerSettings.INFO);
@@ -549,7 +558,7 @@ public class SwingController extends BasePlugin implements UIController {
      */
     private PreferencesCategory createGeneralCategory() {
         final PreferencesCategory general = new PluginPreferencesCategory(
-                getPluginInfo(), "Swing UI", "These config options apply "
+                pluginInfo, "Swing UI", "These config options apply "
                 + "only to the swing UI.", "category-gui");
 
         final Map<String, String> lafs = new HashMap<String, String>();
@@ -610,7 +619,7 @@ public class SwingController extends BasePlugin implements UIController {
      */
     private PreferencesCategory createAdvancedCategory() {
         final PreferencesCategory advanced = new PluginPreferencesCategory(
-                getPluginInfo(), "Advanced", "");
+                pluginInfo, "Advanced", "");
 
         advanced.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALINTEGER,
@@ -663,7 +672,7 @@ public class SwingController extends BasePlugin implements UIController {
      */
     private PreferencesCategory createTreeViewCategory() {
         final PreferencesCategory treeview = new PluginPreferencesCategory(
-                getPluginInfo(), "Treeview", "", "treeview");
+                pluginInfo, "Treeview", "", "treeview");
 
         treeview.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
@@ -703,7 +712,7 @@ public class SwingController extends BasePlugin implements UIController {
      */
     private PreferencesCategory createNicklistCategory() {
         final PreferencesCategory nicklist = new PluginPreferencesCategory(
-                getPluginInfo(), "Nicklist", "", "nicklist");
+                pluginInfo, "Nicklist", "", "nicklist");
 
         nicklist.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
@@ -796,4 +805,13 @@ public class SwingController extends BasePlugin implements UIController {
         requestWindowFocus(getWindowFactory().getSwingWindow(container));
     }
 
+    /**
+     * Returns the version of this swing UI.
+     *
+     * @return Swing version
+     */
+    public Version getVersion() {
+        return pluginInfo.getMetaData().getVersion();
+    }
+
 }

src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -82,8 +82,8 @@ public final class InfoPanel extends JPanel {
                  + "<b>Mode Alises version: </b>" + IdentityManager
                  .getGlobalConfig().getOption("identity", "modealiasversion")
                  + "<br>"
-                 + "<b>Swing UI version: </b>" + controller.getPluginInfo()
-                 .getMetaData().getVersion().toString() + "<br>"
+                 + "<b>Swing UI version: </b>" + controller.getVersion()
+                 .toString() + "<br>"
                  + "<b>OS Version: </b>" + Info.getOSVersion() + "<br>"
                  + "<b>Profile directory: </b>" + Main.getConfigDir() + "<br>"
                  + "<b>Java version: </b>" + Info.getJavaVersion() + "<br>"

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

@@ -32,6 +32,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.plugins.BasePlugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
 import com.sun.jna.Native;
@@ -59,10 +60,17 @@ public class WindowFlashing extends BasePlugin implements ConfigChangeListener {
     private int flashcount = Integer.MAX_VALUE;
     /** Cached flags setting. */
     private int flags = 0;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new instance of this plugin. */
-    public WindowFlashing() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public WindowFlashing(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
         registerCommand(new FlashWindow(this), FlashWindow.INFO);
     }
 
@@ -113,7 +121,7 @@ public class WindowFlashing extends BasePlugin implements ConfigChangeListener {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "Window Flashing",
+                pluginInfo, "Window Flashing",
                 "General configuration for window flashing plugin.");
 
         category.addSetting(new PreferencesSetting(

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

@@ -41,6 +41,7 @@ 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.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ReturnableThread;
 
@@ -64,10 +65,17 @@ public final class WindowStatusPlugin extends BasePlugin
     private boolean shownone;
     /** Prefix for users without modes. */
     private String nonePrefix;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
 
-    /** Creates a new instance of WindowStatusPlugin. */
-    public WindowStatusPlugin() {
+    /**
+     * Creates a new instance of WindowStatusPlugin.
+     *
+     * @param pluginInfo This plugin's plugin info
+     */
+    public WindowStatusPlugin(final PluginInfo pluginInfo) {
         super();
+        this.pluginInfo = pluginInfo;
 
         panel = UIUtilities.invokeAndWait(
                 new ReturnableThread<WindowStatusPanel>() {
@@ -211,7 +219,7 @@ public final class WindowStatusPlugin extends BasePlugin
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(
-                getPluginInfo(), "Window status", "");
+                pluginInfo, "Window status", "");
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "channel.shownone", "Show 'none' count",

test/com/dmdirc/addons/logging/LoggingPluginTest.java

@@ -23,13 +23,10 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.Channel;
-import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.Query;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestLoggingPlugin;
-import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
@@ -44,7 +41,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class LoggingPluginTest {
-    
+
     private static Server server;
     private static Channel channel;
     private static Query query;
@@ -57,14 +54,14 @@ public class LoggingPluginTest {
 
         ClientInfo clientinfo = mock(ClientInfo.class);
         when(clientinfo.toString()).thenReturn("foo!bar@baz");
-        
+
         Parser parser = mock(Parser.class);
         when(parser.getClient(anyString())).thenReturn(clientinfo);
 
         server = mock(Server.class);
         when(server.toString()).thenReturn("server");
         when(server.getParser()).thenReturn(parser);
-        
+
         ChannelInfo info = mock(ChannelInfo.class);
         when(info.toString()).thenReturn("#test");
 
@@ -90,30 +87,30 @@ public class LoggingPluginTest {
         lp.domainUpdated();
         lp.onLoad();
     }
-    
+
     @Test
     public void testChannelOpened() {
         lp.processEvent(CoreActionType.CHANNEL_OPENED, new StringBuffer(),
                 channel);
-        
+
         assertTrue(lp.lines.containsKey("#test"));
         assertEquals(2, lp.lines.get("#test").size());
         assertTrue(lp.lines.get("#test").get(1).isEmpty());
         assertTrue(lp.lines.get("#test").get(0).indexOf("opened") > -1);
         lp.lines.clear();
     }
-    
+
     @Test
     public void testChannelClosed() {
         lp.processEvent(CoreActionType.CHANNEL_CLOSED, new StringBuffer(),
                 channel);
-        
+
         assertTrue(lp.lines.containsKey("#test"));
         assertEquals(1, lp.lines.get("#test").size());
         assertTrue(lp.lines.get("#test").get(0).indexOf("closed") > -1);
         lp.lines.clear();
     }
-    
+
     @Test
     public void testQueryOpened() {
         lp.processEvent(CoreActionType.QUERY_OPENED, new StringBuffer(),
@@ -126,12 +123,12 @@ public class LoggingPluginTest {
         assertTrue(lp.lines.get("foo!bar@baz").get(0).indexOf("opened") > -1);
         lp.lines.clear();
     }
-    
+
     @Test
     public void testQueryClosed() {
         lp.processEvent(CoreActionType.QUERY_CLOSED, new StringBuffer(),
                 query);
-        
+
         assertTrue(lp.lines.containsKey("foo!bar@baz"));
         assertEquals(1, lp.lines.get("foo!bar@baz").size());
         assertTrue(lp.lines.get("foo!bar@baz").get(0).indexOf("closed") > -1);

test/com/dmdirc/addons/logging/TestLoggingPlugin.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2011 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.logging;
+
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.util.MapList;
+import static org.mockito.Mockito.*;
+
+public class TestLoggingPlugin extends LoggingPlugin {
+
+    public final MapList<Object, String> lines = new MapList<Object, String>();
+
+    public TestLoggingPlugin() {
+        super(mock(PluginInfo.class));
+    }
+
+    @Override
+    protected String getLogFile(Object obj) {
+        return obj.toString();
+    }
+
+    @Override
+    protected boolean appendLine(String filename, String line) {
+        lines.add(filename, line);
+        return true;
+    }
+
+}

test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java

@@ -22,25 +22,28 @@
 
 package com.dmdirc.addons.mediasource_vlc;
 
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.TextFile;
 import java.io.IOException;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class VlcMediaSourcePluginTest {
 
     @Test
     public void testProcessInformation1() throws IOException {
-        final VlcMediaSourcePlugin plugin = new VlcMediaSourcePlugin();
+        final PluginInfo pluginInfo = mock(PluginInfo.class);
+        final VlcMediaSourcePlugin plugin = new VlcMediaSourcePlugin(pluginInfo);
         final TextFile index = new TextFile(getClass().getResourceAsStream("index-1.html"));
         final TextFile info = new TextFile(getClass().getResourceAsStream("info-1.html"));
-        
+
         plugin.parseInformation(info.getLines(), index.getLines());
-        
+
         // This doesn't work anymore because getState() calls fetchInformation()
         // which overwrites the stuff set by the parseInformation() call.
         // assertTrue(plugin.getState() == MediaSourceState.PLAYING);
-        
+
         assertEquals("Manic Street Preachers", plugin.getArtist());
         assertEquals("Send Away The Tigers", plugin.getAlbum());
         assertEquals("The Second Great Depression", plugin.getTitle());

test/com/dmdirc/harness/ui/DMDircUITestCase.java

@@ -71,7 +71,7 @@ public class DMDircUITestCase extends UISpecTestCase {
         final SwingWindowFactory windowFactory = mock(SwingWindowFactory.class);
         when(controller.getDomain()).thenReturn("test");
         when(controller.getWindowFactory()).thenReturn(windowFactory);
-        when(controller.getPluginInfo()).thenReturn(pluginInfo);
+        when(controller.getVersion()).thenReturn(new Version(1));
         when(pluginInfo.getMetaData()).thenReturn(metaData);
         when(metaData.getVersion()).thenReturn(new Version(1));