Moving plugin metadata handling to new class

Remove dodgy plugin info test

Change-Id: I763b973cab127431cf0b70914804e142d779290c
Reviewed-on: http://gerrit.dmdirc.com/2038
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/plugins/PluginInfo.java

@@ -30,8 +30,6 @@ import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.Version;
-import com.dmdirc.util.ConfigFile;
-import com.dmdirc.util.InvalidConfigFileException;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 import com.dmdirc.util.validators.ValidationResponse;
 
@@ -42,6 +40,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,8 +56,9 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     /** A logger for this class. */
     private static final java.util.logging.Logger LOGGER
             = java.util.logging.Logger.getLogger(PluginInfo.class.getName());
-    /** Plugin Meta Data. */
-    private volatile ConfigFile metaData;
+
+    /** The metadata for this plugin. */
+    private final PluginMetaData metadata;
     /** URL that this plugin was loaded from. */
     private final URL url;
     /** Filename for this plugin (taken from URL). */
@@ -91,43 +91,48 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     /**
      * Create a new PluginInfo.
      *
+     * @param metadata The plugin's metadata information
      * @param url URL to file that this plugin is stored in.
      * @throws PluginException if there is an error loading the Plugin
-     * @since 0.6
+     * @since 0.6.6
      */
-    public PluginInfo(final URL url) throws PluginException {
-        this(url, true);
+    public PluginInfo(final PluginMetaData metadata, final URL url) throws PluginException {
+        this(metadata, url, true);
     }
 
     /**
      * Create a new PluginInfo.
      *
+     * @param metadata The plugin's metadata information
      * @param url URL to file that this plugin is stored in.
      * @param load Should this plugin be loaded, or is this just a placeholder? (true for load, false for placeholder)
      * @throws PluginException if there is an error loading the Plugin
-     * @since 0.6
+     * @since 0.6.6
      */
-    public PluginInfo(final URL url, final boolean load) throws PluginException {
+    public PluginInfo(final PluginMetaData metadata, final URL url, final boolean load) throws PluginException {
         this.url = url;
         this.filename = new File(url.getPath()).getName();
+        this.metadata = metadata;
 
         ResourceManager res;
 
         // Check for updates.
         if (new File(getFullFilename() + ".update").exists() && new File(getFullFilename()).delete()) {
             new File(getFullFilename() + ".update").renameTo(new File(getFullFilename()));
+
+            updateMetaData();
         }
 
         if (!load) {
-            // Load the metaData if available.
-            try {
-                metaData = getConfigFile();
-            } catch (IOException ioe) {
-                metaData = null;
-            }
+            // TODO: This is pointless now
             return;
         }
 
+        if (metadata.hasErrors()) {
+            throw new PluginException("Plugin " + filename + " has metadata "
+                    + "errors: " + metadata.getErrors());
+        }
+
         try {
             res = getResourceManager();
         } catch (IOException ioe) {
@@ -135,20 +140,6 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             throw new PluginException("Plugin " + filename + " failed to load. " + lastError, ioe);
         }
 
-        try {
-            metaData = getConfigFile();
-            if (metaData == null) {
-                lastError = "plugin.config doesn't exist in jar";
-                throw new PluginException("Plugin " + filename + " failed to load. " + lastError);
-            }
-        } catch (IOException e) {
-            lastError = "plugin.config IOException: " + e.getMessage();
-            throw new PluginException("Plugin " + filename + " failed to load, plugin.config failed to open - " + e.getMessage(), e);
-        } catch (IllegalArgumentException e) {
-            lastError = "plugin.config IllegalArgumentException: " + e.getMessage();
-            throw new PluginException("Plugin " + filename + " failed to load, plugin.config failed to open - " + e.getMessage(), e);
-        }
-
         if (!getVersion().isValid()) {
             lastError = "Incomplete plugin.config (Missing or invalid 'version')";
             throw new PluginException("Plugin " + filename + " failed to load. " + lastError);
@@ -177,10 +168,6 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                     myClasses.add(classname);
                 }
             }
-
-            if (isPersistent() && loadAll()) {
-                loadEntirePlugin();
-            }
         } else {
             lastError = "One or more requirements not met (" + requirementsError + ")";
             throw new PluginException("Plugin " + filename + " was not loaded. " + lastError);
@@ -190,28 +177,6 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         getDefaults();
     }
 
-    /**
-     * Get a ConfigFile object for this plugin.
-     * This will load a ConfigFile
-     *
-     * @return the ConfigFile object for this plugin, or null if the plugin has no config
-     * @throws IOException if there is an error with the ResourceManager.
-     */
-    private ConfigFile getConfigFile() throws IOException {
-        ConfigFile file = null;
-        final ResourceManager res = getResourceManager();
-        if (res.resourceExists("META-INF/plugin.config")) {
-            try {
-                file = new ConfigFile(res.getResourceInputStream("META-INF/plugin.config"));
-                file.read();
-            } catch (InvalidConfigFileException icfe) {
-                throw new IOException("Unable to read plugin.config", icfe);
-            }
-        }
-
-        return file;
-    }
-
     /**
      * Get the licence for this plugin if it exists.
      *
@@ -231,46 +196,30 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Get the defaults, formatters and icons for this plugin.
      */
     private void getDefaults() {
-        if (metaData == null) {
-            return;
-        }
-
         final Identity defaults = IdentityManager.getAddonIdentity();
         final String domain = "plugin-" + getName();
 
         LOGGER.finer(getName() + ": Using domain '" + domain + "'");
 
-        if (metaData.isKeyDomain("defaults")) {
-            final Map<String, String> keysection = metaData.getKeyDomain("defaults");
-
-            for (Map.Entry<String, String> entry : keysection.entrySet()) {
-                final String key = entry.getKey();
-                final String value = entry.getValue();
+        for (Map.Entry<String, String> entry : metadata.getDefaultSettings().entrySet()) {
+            final String key = entry.getKey();
+            final String value = entry.getValue();
 
-                defaults.setOption(domain, key, value);
-            }
+            defaults.setOption(domain, key, value);
         }
 
-        if (metaData.isKeyDomain("formatters")) {
-            final Map<String, String> keysection = metaData.getKeyDomain("formatters");
-
-            for (Map.Entry<String, String> entry : keysection.entrySet()) {
-                final String key = entry.getKey();
-                final String value = entry.getValue();
+        for (Map.Entry<String, String> entry : metadata.getFormatters().entrySet()) {
+            final String key = entry.getKey();
+            final String value = entry.getValue();
 
-                defaults.setOption("formatter", key, value);
-            }
+            defaults.setOption("formatter", key, value);
         }
 
-        if (metaData.isKeyDomain("icons")) {
-            final Map<String, String> keysection = metaData.getKeyDomain("icons");
+        for (Map.Entry<String, String> entry : metadata.getIcons().entrySet()) {
+            final String key = entry.getKey();
+            final String value = entry.getValue();
 
-            for (Map.Entry<String, String> entry : keysection.entrySet()) {
-                final String key = entry.getKey();
-                final String value = entry.getValue();
-
-                defaults.setOption("icon", key, value);
-            }
+            defaults.setOption("icon", key, value);
         }
     }
 
@@ -339,7 +288,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         }
 
         // Get services provided by this plugin
-        final List<String> providesList = metaData.getFlatDomain("provides");
+        final Collection<String> providesList = metadata.getServices();
         if (providesList != null) {
             for (String item : providesList) {
                 final String[] bits = item.split(" ");
@@ -391,19 +340,9 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return true if metaData was reloaded ok, else false.
      */
     private boolean updateMetaData() {
-        // Force a new resourcemanager just incase.
-        try {
-            getResourceManager(true);
-            final ConfigFile newMetaData = getConfigFile();
-            if (newMetaData != null) {
-                metaData = newMetaData;
-                return true;
-            }
-        } catch (IOException ioe) {
-            Logger.userError(ErrorLevel.MEDIUM, "There was an error updating the metadata for "+getName(), ioe);
-        }
+        metadata.load();
 
-        return false;
+        return !metadata.hasErrors();
     }
 
     /**
@@ -532,7 +471,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return True if the test passes, false otherwise
      */
     protected boolean checkOS(final String desired, final String actualName, final String actualVersion, final String actualArch) {
-        if (desired.isEmpty()) {
+        if (desired == null || desired.isEmpty()) {
             return true;
         }
 
@@ -552,30 +491,6 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         return true;
     }
 
-    /**
-     * Checks to see if the UI requirements of the plugin are satisfied.
-     * If the desired string is empty, the test passes.
-     * Otherwise it is used as a regular expressions against the package of the
-     * UIController to test what UI is currently in use.
-     * On failure, the requirementsError field will contain a user-friendly
-     * error message.
-     *
-     * @param desired The desired UI requirements
-     * @param actual The package of the current UI in use.
-     * @return True if the test passes, false otherwise
-     */
-    protected boolean checkUI(final String desired, final String actual) {
-        if (desired.isEmpty()) {
-            return true;
-        }
-
-        if (!actual.toLowerCase().matches(desired)) {
-            requirementsError = "Invalid UI. (Wanted: '" + desired + "', actual: '" + actual + "')";
-            return false;
-        }
-        return true;
-    }
-
     /**
      * Checks to see if the file requirements of the plugin are satisfied.
      * If the desired string is empty, the test passes.
@@ -589,7 +504,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return True if the test passes, false otherwise
      */
     protected boolean checkFiles(final String desired) {
-        if (desired.isEmpty()) {
+        if (desired == null || desired.isEmpty()) {
             return true;
         }
 
@@ -624,7 +539,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return True if the test passes, false otherwise
      */
     protected boolean checkPlugins(final String desired) {
-        if (desired.isEmpty()) {
+        if (desired == null || desired.isEmpty()) {
             return true;
         }
 
@@ -665,15 +580,10 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return true/false (Actual error if false is in the requirementsError field)
      */
     public boolean checkRequirements(final boolean preliminary) {
-        if (metaData == null) {
-            // No meta-data, so no requirements.
-            return true;
-        }
-
-        if (!checkOS(getKeyValue("requires", "os", ""), System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"))
-                || !checkFiles(getKeyValue("requires", "files", ""))
-                || (!preliminary && !checkPlugins(getKeyValue("requires", "plugins", "")))
-                || (!preliminary && !checkServices(metaData.getFlatDomain("required-services")))) {
+        if (!checkOS(metadata.getRequirements().get("os"), System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"))
+                || !checkFiles(metadata.getRequirements().get("files"))
+                || (!preliminary && !checkPlugins(metadata.getRequirements().get("plugins")))
+                || (!preliminary && !checkServices(metadata.getRequiredServices()))) {
             return false;
         }
 
@@ -687,8 +597,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @param services Required services
      * @return true if all services are available
      */
-    private boolean checkServices(final List<String> services) {
-        if (services == null || services.size() < 1) {
+    private boolean checkServices(final Collection<String> services) {
+        if (services == null || services.isEmpty()) {
             return true;
         }
 
@@ -763,7 +673,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * otherwise
      */
     public boolean isLoaded() {
-        return (plugin != null) && !tempLoaded;
+        return plugin != null && !tempLoaded;
     }
 
     /**
@@ -773,23 +683,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * otherwise
      */
     public boolean isTempLoaded() {
-        return (plugin != null) && tempLoaded;
-    }
-
-    /**
-     * Load entire plugin.
-     * This loads all files in the jar immediately.
-     *
-     * @throws PluginException if there is an error with the resourcemanager
-     */
-    private void loadEntirePlugin() throws PluginException {
-        // Load the main "Plugin" from the jar
-        loadPlugin();
-
-        // Now load all the rest.
-        for (String classname : myClasses) {
-            loadClass(classname);
-        }
+        return plugin != null && tempLoaded;
     }
 
     /**
@@ -804,7 +698,12 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Load any required plugins
      */
     public void loadRequired() {
-        final String required = getKeyValue("requires", "plugins", "");
+        final String required = metadata.getRequirements().get("plugins");
+
+        if (required == null) {
+            return;
+        }
+
         for (String pluginName : required.split(",")) {
             final String[] data = pluginName.split(":");
             if (!data[0].trim().isEmpty()) {
@@ -826,8 +725,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Load the plugin files.
      */
     public void loadPlugin() {
-        if (isLoaded() || metaData == null || isLoading) {
-            lastError = "Not Loading: (" + isLoaded() + "||" + (metaData == null) + "||" + isLoading + ")";
+        if (isLoaded() || isLoading) {
+            lastError = "Not Loading: (" + isLoaded() + "||" + isLoading + ")";
             return;
         }
 
@@ -912,10 +811,10 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     private void loadClass(final String classname) {
         try {
             if (classloader == null) {
-                if (getKeyValue("requires", "parent", "").isEmpty()) {
+                if (metadata.getParent() == null) {
                     classloader = new PluginClassLoader(this);
                 } else {
-                    final String parentName = getKeyValue("requires", "parent", "");
+                    final String parentName = metadata.getParent();
                     final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName(parentName);
                     if (pi == null) {
                         lastError = "Required parent '" + parentName + "' was not found";
@@ -1027,12 +926,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return true if plugin can be unloaded
      */
     public boolean isUnloadable() {
-        if (isPersistent() || (!isLoaded() && !isTempLoaded())) {
-            return false;
-        } else {
-            final String unloadable = getKeyValue("metadata", "unloadable", "true");
-            return unloadable.equalsIgnoreCase("yes") || unloadable.equalsIgnoreCase("true") || unloadable.equalsIgnoreCase("1");
-        }
+        return !isPersistent() && (isTempLoaded() || isLoaded())
+                && metadata.isUnloadable();
     }
 
     /**
@@ -1048,8 +943,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                     child.unloadPlugin(true);
                 }
                 // Delete ourself as a child of our parent.
-                if (!parentUnloading && !getKeyValue("requires", "parent", "").isEmpty()) {
-                    final String parentName = getKeyValue("requires", "parent", "");
+                final String parentName = metadata.getParent();
+                if (!parentUnloading && parentName != null) {
                     final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName(parentName);
                     if (pi != null) {
                         pi.delChild(this);
@@ -1103,30 +998,15 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         return myClasses;
     }
 
-    /**
-     * Get the value of the given key from the given keysection, or fallback.
-     *
-     * @param section Section to look in
-     * @param key Key to check
-     * @param fallback Value to use if key doesn't exist.
-     * @return Value of the key in the keysection, or the fallback if not present
-     */
-    public String getKeyValue(final String section, final String key, final String fallback) {
-        if (metaData != null && metaData.isKeyDomain(section)) {
-            final Map<String, String> keysection = metaData.getKeyDomain(section);
-            return keysection.containsKey(key) ? keysection.get(key) : fallback;
-        }
-
-        return fallback;
-    }
-
     /**
      * Get the main Class
      *
      * @return Main Class to begin loading.
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public String getMainClass() {
-        return getKeyValue("metadata", "mainclass", "");
+        return metadata.getMainClass();
     }
 
     /**
@@ -1151,18 +1031,22 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Get the plugin friendly version
      *
      * @return Plugin friendly Version
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public String getFriendlyVersion() {
-        return getKeyValue("version", "friendly", String.valueOf(getVersion()));
+        return metadata.getFriendlyVersion();
     }
 
     /**
      * Get the plugin version
      *
      * @return Plugin Version
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public Version getVersion() {
-        return new Version(getKeyValue("version", "number", "0"));
+        return metadata.getVersion();
     }
 
     /**
@@ -1175,13 +1059,11 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return Addon Site ID number
      *         -1 If not present
      *         -2 If non-integer
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public int getAddonID() {
-        try {
-            return Integer.parseInt(getKeyValue("updates", "id", "-1"));
-        } catch (NumberFormatException nfe) {
-            return -2;
-        }
+        return metadata.getUpdaterId();
     }
 
     /**
@@ -1190,12 +1072,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return true if persistent, else false
      */
     public boolean isPersistent() {
-        if (metaData != null && metaData.isFlatDomain("persistent")) {
-            final List<String> items = metaData.getFlatDomain("persistent");
-            return items.contains("*");
-        }
-
-        return false;
+        return metadata.getPersistentClasses().contains("*");
     }
 
     /**
@@ -1204,12 +1081,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return true if this plugin contains any persistent classes, else false
      */
     public boolean hasPersistent() {
-        if (metaData != null && metaData.isFlatDomain("persistent")) {
-            final List<String> items = metaData.getFlatDomain("persistent");
-            return !items.isEmpty();
-        }
-
-        return false;
+        return !metadata.getPersistentClasses().isEmpty();
     }
 
     /**
@@ -1217,8 +1089,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      *
      * @return List of all persistent classes in this plugin
      */
-    public List<String> getPersistentClasses() {
-        final List<String> result = new ArrayList<String>();
+    public Collection<String> getPersistentClasses() {
+        final Collection<String> result = new ArrayList<String>();
 
         if (isPersistent()) {
             try {
@@ -1232,11 +1104,9 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             } catch (IOException e) {
                 // Jar no longer exists?
             }
-        } else if (metaData != null && metaData.isFlatDomain("persistent")) {
-            return metaData.getFlatDomain("persistent");
         }
 
-        return result;
+        return metadata.getPersistentClasses();
     }
 
     /**
@@ -1248,11 +1118,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     public boolean isPersistent(final String classname) {
         if (isPersistent()) {
             return true;
-        } else if (metaData != null && metaData.isFlatDomain("persistent")) {
-            final List<String> items = metaData.getFlatDomain("persistent");
-            return items.contains(classname);
         } else {
-            return false;
+            return metadata.getPersistentClasses().contains(classname);
         }
     }
 
@@ -1293,18 +1160,22 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Get the plugin Author.
      *
      * @return Author of plugin
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public String getAuthor() {
-        return getKeyValue("metadata", "author", "");
+        return metadata.getAuthor();
     }
 
     /**
      * Get the plugin Description.
      *
      * @return Description of plugin
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public String getDescription() {
-        return getKeyValue("metadata", "description", "");
+        return metadata.getDescription();
     }
 
     /**
@@ -1313,8 +1184,9 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return minimum dmdirc version required to run the plugin.
      */
     public String getMinVersion() {
-        final String requiredVersion = getKeyValue("requires", "dmdirc", "");
-        if (!requiredVersion.isEmpty()) {
+        final String requiredVersion = metadata.getRequirements().get("dmdirc");
+
+        if (requiredVersion != null) {
             final String[] bits = requiredVersion.split("-");
             return bits[0];
         }
@@ -1328,8 +1200,9 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @return optional maximum dmdirc version on which this plugin can run
      */
     public String getMaxVersion() {
-        final String requiredVersion = getKeyValue("requires", "dmdirc", "");
-        if (!requiredVersion.isEmpty()) {
+        final String requiredVersion = metadata.getRequirements().get("dmdirc");
+
+        if (requiredVersion != null) {
             final String[] bits = requiredVersion.split("-");
             if (bits.length > 1) {
                 return bits[1];
@@ -1343,18 +1216,22 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Get the name of the plugin. (Used to identify the plugin)
      *
      * @return Name of plugin
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public String getName() {
-        return getKeyValue("metadata", "name", "");
+        return metadata.getName();
     }
 
     /**
      * Get the nice name of the plugin. (Displayed to users)
      *
      * @return Nice Name of plugin
+     * @deprecated Retrieve this from {@link PluginMetaData} directly
      */
+    @Deprecated
     public String getNiceName() {
-        return getKeyValue("metadata", "nicename", getName());
+        return metadata.getFriendlyName();
     }
 
     /**
@@ -1367,16 +1244,6 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         return getNiceName() + " - " + filename;
     }
 
-    /**
-     * Does this plugin want all its classes loaded?
-     *
-     * @return true/false if loadall=true || loadall=yes
-     */
-    public boolean loadAll() {
-        final String loadAll = getKeyValue("metadata", "loadall", "no");
-        return loadAll.equalsIgnoreCase("true") || loadAll.equalsIgnoreCase("yes");
-    }
-
     /** {@inheritDoc} */
     @Override
     public int compareTo(final PluginInfo o) {
@@ -1390,24 +1257,22 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         exports.clear();
 
         // Get exports provided by this plugin
-        final List<String> exportsList = metaData.getFlatDomain("exports");
-        if (exportsList != null) {
-            for (String item : exportsList) {
-                final String[] bits = item.split(" ");
-                if (bits.length > 2) {
-                    final String methodName = bits[0];
-                    final String methodClass = bits[2];
-                    final String serviceName = (bits.length > 4) ? bits[4] : bits[0];
-
-                    // Add a provides for this
-                    final Service service = PluginManager.getPluginManager().getService("export", serviceName, true);
-                    synchronized (provides) {
-                        service.addProvider(this);
-                        provides.add(service);
-                    }
-                    // Add is as an export
-                    exports.put(serviceName, new ExportInfo(methodName, methodClass, this));
+        final Collection<String> exportsList = metadata.getExports();
+        for (String item : exportsList) {
+            final String[] bits = item.split(" ");
+            if (bits.length > 2) {
+                final String methodName = bits[0];
+                final String methodClass = bits[2];
+                final String serviceName = (bits.length > 4) ? bits[4] : bits[0];
+
+                // Add a provides for this
+                final Service service = PluginManager.getPluginManager().getService("export", serviceName, true);
+                synchronized (provides) {
+                    service.addProvider(this);
+                    provides.add(service);
                 }
+                // Add is as an export
+                exports.put(serviceName, new ExportInfo(methodName, methodClass, this));
             }
         }
     }

src/com/dmdirc/plugins/PluginManager.java

@@ -37,6 +37,7 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.HashMap;
@@ -261,7 +262,9 @@ public class PluginManager implements ActionListener {
         }
 
         try {
-            final PluginInfo pluginInfo = new PluginInfo(new URL("file:" + getDirectory() + filename));
+            final PluginMetaData metadata = new PluginMetaData(new URL("jar:file://" + getDirectory() + filename + "!/META-INF/plugin.config"));
+            metadata.load();
+            final PluginInfo pluginInfo = new PluginInfo(metadata, new URL("file:" + getDirectory() + filename));
             final PluginInfo existing = getPluginInfoByName(pluginInfo.getName());
             if (existing != null) {
                 Logger.userError(ErrorLevel.MEDIUM, "Duplicate Plugin detected, Ignoring. (" + filename + " is the same as " + existing.getFilename() + ")");
@@ -418,19 +421,18 @@ public class PluginManager implements ActionListener {
         while (!dirs.isEmpty()) {
             final File dir = dirs.pop();
             if (dir.isDirectory()) {
-                for (File file : dir.listFiles()) {
-                    dirs.add(file);
-                }
+                dirs.addAll(Arrays.asList(dir.listFiles()));
             } else if (dir.isFile() && dir.getName().endsWith(".jar")) {
-                String target = dir.getPath();
-
                 // Remove the plugin dir
-                target = target.substring(myDir.length(), target.length());
+                final String target = dir.getPath().substring(myDir.length());
+
                 if (addPlugins) {
                     addPlugin(target);
                 } else {
                     try {
-                        final PluginInfo pi = new PluginInfo(new URL("file:" + getDirectory() + target), false);
+                        final PluginMetaData metadata = new PluginMetaData(new URL("jar:file://" + getDirectory() + target + "!/META-INF/plugin.config"));
+                        metadata.load();
+                        final PluginInfo pi = new PluginInfo(metadata, new URL("file:" + getDirectory() + target), false);
                         res.put(target, pi);
                     } catch (MalformedURLException mue) {
                         Logger.userError(ErrorLevel.MEDIUM, "Error creating URL for plugin " + target + ": " + mue.getMessage(), mue);

src/com/dmdirc/plugins/PluginMetaData.java

@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.plugins;
+
+import com.dmdirc.updater.Version;
+import com.dmdirc.util.ConfigFile;
+import com.dmdirc.util.InvalidConfigFileException;
+import com.dmdirc.util.StreamUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Reads metadata for a plugin. Plugin metadata is defined in a DMDirc
+ * {@link ConfigFile} which is typically found inside plugin jars as
+ * <code>META-INF/plugin.config</code>. The following sections are read from
+ * the config file:
+ * <ul>
+ *  <li><code>metadata</code> - generic plugin information. See {@link #readMetaData(java.util.Map)}.
+ *  <li><code>version</code> - versioning information. See {@link #readVersion(java.util.Map)}.
+ *  <li><code>defaults</code> - optional default settings to add to the configuration
+ *  <li><code>formatters</code> - optional default formatters to add to the configuration
+ *  <li><code>icons</code> - optional default icons to add to the configuration
+ *  <li><code>requires</code> - optional generic requirements. See {@link #readRequirements(java.util.Map, java.util.List)}.
+ *  <li><code>required-services</code> - optional service requirements. See {@link #readRequirements(java.util.Map, java.util.List)}.
+ *  <li><code>updates</code> - optional information for automated updates. See {@link #readUpdates(java.util.Map)}.
+ *  <li><code>provides</code> - optional list of services provided by the plugin. See {@link #readProvides(java.util.List)}.
+ *  <li><code>exports</code> - optional list of methods exported by the plugin. See {@link #readExports(java.util.List)}.
+ *  <li><code>persistent</code> - optional list of persistent classes within the plugin. See {@link #readPersistent(java.util.List)}.
+ * </ul>
+ * A collection of errors that occurred when attempting to read the metadata
+ * is available via the {@link #getErrors()} method.
+ *
+ * @since 0.6.6
+ */
+public class PluginMetaData {
+
+    /** A collection of errors that occurred when reading or validating the data. */
+    private final Collection<String> errors
+            = new ArrayList<String>();
+
+    /** Default settings defined in the plugin metadata. */
+    private final Map<String, String> defaultSettings
+            = new HashMap<String, String>();
+
+    /** Formatters defined in the plugin metadata. */
+    private final Map<String, String> formatters
+            = new HashMap<String, String>();
+
+    /** Icons defined in the plugin metadata. */
+    private final Map<String, String> icons
+            = new HashMap<String, String>();
+
+    /** A set of requirements made by the plugin. */
+    private final Map<String, String> requirements
+            = new HashMap<String, String>();
+
+    /** A list of required services. */
+    private final Collection<String> requiredServices
+            = new ArrayList<String>();
+
+    /** Services provided by this plugin. */
+    private final Collection<String> services
+            = new ArrayList<String>();
+
+    /** Methods exported by this plugin. */
+    private final Collection<String> exports
+            = new ArrayList<String>();
+
+    /** Persistent classes in this plugin. */
+    private final Collection<String> persistentClasses
+            = new ArrayList<String>();
+
+    /** The name of the parent plugin, if any. */
+    private String parent;
+
+    /** The name of the main class, if any. */
+    private String mainClass;
+
+    /** The friendly version name/number. */
+    private String friendlyVersion;
+
+    /** The version of the plugin. */
+    private Version version;
+
+    /** The ID to use with the updater system, if any. */
+    private int updaterId;
+
+    /** The author-supplied friendly name of the plugin. */
+    private String friendlyName;
+
+    /** The internal name of the plugin. */
+    private String name;
+
+    /** The name of the author of the plugin. */
+    private String author;
+
+    /** The author-supplied description of the plugin. */
+    private String description;
+
+    /** Whether or not the plugin is marked as unloadable. */
+    private boolean unloadable;
+
+    /** The URL to load the metadata from. */
+    private final URL url;
+
+    /**
+     * Creates a new meta data reader for a config file at the specified URL.
+     *
+     * @param url The URL to load the config file from
+     */
+    public PluginMetaData(final URL url) {
+        this.url = url;
+    }
+
+    /**
+     * Loads plugin metadata from a config file.
+     */
+    public void load() {
+        errors.clear();
+        InputStream stream = null;
+
+        try {
+            stream = url.openStream();
+            final ConfigFile configFile = new ConfigFile(stream);
+            configFile.read();
+            readMetaData(configFile.getKeyDomain("metadata"));
+            readVersion(configFile.getKeyDomain("version"));
+            readUpdates(configFile.getKeyDomain("updates"));
+            readSettings(defaultSettings, configFile.getKeyDomain("defaults"));
+            readSettings(formatters, configFile.getKeyDomain("formatters"));
+            readSettings(icons, configFile.getKeyDomain("icons"));
+            readRequirements(configFile.getKeyDomain("requires"),
+                    configFile.getFlatDomain("required-services"));
+            readProvides(configFile.getFlatDomain("provides"));
+            readPersistent(configFile.getFlatDomain("persistent"));
+            readExports(configFile.getFlatDomain("exports"));
+        } catch (IOException ex) {
+            errors.add("Unable to read config file: " + ex.getMessage());
+            StreamUtil.close(stream);
+        } catch (InvalidConfigFileException ex) {
+            errors.add("Unable to read config file: " + ex.getMessage());
+            StreamUtil.close(stream);
+        }
+    }
+
+    // <editor-fold desc="Read methods">
+
+    /**
+     * Reads information from the metadata section of the config file.
+     * The following entries are read from the metadata section:
+     * <ul>
+     *  <li><code>mainclass</code> - full classname of the main class to load
+     *  <li><code>author</code> - name of the author
+     *  <li><code>description</code> - user-friendly description
+     *  <li><code>name</code> - internal short name
+     *  <li><code>nicename</code> - user-friendly name
+     *  <li><code>unloadable</code> - boolean indicating if the plugin can
+     *  be unloaded. Defaults to true if not specified.
+     * </ul>
+     * It is recommended that the <code>author</code> field should take the
+     * form of "<code>name &lt;email@address&gt;</code>", although this is not
+     * enforced.
+     * <p>
+     * The short name must be a single word (i.e., no spaces) that uniquely
+     * identifies the plugin. This is typically the same as the plugin's jar
+     * name.
+     *
+     * @param data A map of config entry names to values
+     */
+    protected void readMetaData(final Map<String, String> data) {
+        if (data == null || data.isEmpty()) {
+            errors.add("'metadata' section not specified or empty");
+            return;
+        }
+
+        mainClass = data.get("mainclass");
+        author = data.get("author");
+        description = data.get("description");
+        name = data.get("name");
+        friendlyName = data.get("nicename");
+        unloadable = !data.containsKey("unloadable")
+                || !data.get("unloadable").matches("(?i)^true|1|yes$");
+    }
+
+    /**
+     * Reads information from the version section of the config file.
+     * The following entries are read from the version section:
+     * <ul>
+     *  <li><code>friendly</code> - a user-friendly version string
+     *  <li><code>number</code> - a DMDirc {@link Version} 'number'
+     * </ul>
+     * If the 'number' field is not specified it will be defaulted to a value
+     * of "0".
+     *
+     * @param data A map of config entry names to values
+     */
+    protected void readVersion(final Map<String, String> data) {
+        if (data == null || data.isEmpty()) {
+            errors.add("'version' section not specified or empty");
+            return;
+        }
+
+        friendlyVersion = data.get("friendly");
+        version = new Version(data.containsKey("number") ? data.get("number") : "0");
+    }
+
+    /**
+     * Reads information from the updates section of the config file.
+     * The following entries are read from the updates section:
+     * <ul>
+     *  <li><code>id</code> - a numeric ID for the plugin's entry in the DMDirc
+     *  updater system
+     * </ul>
+     *
+     * @param data A map of config entry names to values
+     */
+    protected void readUpdates(final Map<String, String> data) {
+        updaterId = -1;
+
+        if (data != null && data.containsKey("id")) {
+            try {
+                updaterId = Integer.parseInt(data.get("id"));
+            } catch (NumberFormatException ex) {
+                errors.add("Invalid updater id specified: " + data.get("id"));
+            }
+        }
+    }
+
+    /**
+     * Copies the specified settings (defaults, formatters, icons, etc) into
+     * the specified property.
+     *
+     * @param target The map to add settings to
+     * @param data The settings specified in the metadata
+     */
+    protected void readSettings(final Map<String, String> target,
+            final Map<String, String> data) {
+        target.clear();
+
+        if (data != null) {
+            target.putAll(data);
+        }
+    }
+
+    /**
+     * Reads the requirements and required-services sections of the config file.
+     * The requires section is a mapping of a requirement type to a constraint.
+     * No validation is performed on this section, but the following types
+     * are standard:
+     * <ul>
+     *  <li><code>parent</code> - internal name of a single parent plugin,
+     *  e.g. 'ui_swing'.
+     *  <li><code>plugins</code> - a comma-separated list of plugins that are
+     *  required. Plugins are specified by their internal names, and each entry
+     *  may include an optional minimum and maximum version separated by colons,
+     *  e.g. 'ui_swing' or 'plugin1,plugin2:0.6.3,plugin3:0.1:0.2'.
+     *  <li><code>os</code> - one to three colon-separated regular expressions
+     *  to match the OS name, version and architecture, e.g. '.*win.*'.
+     *  <li><code>files</code> - a comma-separated list of files that must
+     *  exist. Each comma-separated value may contain multiple alternatives
+     *  separated by a pipe, e.g. '/bin/bash' or '/bin/bash|/bin/dash,/bin/foo'.
+     *  <li><code>dmdirc</code> - the minimum and maximum DMDirc versions,
+     *  separated by a '-', e.g. '0.6.3', '0.6.3-0.6.4', '-0.6.4'.
+     * </ul>
+     * The required-services section is a flat domain which lists services that
+     * the plugin requires. No validation is performed on these values, but
+     * each service should consist of a name and a type. The magic string
+     * <code>any</code> may be specified in place of a name (e.g. 'any ui'
+     * instead of 'swing ui').
+     *
+     * @param data The specified requirements
+     * @param requiredServices The specified required services
+     */
+    protected void readRequirements(final Map<String, String> data,
+            final List<String> requiredServices) {
+        readSettings(requirements, data);
+
+        parent = requirements.get("parent");
+
+        this.requiredServices.clear();
+
+        if (requiredServices != null) {
+            this.requiredServices.addAll(requiredServices);
+        }
+    }
+
+    /**
+     * Reads the provides section of the config file. This is a flat domain
+     * containing a list of services provided by the plugin. Services are
+     * specified as a space-separated name and type pair, e.g. 'swing ui' or
+     * 'logging command'.
+     *
+     * @param services The services to be added
+     */
+    protected void readProvides(final List<String> services) {
+        this.services.clear();
+
+        if (services != null) {
+            this.services.addAll(services);
+        }
+    }
+
+    /**
+     * Reads the persistent section of the config file. This is a flat domain
+     * containing a list of classes which should be made persistent (i.e.,
+     * loaded globally and not unloaded).
+     *
+     * @param classes The services to be added
+     */
+    protected void readPersistent(final List<String> classes) {
+        this.persistentClasses.clear();
+
+        if (classes != null) {
+            this.persistentClasses.addAll(classes);
+        }
+    }
+
+    /**
+     * Reads the exports section of the config file. This is a flat domain
+     * containing a list of exported methods in the format
+     * <code>&lt;methodName&gt; in &lt;className&gt; [as &lt;methodAlias&gt;]</code>,
+     * e.g. 'getFoo in my.class.name as getParser' or 'getParser in my.class.name'.
+     *
+     * @param exports The exported methods for this plugin
+     */
+    protected void readExports(final List<String> exports) {
+        this.exports.clear();
+
+        if (exports != null) {
+            this.exports.addAll(exports);
+        }
+    }
+
+    // </editor-fold>
+
+    // <editor-fold defaultstate="collapsed" desc="Getters">
+
+    /**
+     * Retrieves a collection of errors that occurred while trying to read
+     * the metadata.
+     *
+     * @return A (possibly empty) collection of errors that occurred.
+     */
+    public Collection<String> getErrors() {
+        return Collections.unmodifiableCollection(errors);
+    }
+
+    /**
+     * Determines whether or not there were errors encountered while trying to
+     * read the metadata.
+     *
+     * @return True if there are errors, false otherwise
+     * @see #getErrors()
+     */
+    public boolean hasErrors() {
+        return !errors.isEmpty();
+    }
+
+    /**
+     * Retrieves the author information for the plugin.
+     *
+     * @return The plugin's specified author
+     */
+    public String getAuthor() {
+        return author;
+    }
+
+    /**
+     * Retrieves a user-friendly description of the plugin.
+     *
+     * @return The plugin's user-friendly description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Retrieves a user-friendly name of the plugin.
+     *
+     * @return This plugin's user-friendly name
+     */
+    public String getFriendlyName() {
+        return friendlyName;
+    }
+
+    /**
+     * Retrieves the specified main class of the plugin.
+     *
+     * @return This plugin's main class
+     */
+    public String getMainClass() {
+        return mainClass;
+    }
+
+    /**
+     * Retrieves the internal short name of this plugin.
+     *
+     * @return This plugin's internal short name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Retrieves the user-friendly version of this plugin.
+     *
+     * @return This plugin's user-friendly version
+     */
+    public String getFriendlyVersion() {
+        return friendlyVersion;
+    }
+
+    /**
+     * Determines whether the plugin is specified as unloadable or not.
+     *
+     * @return True if the plugin is unloadable, false otherwise
+     */
+    public boolean isUnloadable() {
+        return unloadable;
+    }
+
+    /**
+     * Retrieves the version of this plugin
+     *
+     * @return This plugin's version
+     */
+    public Version getVersion() {
+        return version;
+    }
+
+    /**
+     * Retrieves the updater ID of this plugin.
+     *
+     * @return This plugin's updater ID, or -1 if not specified
+     */
+    public int getUpdaterId() {
+        return updaterId;
+    }
+
+    /**
+     * Returns a map of default settings supplied by this plugin.
+     *
+     * @return A map of setting keys to values
+     */
+    public Map<String, String> getDefaultSettings() {
+        return Collections.unmodifiableMap(defaultSettings);
+    }
+
+    /**
+     * Returns a map of default formatters supplied by this plugin.
+     *
+     * @return A map of formatter names to values
+     */
+    public Map<String, String> getFormatters() {
+        return Collections.unmodifiableMap(formatters);
+    }
+
+    /**
+     * Returns a map of default icons supplied by this plugin.
+     *
+     * @return A map of icon names to values
+     */
+    public Map<String, String> getIcons() {
+        return Collections.unmodifiableMap(icons);
+    }
+
+    /**
+     * Retrieves this plugin's parent, if specified.
+     *
+     * @return The desired parent plugin, or null if none specified
+     */
+    public String getParent() {
+        return parent;
+    }
+
+    /**
+     * Retrieves the collection of required services.
+     *
+     * @see #readRequirements(java.util.Map, java.util.List)
+     * @return A collection of plugin-defined service requirements
+     */
+    public Collection<String> getRequiredServices() {
+        return Collections.unmodifiableCollection(requiredServices);
+    }
+
+    /**
+     * Retrieves the collection of plugin requirements.
+     *
+     * @see #readRequirements(java.util.Map, java.util.List)
+     * @return A collection of plugin-defined requirements
+     */
+    public Map<String, String> getRequirements() {
+        return Collections.unmodifiableMap(requirements);
+    }
+
+    /**
+     * Retrieves the collection of services exported by the plugin.
+     *
+     * @return The services which the plugin specifies it provides
+     */
+    public Collection<String> getServices() {
+        return Collections.unmodifiableCollection(services);
+    }
+
+    /**
+     * Retrieves the collection of methods exported by the plugin.
+     *
+     * @return The methods exported by the plugin
+     */
+    public Collection<String> getExports() {
+        return Collections.unmodifiableCollection(exports);
+    }
+
+    /**
+     * Retrieves the set of classes marked as persistent for this plugin.
+     *
+     * @return The classes of this plugin marked as persistent
+     */
+    public Collection<String> getPersistentClasses() {
+        return Collections.unmodifiableCollection(persistentClasses);
+    }
+
+    // </editor-fold>
+
+}

test/com/dmdirc/plugins/PluginInfoTest.java

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.plugins;
-
-import java.io.File;
-import java.io.IOException;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class PluginInfoTest {
-
-    private PluginInfo pi;
-
-    @Test
-    public void testCheckMinimum() throws PluginException {
-        try {
-            pi = new PluginInfo(new URL("file:///dev/null"), false);
-
-            assertTrue(pi.checkMinimumVersion("5", 6));
-            assertTrue(pi.checkMinimumVersion("5", 5));
-            assertTrue(pi.checkMinimumVersion("0", 17));
-            assertTrue(pi.checkMinimumVersion("100", 0));
-            assertTrue(pi.checkMinimumVersion("0", 0));
-            assertFalse(pi.checkMinimumVersion("abc", 6));
-            assertFalse(pi.checkMinimumVersion("7", 6));
-        } catch (MalformedURLException mue) { }
-    }
-
-    @Test
-    public void testCheckMaximim() throws PluginException {
-        try {
-            pi = new PluginInfo(new URL("file:///dev/null"), false);
-
-            assertTrue(pi.checkMaximumVersion("6", 6));
-            assertTrue(pi.checkMaximumVersion("7", 6));
-            assertTrue(pi.checkMaximumVersion("0", 6));
-            assertTrue(pi.checkMaximumVersion("6", 0));
-            assertTrue(pi.checkMaximumVersion("0", 0));
-            assertTrue(pi.checkMaximumVersion("", 17));
-            assertFalse(pi.checkMaximumVersion("abc", 6));
-            assertFalse(pi.checkMaximumVersion("7", 10));
-        } catch (MalformedURLException mue) { }
-    }
-
-    @Test
-    public void testOS() throws PluginException {
-        try {
-            pi = new PluginInfo(new URL("file:///dev/null"), false);
-
-            assertTrue(pi.checkOS("windows", "windows", "xp", "x86"));
-            assertFalse(pi.checkOS("windows", "linux", "2.6.2.11", "x86"));
-            assertTrue(pi.checkOS("windows:xp|98|3\\.1", "windows", "xp", "x86"));
-            assertFalse(pi.checkOS("windows:xp|98|3\\.1", "windows", "vista", "x86"));
-            assertFalse(pi.checkOS("windows:xp|98|3\\.1", "linux", "2.6.2.11", "x86"));
-            assertTrue(pi.checkOS("windows:xp|98|3\\.1:.86", "windows", "xp", "x86"));
-            assertFalse(pi.checkOS("windows:xp|98|3\\.1:.86", "windows", "xp", "mips"));
-            assertFalse(pi.checkOS("windows:xp|98|3\\.1:.86", "windows", "vista", "x86"));
-            assertFalse(pi.checkOS("windows:xp|98|3\\.1:.86", "linux", "2.6.2.11", "x86"));
-        } catch (MalformedURLException mue) { }
-    }
-
-    @Test
-    public void testLoad() throws PluginException {
-        PluginInfo pi = new PluginInfo(getClass().getResource("testplugin.jar"));
-        assertEquals("Author <em@il>", pi.getAuthor());
-        assertEquals("Friendly", pi.getFriendlyVersion());
-        assertEquals("Description goes here", pi.getDescription());
-        assertEquals("randomname", pi.getName());
-        assertEquals("Friendly name", pi.getNiceName());
-        assertEquals("3", pi.getVersion().toString());
-    }
-
-    @Test
-    public void testUpdate() throws PluginException, IOException {
-        final File dir = new File(File.createTempFile("dmdirc-plugin-test", null).getParentFile(),
-                "dmdirc-plugin-test-folder");
-        final File pluginDir = new File(dir, "plugins");
-
-        dir.deleteOnExit();
-        pluginDir.mkdirs();
-
-        final File target = new File(pluginDir, "test.jar");
-
-        target.createNewFile();
-        new File(pluginDir, "test.jar.update").createNewFile();
-
-        new PluginInfo(target.toURI().toURL(), false);
-
-        assertTrue(new File(pluginDir, "test.jar").exists());
-        assertFalse(new File(pluginDir, "test.jar.update").exists());
-    }
-
-}