Overhauled plugins system. (Fixes issue 479)

Fixed issue 495 (Configure plugins menu doesn't disable untill mouse over)


git-svn-id: http://svn.dmdirc.com/trunk@2614 00569f92-eb28-0410-84fd-f71c24880f

createPluginJar.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+# This script will create a plugin jar file for a given plugin.
+
+if [ "${1}" = "" -o "${2}" = "" ]; then
+	echo "Usage Example: ${0} com.dmdirc.addons.windowstatus WindowStatusPlugin"
+	echo "The above would create WindowStatusPlugin.jar in the plugins/ folder of the current dir"
+	exit;
+fi
+
+pluginname=${1}
+foldername=${pluginname//.//}
+
+echo "Creating ${2}.jar for ${pluginname} (${foldername})"
+
+if [ ! -e src/${foldername}/plugin.info ]; then
+	echo "no plugin.info found";
+	exit 0;
+fi
+
+echo "Building dmdirc"
+
+echo "looking for classes"
+srcdir=${PWD}
+TMPDIR=`mktemp -d`
+echo "Using temp dir: ${TMPDIR}"
+cd $TMPDIR
+
+mkdir META-INF
+cp ${srcdir}/src/${foldername}/plugin.info META-INF/
+foo=`echo $foldername | sed -e 's/\/[^\/]*$//g'`
+mkdir -p $foo
+cd ${foo}
+ln -s ${srcdir}/build/classes/${foldername} .
+cd $TMPDIR
+mkdir -p ${srcdir}/plugins/
+rm -Rf ${srcdir}/plugins/${2}.jar
+jar -cvf ${srcdir}/src/${foldername}/${2}.jar META-INF/plugin.info
+bit=""
+while [ 1 -eq 1 ]; do
+	bit=${bit}/*
+	ls ${foo}${bit}/*
+	if [ ${?} -ne 0 ]; then
+		break;
+	else
+		for thisfile in `ls -1 ${foo}${bit}/*.class`; do
+			jar -uvf ${srcdir}/src/${foldername}/${2}.jar ${thisfile}
+		done
+	fi
+done
+
+echo "done";

src/com/dmdirc/actions/CoreActionType.java

@@ -174,11 +174,7 @@ public enum CoreActionType implements ActionType {
     /** Plugin loaded. */
     PLUGIN_LOADED(PluginEvents.PLUGIN_EVENT, "Plugin loaded"),
     /** Plugin unloaded. */
-    PLUGIN_UNLOADED(PluginEvents.PLUGIN_EVENT, "Plugin unloaded"),
-    /** Plugin activated. */
-    PLUGIN_ACTIVATED(PluginEvents.PLUGIN_EVENT, "Plugin activated"),
-    /** Plugin deactivated. */
-    PLUGIN_DEACTIVATED(PluginEvents.PLUGIN_EVENT, "Plugin deactivated");
+    PLUGIN_UNLOADED(PluginEvents.PLUGIN_EVENT, "Plugin unloaded");
     
     /** The type of this action. */
     private final ActionMetaType type;

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.actions.ActionMetaType;
-import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 
 /**
  * Defines plugin-related events.
@@ -33,7 +33,7 @@ import com.dmdirc.plugins.Plugin;
 public enum PluginEvents implements ActionMetaType {
     
     /** Plugin event type. */
-    PLUGIN_EVENT(new String[]{"plugin"}, Plugin.class);
+    PLUGIN_EVENT(new String[]{"plugin"}, PluginInfo.class);
     
     private String[] argNames;
     private Class[] argTypes;

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

@@ -41,54 +41,17 @@ public final class AudioPlugin extends Plugin {
 	
 	/**
 	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
-	 */
-	public boolean onLoad() {
-		return true;
-	}
-	
-	/**
-	 * Called when this plugin is activated.
 	 */
-	public void onActivate() {
+	public void onLoad() {
 		command = new AudioCommand();
 	}
 	
 	/**
-	 * Called when this plugin is deactivated.
+	 * Called when this plugin is Unloaded
 	 */
-	public void onDeactivate() {
+	public void onUnload() {
 		CommandManager.unregisterCommand(command);
 	}
-
-	/**
-	 * Get the plugin version.
-	 *
-	 * @return Plugin Version
-	 */
-	public String getVersion() { return "0.1"; }
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public String getAuthor() { return "Shane <shane@dmdirc.com>"; }
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public String getDescription() { return "Allows playing audio files"; }
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public String toString() { return "Audio Plugin"; }
 	
 	/**
 	 * Get SVN Version information.

src/com/dmdirc/addons/audio/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.audio.AudioPlugin
+version=2
+friendlyversion=0.2
+author=Shane <shane@dmdirc.com>
+description=Allows playing audio files
+name=audio
+nicename=Audio Plugin
+minversion=0

src/com/dmdirc/addons/compileall.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-# Quick script to recompile all plugins
-rm ./*/*.class
-rm ./*/*/*.class
-cd ../../../
-javac -Xlint:all com/dmdirc/addons/*/*.java com/dmdirc/addons/*/*/*.java

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.dcop;
 
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.commandparser.CommandManager;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -36,6 +37,8 @@ import java.util.List;
  * @author chris
  */
 public final class DcopPlugin extends Plugin {
+    /** The DcopCommand we created */
+    private DcopCommand command = null;
     
     /** Creates a new instance of DcopPlugin. */
     public DcopPlugin() {
@@ -78,34 +81,17 @@ public final class DcopPlugin extends Plugin {
     }
     
     /** {@inheritDoc}. */
-    public boolean onLoad() {
-        new DcopCommand();
-        
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public String getVersion() {
-        return "0.2";
-    }
-    
-    /** {@inheritDoc}. */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
+    public void onLoad() {
+        command = new DcopCommand();
     }
     
     /** {@inheritDoc}. */
-    public String getDescription() {
-        return "Provides commands to interface with DCOP applications";
+    public void onUnload() {
+        CommandManager.unregisterCommand(command);
     }
     
     /** {@inheritDoc}. */
     public boolean isConfigurable() {
         return false;
     }
-    
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "DCOP Plugin";
-    }
 }

src/com/dmdirc/addons/dcop/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.dcop.DcopPlugin
+version=3
+friendlyversion=0.3
+author=Chris <chris@dmdirc.com>
+description=Provides commands to interface with DCOP applications
+name=dcop
+nicename=DCOP Plugin
+minversion=0

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

@@ -45,40 +45,15 @@ public final class DNSPlugin extends Plugin {
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void onActivate() {
+    public void onLoad() {
         command = new DNSCommand();
     }
     
     /** {@inheritDoc} */
-    public void onDeactivate() {
+    public void onUnload() {
         CommandManager.unregisterCommand(command);
     }
     
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Greboid <greg@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Provides a DNS command and method to the client.";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "DNS plugin";
-    }
-    
     /**
      * Returns the IP(s) for a hostname.
      *

src/com/dmdirc/addons/dns/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.dns.DNSPlugin
+version=2
+friendlyversion=0.2
+author=Greboid <greg@dmdirc.com>
+description=Provides a DNS command and method to the client
+name=dns
+nicename=DNS Plugin
+minversion=0

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

@@ -56,10 +56,8 @@ public class IdentdPlugin extends Plugin implements EventPlugin, PreferencesInte
 	
 	/**
 	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
 	 */
-	public boolean onLoad() {
+	public void onLoad() {
 		// Set defaults
 		Properties defaults = new Properties();
 		defaults.setProperty(getDomain() + ".general.useUsername", "false");
@@ -77,14 +75,6 @@ public class IdentdPlugin extends Plugin implements EventPlugin, PreferencesInte
 		defaults.setProperty("identity.name", "Identd Plugin Defaults");
 		IdentityManager.addIdentity(new Identity(defaults));
 		
-		return true;
-	}
-	
-	
-	/**
-	 * Called when this plugin is Activated.
-	 */
-	public void onActivate() {
 		myServer = new IdentdServer(this);
 		if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
 			myServer.startServer();
@@ -92,49 +82,13 @@ public class IdentdPlugin extends Plugin implements EventPlugin, PreferencesInte
 	}
 	
 	/**
-	 * Called when this plugin is deactivated.
+	 * Called when this plugin is unloaded.
 	 */
-	public void onDeactivate() {
+	public void onUnload() {
 		myServer.stopServer();
 		servers.clear();
 	}
 	
-	/**
-	 * Get the plugin version.
-	 *
-	 * @return Plugin Version
-	 */
-	public String getVersion() {
-		return "0.1";
-	}
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public String getAuthor() {
-		return "Shane <shane@dmdirc.com>";
-	}
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public String getDescription() {
-		return "Answers ident requests from IRC servers";
-	}
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public String toString() {
-		return "Identd";
-	}
-	
 	/**
 	 * Process an event of the specified type.
 	 *

src/com/dmdirc/addons/identd/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.identd.IdentdPlugin
+version=2
+friendlyversion=0.2
+author=Shane <shane@dmdirc.com>
+description=Answers ident requests from IRC servers
+name=identd
+nicename=Identd Plugin
+minversion=0

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

@@ -74,36 +74,15 @@ public final class LagDisplayPlugin extends Plugin implements EventPlugin,
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
-        
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void onActivate() {
+    public void onLoad() {
         Main.getUI().getStatusBar().addComponent(panel);
     }
     
     /** {@inheritDoc} */
-    public void onDeactivate() {
+    public void onUnload() {
         Main.getUI().getStatusBar().removeComponent(panel);
     }
     
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.2";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Displays the server lag in the status bar";
-    }
-    
     /** {@inheritDoc} */
     public boolean isConfigurable() {
         return false;
@@ -113,11 +92,6 @@ public final class LagDisplayPlugin extends Plugin implements EventPlugin,
     public void showConfig() {
     }
     
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "Lag Displayer";
-    }
-    
     /** {@inheritDoc} */
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {

src/com/dmdirc/addons/lagdisplay/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.lagdisplay.LagDisplayPlugin
+version=3
+friendlyversion=0.3
+author=Chris <chris@dmdirc.com>
+description=Displays the server lag in the status bar
+name=laddisplay
+nicename=Lag Displayer
+minversion=0

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

@@ -27,6 +27,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -57,7 +58,12 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 	 * @param args The user supplied arguments
 	 */
 	public void execute(final InputWindow origin, final Server server, final boolean isSilent, final String... args) {
-		final Plugin gotPlugin = PluginManager.getPluginManager().getPlugin("com.dmdirc.addons.logging.LoggingPlugin");
+		final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("LoggingPlugin");
+		if (pluginInfo == null) { 
+			sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
+			return;
+		}
+		final Plugin gotPlugin = pluginInfo.getPlugin();
 		
 		if (gotPlugin == null || !(gotPlugin instanceof LoggingPlugin)) {
 			sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
@@ -70,10 +76,8 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 			if (args[0].equalsIgnoreCase("config")) {
 				plugin.showConfig();
 			} else if (args[0].equalsIgnoreCase("reload")) {
-				boolean wasActive = plugin.isActive();
-				if (PluginManager.getPluginManager().reloadPlugin("com.dmdirc.addons.logging.LoggingPlugin")) {
+				if (PluginManager.getPluginManager().reloadPlugin(pluginInfo.getFilename())) {
 					sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin reloaded.");
-					PluginManager.getPluginManager().getPlugin("com.dmdirc.addons.logging.LoggingPlugin").setActive(wasActive);
 				} else {
 					sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
 				}

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

@@ -84,10 +84,8 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 	
 	/**
 	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
 	 */
-	public boolean onLoad() {
+	public void onLoad() {
 		// Set defaults
 		Properties defaults = new Properties();
 		defaults.setProperty(MY_DOMAIN + ".general.directory", Main.getConfigDir() + "logs" + System.getProperty("file.separator"));
@@ -119,20 +117,13 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 			}
 		}
 		
-		return true;
-	}
-	
-	/**
-	 * Called when this plugin is activated.
-	 */
-	public void onActivate() {
 		command = new LoggingCommand();
 	}
 	
 	/**
-	 * Called when this plugin is deactivated.
+	 * Called when this plugin is unloaded.
 	 */
-	public void onDeactivate() {
+	public void onUnload() {
 		CommandManager.unregisterCommand(command);
 		
 		BufferedWriter file;
@@ -257,34 +248,6 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 	 */
 	public void configCancelled() { }
 	
-	/**
-	 * Get the plugin version.
-	 *
-	 * @return Plugin Version
-	 */
-	public String getVersion() { return "0.3"; }
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public String getAuthor() { return "Shane <shane@dmdirc.com>"; }
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public String getDescription() { return "Allows logging of conversations"; }
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public String toString() { return "Logging Plugin"; }
-	
 	/**
 	 * Process an event of the specified type.
 	 *

src/com/dmdirc/addons/logging/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.logging.LoggingPlugin
+version=4
+friendlyversion=0.4
+author=Shane <shane@dmdirc.com>
+description=Allows logging of conversations
+name=logging
+nicename=Logging Plugin
+minversion=0

src/com/dmdirc/addons/mediasources/dcop/DcopMediaSourcePlugin.java

@@ -57,31 +57,19 @@ public class DcopMediaSourcePlugin extends Plugin
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
-        if (Arrays.asList(PluginManager.getPluginManager().getNames()).
-                contains("com.dmdirc.addons.dcop.dcopplugin")) {
-            return true;
-        }
-        return false;
-    }
-    
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
+    public void onLoad() {
     }
     
     /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Greboid <greboid@dmdirc.com>";
+    public void onUnload() {
     }
     
     /** {@inheritDoc} */
-    public String getDescription() {
-        return "Provides DCOP media sources for the now playing plugin";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "DCOP media sources";
+    public boolean checkPrerequisites() {
+        if (Arrays.asList(PluginManager.getPluginManager().getMainClassNames()).
+                contains("com.dmdirc.addons.dcop.DcopPlugin")) {
+            return true;
+        }
+        return false;
     }
 }

src/com/dmdirc/addons/mediasources/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.mediasources.dcop.DcopMediaSourcePlugin
+version=2
+friendlyversion=0.2
+author=Greboid <greg@dmdirc.com>
+description=Provides DCOP media sources for the now playing plugin
+name=dcopmediasource
+nicename=DCOP Media Sources
+minversion=0

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

@@ -217,17 +217,16 @@ public final class NickColourPlugin extends Plugin implements EventPlugin, Prefe
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void onActivate() {
+    public void onLoad() {
         if (IdentityManager.getGlobalConfig().hasOption(DOMAIN, "randomcolours")) {
             randColours =(String[]) IdentityManager.getGlobalConfig().getOptionList(DOMAIN, "randomcolours").toArray();
         }
     }
     
+    /** {@inheritDoc} */
+    public void onUnload() {
+    }
+    
     /** {@inheritDoc} */
     public boolean isConfigurable() {
         return true;
@@ -301,24 +300,4 @@ public final class NickColourPlugin extends Plugin implements EventPlugin, Prefe
         // Do nothing
     }
     
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.5";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Provides various nick colouring tools";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "Nick Colour Plugin";
-    }
-    
 }

src/com/dmdirc/addons/nickcolours/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.nickcolours.NickColourPlugin
+version=6
+friendlyversion=0.6
+author=Chris <chris@dmdirc.com>
+description=Provides various nick colouring tools
+name=nickcolour
+nicename=Nick Colour Plugin
+minversion=0

src/com/dmdirc/addons/nowplaying/plugin.info

@@ -0,0 +1,10 @@
+mainclass=com.dmdirc.addons.nowplaying.plugin.NowPlayingPlugin
+version=3
+friendlyversion=0.3
+author=Chris <chris@dmdirc.com>
+description=Adds a nowplaying command
+name=nowplaying
+nicename=Now Playing Command
+minversion=0
+persistant-com.dmdirc.addons.nowplaying.MediaSource=true
+persistant-com.dmdirc.addons.nowplaying.MediaSourceManager=true

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

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.EventPlugin;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
@@ -63,19 +64,13 @@ public class NowPlayingPlugin extends Plugin implements EventPlugin,
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    protected void onActivate() {
+    public void onLoad() {
         sources.clear();
         
         loadSettings();
         
-        for (Plugin target : PluginManager.getPluginManager().getPlugins()) {
-            if (target.isActive()) {
+        for (PluginInfo target : PluginManager.getPluginManager().getPluginInfos()) {
+            if (target.isLoaded()) {
                 addPlugin(target);
             }
         }
@@ -84,33 +79,12 @@ public class NowPlayingPlugin extends Plugin implements EventPlugin,
     }
     
     /** {@inheritDoc} */
-    @Override
-    protected void onDeactivate() {
+    public void onUnload() {
         sources.clear();
         
         CommandManager.unregisterCommand(command);
     }
     
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.2";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Adds a nowplaying command";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "Now playing command";
-    }
-    
     /** {@inheritDoc} */
     public boolean isConfigurable() {
         return true;
@@ -158,10 +132,10 @@ public class NowPlayingPlugin extends Plugin implements EventPlugin,
     /** {@inheritDoc} */
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
-        if (type == CoreActionType.PLUGIN_ACTIVATED) {
-            addPlugin((Plugin) arguments[0]);
-        } else if (type == CoreActionType.PLUGIN_DEACTIVATED) {
-            removePlugin((Plugin) arguments[0]);
+        if (type == CoreActionType.PLUGIN_LOADED) {
+            addPlugin((PluginInfo) arguments[0]);
+        } else if (type == CoreActionType.PLUGIN_UNLOADED) {
+            removePlugin((PluginInfo) arguments[0]);
         }
     }
     
@@ -171,16 +145,17 @@ public class NowPlayingPlugin extends Plugin implements EventPlugin,
      *
      * @param target The plugin to be tested
      */
-    private void addPlugin(final Plugin target) {
-        if (target instanceof MediaSource) {
-            sources.add((MediaSource) target);
-            addSourceToOrder((MediaSource) target);
+    private void addPlugin(final PluginInfo target) {
+        final Plugin targetPlugin = target.getPlugin();
+        if (targetPlugin instanceof MediaSource) {
+            sources.add((MediaSource) targetPlugin);
+            addSourceToOrder((MediaSource) targetPlugin);
         }
         
-        if (target instanceof MediaSourceManager) {
-            sources.addAll(((MediaSourceManager) target).getSources());
+        if (targetPlugin instanceof MediaSourceManager) {
+            sources.addAll(((MediaSourceManager) targetPlugin).getSources());
             
-            for (MediaSource source : ((MediaSourceManager) target).getSources()) {
+            for (MediaSource source : ((MediaSourceManager) targetPlugin).getSources()) {
                 addSourceToOrder(source);
             }
         }
@@ -204,13 +179,14 @@ public class NowPlayingPlugin extends Plugin implements EventPlugin,
      *
      * @param target The plugin to be tested
      */
-    private void removePlugin(final Plugin target) {
-        if (target instanceof MediaSource) {
-            sources.remove(target);
+    private void removePlugin(final PluginInfo target) {
+        final Plugin targetPlugin = target.getPlugin();
+        if (targetPlugin instanceof MediaSource) {
+            sources.remove(targetPlugin);
         }
         
-        if (target instanceof MediaSourceManager) {
-            sources.removeAll(((MediaSourceManager) target).getSources());
+        if (targetPlugin instanceof MediaSourceManager) {
+            sources.removeAll(((MediaSourceManager) targetPlugin).getSources());
         }
     }
     

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

@@ -71,32 +71,15 @@ public final class OsdPlugin extends Plugin implements PreferencesInterface {
     }
     
     /** {@inheritDoc}. */
-    public boolean onLoad() {
+    public void onLoad() {
         command = new OsdCommand();
-        
-        return true;
     }
     
     /** {@inheritDoc}. */
     public void onUnload() {
         CommandManager.unregisterCommand(command);
     }
-    
-    /** {@inheritDoc}. */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc}. */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc}. */
-    public String getDescription() {
-        return "Provides command to show on screen display";
-    }
-    
+
     /** {@inheritDoc}. */
     public boolean isConfigurable() {
         return true;
@@ -176,9 +159,4 @@ public final class OsdPlugin extends Plugin implements PreferencesInterface {
     public void configCancelled() {
         osdWindow.dispose();
     }
-    
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "OSD Plugin";
-    }
 }

src/com/dmdirc/addons/osdplugin/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.osdplugin.OsdPlugin
+version=2
+friendlyversion=0.2
+author=Chris <chris@dmdirc.com>
+description=Provides command to show on screen display
+name=osd
+nicename=OSD Plugin
+minversion=0

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

@@ -44,37 +44,13 @@ public final class RedirectPlugin extends Plugin {
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void onActivate() {
+    public void onLoad() {
         CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc}. */
-    public void onDeactivate() {
+    public void onUnload() {
         CommandManager.unregisterCommand(command);
     }
     
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Adds commands to redirect command output to channels";
-    }
-    
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "Redirect Plugin";
-    }
 }

src/com/dmdirc/addons/redirectplugin/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.redirectplugin.RedirectPlugin
+version=2
+friendlyversion=0.2
+author=Chris <chris@dmdirc.com>
+description=Adds commands to redirect command output to channels
+name=redirect
+nicename=Redirect Plugin
+minversion=0

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

@@ -83,9 +83,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
      * @param type The type of notification
      */
     public void notify(final String title, final String message, final TrayIcon.MessageType type) {
-        if (isActive()) {
-            icon.displayMessage(title, Styliser.stipControlCodes(message), type);
-        }
+        icon.displayMessage(title, Styliser.stipControlCodes(message), type);
     }
     
     /**
@@ -107,12 +105,12 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
+    public boolean checkPrerequisites() {
         return SystemTray.isSupported();
     }
     
     /** {@inheritDoc} */
-    public void onActivate() {
+    public void onLoad() {
         try {
             SystemTray.getSystemTray().add(icon);
             command = new PopupCommand(this);
@@ -122,31 +120,11 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
     }
     
     /** {@inheritDoc}. */
-    public void onDeactivate() {
+    public void onUnload() {
         SystemTray.getSystemTray().remove(icon);
         command.unregister();
     }
     
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Adds a system tray icon";
-    }
-    
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "Systray Plugin";
-    }
-    
     /** {@inheritDoc} */
     public void mouseClicked(final MouseEvent e) {
         if (e.getButton() == MouseEvent.BUTTON1) {

src/com/dmdirc/addons/systray/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.systray.SystrayPlugin
+version=2
+friendlyversion=0.2
+author=Chris <chris@dmdirc.com>
+description=Adds a system tray icon
+name=systram
+nicename=Systray Plugin
+minversion=0

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

@@ -51,17 +51,12 @@ public final class TimePlugin  extends Plugin {
     }
     
     /** {@inheritDoc} */
-    public boolean onLoad() {
+    public void onLoad() {
         if (!registered) {
             ActionManager.registerActionTypes(TimeActionType.values());
             registered = true;
         }
-        
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void onActivate() {
+
         final int offset = 60 - Calendar.getInstance().get(Calendar.SECOND);
         
         timer = new Timer("Time plugin timer");
@@ -92,30 +87,10 @@ public final class TimePlugin  extends Plugin {
     
     
     /** {@inheritDoc} */
-    public void onDeactivate() {
+    public void onUnload() {
         timer.cancel();
         timer = null;
         
         CommandManager.unregisterCommand(command);
     }
-    
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Provides time-related actions and commands";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "Time Plugin";
-    }
 }

src/com/dmdirc/addons/timeplugin/plugin.info

@@ -0,0 +1,10 @@
+mainclass=com.dmdirc.addons.timeplugin.TimePlugin
+version=2
+friendlyversion=0.2
+author=Chris <chris@dmdirc.com>
+description=Provides time-based actions and commands
+name=timeplugin
+nicename=Time Plugin
+minversion=0
+persistant-com.dmdirc.addons.timeplugin.TimeActionMetaType=true
+persistant-com.dmdirc.addons.timeplugin.TimeActionType=true

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

@@ -76,10 +76,8 @@ public final class WindowStatusPlugin extends Plugin implements EventPlugin, Pre
 	
 	/**
 	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
 	 */
-	public boolean onLoad() {
+	public void onLoad() {
 		// Set defaults
 		Properties defaults = new Properties();
 		defaults.setProperty(MY_DOMAIN + ".channel.shownone", "true");
@@ -88,52 +86,17 @@ public final class WindowStatusPlugin extends Plugin implements EventPlugin, Pre
 		defaults.setProperty("identity.name", "WindowStatus Plugin Defaults");
 		IdentityManager.addIdentity(new Identity(defaults));
 		
-		return true;
-	}
-	
-	/**
-	 * Called when this plugin is Activated.
-	 */
-	public void onActivate() {
 		Main.getUI().getStatusBar().addComponent(panel);
 		updateStatus();
 	}
 	
 	/**
-	 * Called when this plugin is deactivated.
+	 * Called when this plugin is unloaded.
 	 */
-	public void onDeactivate() {
+	public void onUnload() {
 		Main.getUI().getStatusBar().removeComponent(panel);
 	}
 	
-	/**
-	 * Get the plugin version.
-	 *
-	 * @return Plugin Version
-	 */
-	public String getVersion() { return "0.4"; }
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public String getAuthor() { return "Shane <shane@dmdirc.com>"; }
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public String getDescription() { return "Displays information related to the current window in the status bar."; }
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public String toString() { return "WindowStatus Plugin"; }
-	
 	/**
 	 * Process an event of the specified type.
 	 *

src/com/dmdirc/addons/windowstatus/plugin.info

@@ -0,0 +1,8 @@
+mainclass=com.dmdirc.addons.windowstatus.WindowStatusPlugin
+version=5
+friendlyversion=0.5
+author=Shane <shane@dmdirc.com>
+description=Displays information related to the current window in the status bar.
+name=windowstatus
+nicename=WindowStatus Plugin
+minversion=0

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -27,6 +27,7 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -62,11 +63,11 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
         
         final String pname = args[0].substring(negative ? 1 : 0);
         
-        final Plugin plugin = PluginManager.getPluginManager().getPlugin(pname);
+        final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName(pname);
         
         boolean result = true;
         
-        if (plugin == null || !plugin.isActive()) {
+        if (pluginInfo == null || !pluginInfo.isLoaded()) {
             result = false;
         }
         
@@ -111,9 +112,9 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
         if (arg == 0) {
             res.setIncludeNormal(false);
 
-            for (Plugin possPlugin : PluginManager.getPluginManager().getPossiblePlugins()) {
-                res.add(possPlugin.getClass().getCanonicalName());
-                res.add("!" + possPlugin.getClass().getCanonicalName());
+            for (PluginInfo possPlugin : PluginManager.getPluginManager().getPossiblePluginInfos()) {
+                res.add(possPlugin.getName());
+                res.add("!" + possPlugin.getName());
             }            
         }
         

src/com/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -51,7 +52,7 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (PluginManager.getPluginManager().addPlugin(args[0])) {
-            PluginManager.getPluginManager().getPlugin(args[0]).setActive(true);
+            PluginManager.getPluginManager().getPluginInfo(args[0]).loadPlugin();
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
         } else {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Loading failed");
@@ -91,8 +92,8 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
         if (arg == 0) {
             res.setIncludeNormal(false);
             
-            for (Plugin possPlugin : PluginManager.getPluginManager().getPossiblePlugins()) {
-                res.add(possPlugin.getClass().getCanonicalName());
+            for (PluginInfo possPlugin : PluginManager.getPluginManager().getPossiblePluginInfos()) {
+                res.add(possPlugin.getFilename());
             }
         }
         

src/com/dmdirc/commandparser/commands/global/ReloadPlugin.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -49,15 +50,12 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
     /** {@inheritDoc} */
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
-        Plugin plugin = PluginManager.getPluginManager().getPlugin(args[0]);
+        PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed - Plugin not loaded");
         } else {
-            final boolean isActive = plugin.isActive();
-            plugin = null;
-            if (PluginManager.getPluginManager().reloadPlugin(args[0])) {
+            if (PluginManager.getPluginManager().reloadPlugin(plugin.getFilename())) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin Reloaded.");
-                PluginManager.getPluginManager().getPlugin(args[0]).setActive(isActive);
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed");
             }
@@ -97,8 +95,8 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
         if (arg == 0) {
             res.setIncludeNormal(false);
             
-            for (Plugin possPlugin : PluginManager.getPluginManager().getPlugins()) {
-                res.add(possPlugin.getClass().getCanonicalName());
+            for (PluginInfo possPlugin : PluginManager.getPluginManager().getPossiblePluginInfos()) {
+                res.add(possPlugin.getName());
             }
         }
         

src/com/dmdirc/plugins/Plugin.java

@@ -40,52 +40,21 @@ public abstract class Plugin implements Comparable<Plugin> {
 
 	/**
 	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
 	 */
-	public abstract boolean onLoad();
+	public abstract void onLoad();
 	
 	/**
-	 * Called when the plugin is about to be unloaded.
-	 */
-	public void onUnload() { }
-
-	/**
-	 * Change the active state of this plugin.
-	 * (Non-Active Plugins will not recieve Events)
+	 * Check any further Prerequisites for this plugin to load that can not be
+	 * checked using metainfo.
 	 *
-	 * @param newState True if activating, else False.
+	 * @return true if the plugin can be used, else false.
 	 */
-	public final void setActive(boolean newState) {
-		if (isActive != newState) {
-			isActive = newState;
-			if (isActive) {
-				ActionManager.processEvent(CoreActionType.PLUGIN_ACTIVATED, null, this);
-				onActivate();
-			} else {
-				ActionManager.processEvent(CoreActionType.PLUGIN_DEACTIVATED, null, this);
-				onDeactivate();
-			}
-		}
-	}
+	public boolean checkPrerequisites() { return true; }
 	
 	/**
-	 * Check to see if a plugin is active.
-	 * (Non-Active Plugins will not recieve Events)
-	 *
-	 * @return True if active, else False.
-	 */
-	public final boolean isActive() { return isActive; }
-	
-	/**
-	 * Called when this plugin becomes active.
-	 */
-	protected void onActivate() { }
-	
-	/**
-	 * Called when this plugin is deactivated.
+	 * Called when the plugin is about to be unloaded.
 	 */
-	protected void onDeactivate() { }
+	public abstract void onUnload();
 	
 	/**
 	 * Called to see if the plugin has configuration options (via dialog).
@@ -99,34 +68,6 @@ public abstract class Plugin implements Comparable<Plugin> {
 	 */
 	public void showConfig() { }
 	
-	/**
-	 * Get the plugin version
-	 *
-	 * @return Plugin Version
-	 */
-	public abstract String getVersion();
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public abstract String getAuthor();
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public abstract String getDescription();
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public abstract String toString();
-
 	/**
 	 * Compares this object with the specified object for order.
 	 * Returns a negative integer, zero, or a positive integer as per String.compareTo();

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -23,25 +23,22 @@
  */
 package com.dmdirc.plugins;
 
-import java.io.FileInputStream;
-import java.io.DataInputStream;
-import java.io.File;
+import com.dmdirc.util.resourcemanager.ResourceManager;
+
 import java.io.IOException;
 
 public class PluginClassLoader extends ClassLoader {
-	/** Directory where plugins are stored. */
-	String myDir;
-	
-	/** Name of the package I am loading. */
-	String myPackage = "";
+	/** The plugin Info object for the plugin we are loading */
+	final PluginInfo pluginInfo;
 	
 	/**
 	 * Create a new PluginClassLoader.
 	 *
 	 * @param directory Directory where plugins are stored.
 	 */
-	public PluginClassLoader(String directory) {
-		myDir = directory;
+	public PluginClassLoader(final PluginInfo info) {
+		super();
+		pluginInfo = info;
 	}
 	
 	/**
@@ -52,28 +49,36 @@ public class PluginClassLoader extends ClassLoader {
 	 * @throws ClassNotFoundException if the class to be loaded could not be found.
 	 */
 	public Class< ? > loadClass(final String name) throws ClassNotFoundException {
+		ResourceManager res;
+		try {
+			res = pluginInfo.getResourceManager();
+		} catch (IOException ioe) {
+			throw new ClassNotFoundException("Error with resourcemanager", ioe);
+		}
+	
 		Class< ? > loadedClass = null;
 
-		// Check to make sure we only load things in our own package!
+		final String fileName = name.replace('.', '/')+".class";
 		try {
-			if (myPackage.isEmpty()) {
-				int i = name.lastIndexOf('.');
-				if (i != -1) { myPackage = name.substring(0, i); }
-				else { return getParent().loadClass(name); }
+			if (pluginInfo.isPersistant(name) || !res.resourceExists(fileName)) {
+				return getParent().loadClass(name);
 			}
-			if (!name.startsWith(myPackage)) { return getParent().loadClass(name); }
 		} catch (NoClassDefFoundError e) {
-			throw new ClassNotFoundException("Error loading '"+name+"' (wanted by '"+myPackage+"' in '"+myDir+"') -> "+e.getMessage(), e);
+			throw new ClassNotFoundException("Error loading '"+name+"' (wanted by "+pluginInfo.getName()+") -> "+e.getMessage(), e);
 		}
 		
+		
+		// Don't duplicate a class
+		Class existing = findLoadedClass(name);
+		if (existing != null) { return existing; }
+		
 		// We are ment to be loading this one!
-		final String fileName = myDir + File.separator + name.replace(myDir+".", "").replace('.', File.separatorChar) + ".class";
 		byte[] data = null;
-
-		try {
-			data = loadClassData(fileName);
-		} catch (IOException e) {
-			throw new ClassNotFoundException(e.getMessage());
+		
+		if (res.resourceExists(fileName)) {
+			data = res.getResourceBytes(fileName);
+		} else {
+			throw new ClassNotFoundException("Resource '"+name+"' (wanted by "+pluginInfo.getName()+") does not exist.");
 		}
 		
 		try {
@@ -90,21 +95,4 @@ public class PluginClassLoader extends ClassLoader {
 		
 		return loadedClass;
 	}
-	
-	/**
-	 * Load the class from the .class file
-	 *
-	 * @param filename Filename to load from
-	 * @throws IOException when the file doesn't exist or can't be read
- 	 */
-	public byte[] loadClassData(String filename) throws IOException {
-		final File file = new File(filename);
-		final byte[] fileBuffer = new byte[(int)file.length()];
-		final DataInputStream fileInput = new DataInputStream(new FileInputStream(file));
-		
-		fileInput.readFully(fileBuffer);
-		fileInput.close();
-		
-		return fileBuffer;
-	}
 }

src/com/dmdirc/plugins/PluginException.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2007 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.
+ *
+ * SVN: $Id: PluginException.java 2022 2007-09-12 00:35:14Z ShaneMcC $
+ */
+
+package com.dmdirc.plugins;
+
+/**
+ * Plugin Exception.
+ *
+ * @author            Shane Mc Cormack
+ * @version           $Id: PluginException.java 2022 2007-09-12 00:35:14Z ShaneMcC $
+ */
+public class PluginException extends Exception {
+	/**
+	 * A version number for this class. It should be changed whenever the class
+	 * structure is changed (or anything else that would prevent serialized
+	 * objects being unserialized with the new class).
+	 */
+	private static final long serialVersionUID = 1;
+	
+	/**
+	 * Create a new PluginException Exception.
+	 *
+	 * @param message Reason for exception
+	 */
+	public PluginException(final String message) { super(message); }
+	
+	/**
+	 * Create a new PluginException Exception.
+	 *
+	 * @param message Reason for exception
+	 * @param cause Cause of Exception
+	 */
+	public PluginException(final String message, final Throwable cause) { super(message, cause); }
+	
+	/**
+	 * Get SVN Version information.
+	 *
+	 * @return SVN Version String
+	 */
+	public static String getSvnInfo() { return "$Id: PluginException.java 2022 2007-09-12 00:35:14Z ShaneMcC $"; }	
+}

src/com/dmdirc/plugins/PluginInfo.java

@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2006-2007 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.
+ *
+ * SVN: $Id$
+ */
+package com.dmdirc.plugins;
+
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.util.resourcemanager.ResourceManager;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Properties;
+
+public class PluginInfo implements Comparable<PluginInfo> {
+	/** Plugin Meta Data */
+	private Properties metaData = new Properties();
+	/** File that this plugin was loaded from */
+	private final String filename;
+	/** The actual Plugin from this jar */
+	private Plugin plugin = null;
+	/** The classloader used for this Plugin */
+	private PluginClassLoader classloader = null;
+	/** The resource manager used by this pluginInfo */
+	private ResourceManager myResourceManager = null;
+	
+	/**
+	 * Create a new PluginInfo.
+	 *
+	 * @param filename File that this plugin is stored in.
+	 * @throws PluginException if there is an error loading the Plugin
+	 */
+	public PluginInfo(final String filename) throws PluginException {
+		this.filename = filename;
+		
+		ResourceManager res;
+		try {
+			res = getResourceManager();
+		} catch (IOException ioe) {
+			throw new PluginException("Plugin "+filename+" failed to load, error with resourcemanager", ioe);
+		}
+		
+		try {
+			if (res.resourceExists("META-INF/plugin.info")) {
+				metaData.load(res.getResourceInputStream("META-INF/plugin.info"));
+			} else {
+				throw new PluginException("Plugin "+filename+" failed to load, plugin.info doesn't exist in jar");
+			}
+		} catch (Exception e) {
+			throw new PluginException("Plugin "+filename+" failed to load, plugin.info failed to open - "+e.getMessage(), e);
+		}
+		
+		if (getVersion() < 0) {
+			throw new PluginException("Plugin "+filename+" failed to load, incomplete plugin.info (Missing or invalid 'version')");
+		} else if(getAuthor().equals("")) {
+			throw new PluginException("Plugin "+filename+" failed to load, incomplete plugin.info (Missing 'author')");
+		} else if(getName().equals("")) {
+			throw new PluginException("Plugin "+filename+" failed to load, incomplete plugin.info (Missing 'name')");
+		} else if(getMinVersion().equals("")) {
+			throw new PluginException("Plugin "+filename+" failed to load, incomplete plugin.info (Missing 'minversion')");
+		} else if(getMainClass().equals("")) {
+			throw new PluginException("Plugin "+filename+" failed to load, incomplete plugin.info (Missing 'mainclass')");
+		}
+		
+		final String mainClass = getMainClass().replace('.', '/')+".class";
+		if (!res.resourceExists(mainClass)) {
+			throw new PluginException("Plugin "+filename+" failed to load, main class file ("+mainClass+") not found in jar.");
+		}
+		
+		if (isPersistant()) { loadEntirePlugin(); }
+		
+		myResourceManager = null;
+	}
+
+	/**
+	 * Get the resource manager for this plugin
+	 *
+	 * @throws IOException if there is any problem getting a ResourceManager for this plugin
+	 */
+	protected synchronized ResourceManager getResourceManager() throws IOException {
+		if (myResourceManager == null) {
+			final String directory = PluginManager.getPluginManager().getDirectory();
+			myResourceManager = ResourceManager.getResourceManager("jar://"+directory+filename);
+		}
+		return myResourceManager;
+	}
+	
+	/**
+	 * Are the requirements for this plugin met?
+	 *
+	 * @throws PluginException if requirements to load plugin are not met.
+	 */
+	public void checkRequirements() throws PluginException {
+		// This needs to parse getMetaInfo("requirements"); when I decide on the
+		// syntax.
+		// Also needs to check min/max version.
+	}
+	
+	/**
+	 * Is this plugin loaded?
+	 */
+	public boolean isLoaded() {
+		return (plugin != null);
+	}
+	
+	/**
+	 * 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.
+		try {
+			ResourceManager res = getResourceManager();
+			
+			for (final String filename : res.getResourcesStartingWith("")) {
+				String classname = filename.replace('.', '/');
+				if (classname.matches("^.*\\.class$")) {
+					classname = classname.replaceAll("\\.class$", "");
+					loadClass(classname);
+				}
+			}
+			
+		} catch (IOException ioe) {
+			throw new PluginException("Plugin "+filename+" failed to load, error with resourcemanager", ioe);
+		}
+		myResourceManager = null;
+	}
+	
+	/**
+	 * Load the plugin files.
+	 */
+	public void loadPlugin() {
+		if (isLoaded()) {
+			Logger.userError(ErrorLevel.LOW, "Tried to load Plugin that was already loaded.");
+			return;
+		}
+		loadClass(getMainClass());
+		if (isLoaded()) {
+			ActionManager.processEvent(CoreActionType.PLUGIN_LOADED, null, this);
+		}
+		myResourceManager = null;
+	}
+	
+	/**
+	 * Load the given classname.
+	 *
+	 * @param classname Class to load
+	 */
+	private void loadClass(final String classname) {
+		try {
+			classloader = new PluginClassLoader(this);
+			
+			final Class<?> c = classloader.loadClass(classname);
+			final Constructor<?> constructor = c.getConstructor(new Class[] {});
+		
+			final Object temp = constructor.newInstance(new Object[] {});
+			
+			if (temp instanceof Plugin) {
+				if (((Plugin) temp).checkPrerequisites()) {
+					plugin = (Plugin) temp;
+					plugin.onLoad();
+				} else {
+					Logger.userError(ErrorLevel.LOW, "Prerequisites for plugin not met. ('"+filename+":"+getMainClass()+"')");
+				}
+			}
+		} catch (ClassNotFoundException cnfe) {
+			Logger.userError(ErrorLevel.LOW, "Class not found ('"+filename+":"+getMainClass()+"')", cnfe);
+		} catch (NoSuchMethodException nsme) {
+			Logger.userError(ErrorLevel.LOW, "Constructor missing ('"+filename+":"+getMainClass()+"')", nsme);
+		} catch (IllegalAccessException iae) {
+			Logger.userError(ErrorLevel.LOW, "Unable to access constructor ('"+filename+":"+getMainClass()+"')", iae);
+		} catch (InvocationTargetException ite) {
+			Logger.userError(ErrorLevel.LOW, "Unable to invoke target ('"+filename+":"+getMainClass()+"')", ite);
+		} catch (InstantiationException ie) {
+			Logger.userError(ErrorLevel.LOW, "Unable to instantiate plugin ('"+filename+":"+getMainClass()+"')", ie);
+		} catch (NoClassDefFoundError ncdf) {
+			Logger.userError(ErrorLevel.LOW, "Unable to instantiate plugin ('"+filename+":"+getMainClass()+"'): Unable to find class: " + ncdf.getMessage(), ncdf);
+		}
+	}
+	
+	/**
+	 * Unload the plugin if possible.
+	 */
+	public void unloadPlugin() {
+		if (!isPersistant() && isLoaded()) {
+			plugin.onUnload();
+			ActionManager.processEvent(CoreActionType.PLUGIN_UNLOADED, null, this);
+			plugin = null;
+			classloader = null;
+		}
+	}
+	
+	/**
+	 * Get the main Class
+	 *
+	 * @return Main Class to begin loading.
+	 */
+	public String getMainClass() { return metaData.getProperty("mainclass",""); }
+	
+	/**
+	 * Get the Plugin for this plugin.
+	 *
+	 * @return Plugin
+	 */
+	public Plugin getPlugin() { return plugin; }
+	
+	/**
+	 * Get the PluginClassLoader for this plugin.
+	 *
+	 * @return PluginClassLoader
+	 */
+	private PluginClassLoader getPluginClassLoader() { return classloader; }	
+	
+	/**
+	 * Get the plugin friendly version
+	 *
+	 * @return Plugin friendly Version
+	 */
+	public String getFriendlyVersion() { return metaData.getProperty("version",""); }
+	
+	/**
+	 * Get the plugin version
+	 *
+	 * @return Plugin Version
+	 */
+	public int getVersion() {
+		try {
+			return Integer.parseInt(metaData.getProperty("version",""));
+		} catch (NumberFormatException nfe) {
+			return -1;
+		}
+	}
+	
+	/**
+	 * Is this a persistant plugin?
+	 *
+	 * @return true if persistant, else false
+	 */
+	public boolean isPersistant() {
+		final String persistance = metaData.getProperty("persistant","no");
+		return persistance.equalsIgnoreCase("true") || persistance.equalsIgnoreCase("yes");
+	}
+	
+	/**
+	 * Is this a persistant class?
+	 *
+	 * @param classname class to check persistance of
+	 * @return true if file (or whole plugin) is persistant, else false
+	 */
+	public boolean isPersistant(final String classname) {
+		if (isPersistant()) {
+			return true;
+		} else {
+			final String persistance = metaData.getProperty("persistant-"+classname,"no");
+			return persistance.equalsIgnoreCase("true") || persistance.equalsIgnoreCase("yes");
+		}
+	}
+	
+	/**
+	 * Get the plugin Filename.
+	 *
+	 * @return Filename of plugin
+	 */
+	public String getFilename() { return filename; }
+	
+	/**
+	 * Get the plugin Author.
+	 *
+	 * @return Author of plugin
+	 */
+	public String getAuthor() { return getMetaInfo("author",""); }
+	
+	/**
+	 * Get the plugin Description.
+	 *
+	 * @return Description of plugin
+	 */
+	public String getDescription() { return getMetaInfo("description",""); }
+	
+	/**
+	 * Get the minimum dmdirc version required to run the plugin.
+	 *
+	 * @return minimum dmdirc version required to run the plugin.
+	 */
+	public String getMinVersion() { return getMetaInfo("minversion",""); }
+	
+	/**
+	 * Get the (optional) maximum dmdirc version on which this plugin can run
+	 *
+	 * @return optional maximum dmdirc version on which this plugin can run
+	 */
+	public String getMaxVersion() { return getMetaInfo("maxversion",""); }
+	
+	/**
+	 * Get the name of the plugin. (Used to identify the plugin)
+	 *
+	 * @return Name of plugin
+	 */
+	public String getName() { return getMetaInfo("name",""); }
+	
+	/**
+	 * Get the nice name of the plugin. (Displayed to users)
+	 *
+	 * @return Nice Name of plugin
+	 */
+	public String getNiceName() { return getMetaInfo("nicename",getName()); }
+	
+	/**
+	 * String Representation of this plugin
+	 *
+	 * @return String Representation of this plugin
+	 */
+	public String toString() { return getNiceName()+" - "+filename; }
+	
+	/**
+	 * Get misc meta-information
+	 *
+	 * @param metainfo The metainfo to return
+	 * @return Misc Meta Info (or "" if not found);
+	 */
+	public String getMetaInfo(final String metainfo) { return metaData.getProperty(metainfo,""); }
+	
+	/**
+	 * Get misc meta-information
+	 *
+	 * @param metainfo The metainfo to return
+	 * @param fallback Fallback value if requested value is not found
+	 * @return Misc Meta Info (or fallback if not found);
+	 */
+	public String getMetaInfo(final String metainfo, final String fallback) { return metaData.getProperty(metainfo,fallback); }
+	
+	/**
+	 * Compares this object with the specified object for order.
+	 * Returns a negative integer, zero, or a positive integer as per String.compareTo();
+	 *
+	 * @param o Object to compare to
+	 * @return a negative integer, zero, or a positive integer.
+	 */
+	public int compareTo(PluginInfo o) {
+		return toString().compareTo(o.toString());
+	}
+}

src/com/dmdirc/plugins/PluginManager.java

@@ -24,8 +24,6 @@
 package com.dmdirc.plugins;
 
 import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.LinkedList;
@@ -43,7 +41,7 @@ public class PluginManager {
 	/**
 	 * List of known plugins.
 	 */
-	private final Hashtable<String,Plugin> knownPlugins = new Hashtable<String,Plugin>();
+	private final Hashtable<String,PluginInfo> knownPlugins = new Hashtable<String,PluginInfo>();
 	
 	/**
 	 * Directory where plugins are stored.
@@ -72,7 +70,7 @@ public class PluginManager {
 			for (String plugin : autoLoadList) {
 				plugin = plugin.trim();
 				if (!plugin.isEmpty() && plugin.charAt(0) != '#' && addPlugin(plugin)) {
-					getPlugin(plugin).setActive(true);
+					getPluginInfo(plugin).loadPlugin();
 				}
 			}
 		}
@@ -93,21 +91,22 @@ public class PluginManager {
 	/**
 	 * Add a new plugin.
 	 *
-	 * @param className Class Name of Plugin object
+	 * @param filename Filename of Plugin jar
 	 * @return True if loaded, false if failed to load or if already loaded.
 	 */
-	public boolean addPlugin(final String className) {
-		if (knownPlugins.containsKey(className.toLowerCase())) { return false; }
+	public boolean addPlugin(final String filename) {
+		if (knownPlugins.containsKey(filename.toLowerCase())) { return false; }
 		try {
-			final Plugin plugin = loadPlugin(className);
-			if (plugin == null) { return false; }
-			if (plugin.onLoad()) {
-				knownPlugins.put(className.toLowerCase(), plugin);
-				ActionManager.processEvent(CoreActionType.PLUGIN_LOADED, null, plugin);
+			final PluginInfo pluginInfo = new PluginInfo(filename);
+			try {
+				pluginInfo.checkRequirements();
+				knownPlugins.put(filename.toLowerCase(), pluginInfo);
 				return true;
+			} catch (PluginException e) {
+				Logger.userError(ErrorLevel.MEDIUM, "Plugin requirements not met: "+e.getMessage(), e);
 			}
 		} catch (Exception e) {
-			Logger.userError(ErrorLevel.MEDIUM, "Error loading "+className+" - "+e.getMessage());
+			Logger.userError(ErrorLevel.MEDIUM, e.getMessage(), e);
 		}
 		return false;
 	}
@@ -115,36 +114,38 @@ public class PluginManager {
 	/**
 	 * Remove a plugin.
 	 *
-	 * @param className Class name of plugin
+	 * @param filename Filename of Plugin jar
 	 * @return True if removed.
 	 */
-	public boolean delPlugin(final String className) {
-		if (!knownPlugins.containsKey(className.toLowerCase())) { return false; }
-		Plugin plugin = getPlugin(className);
+	public boolean delPlugin(final String filename) {
+		if (!knownPlugins.containsKey(filename.toLowerCase())) { return false; }
+		
+		PluginInfo pluginInfo = getPluginInfo(filename);
 		try {
-			plugin.setActive(false);
-			ActionManager.processEvent(CoreActionType.PLUGIN_UNLOADED, null, plugin);
-			plugin.onUnload();
+			ActionManager.processEvent(CoreActionType.PLUGIN_UNLOADED, null, pluginInfo);
+			pluginInfo.unloadPlugin();
 		} catch (Exception e) {
-			Logger.userError(ErrorLevel.MEDIUM, "Error in onUnload() for '"+className+"' - "+e.getMessage());
+			Logger.userError(ErrorLevel.MEDIUM, e.getMessage(), e);
 		}
-		knownPlugins.remove(className.toLowerCase());
-		plugin = null;
+		knownPlugins.remove(filename.toLowerCase());
+		pluginInfo = null;
 		return true;
 	}
 	
 	/**
 	 * Reload a plugin.
 	 *
-	 * @param className Class name of plugin
+	 * @param filename Filename of Plugin jar
 	 * @return True if reloaded.
 	 */
-	public boolean reloadPlugin(final String className) {
-		if (!knownPlugins.containsKey(className.toLowerCase())) { return false; }
-		final boolean wasActive = getPlugin(className).isActive();
-		delPlugin(className);
-		final boolean result = addPlugin(className);
-		if (result) { getPlugin(className).setActive(wasActive); }
+	public boolean reloadPlugin(final String filename) {
+		if (!knownPlugins.containsKey(filename.toLowerCase())) { return false; }
+		final boolean wasLoaded = getPluginInfo(filename).isLoaded();
+		delPlugin(filename);
+		final boolean result = addPlugin(filename);
+		if (wasLoaded) {
+			getPluginInfo(filename).loadPlugin();
+		}
 		return result;
 		
 	}
@@ -153,7 +154,7 @@ public class PluginManager {
 	 * Reload all plugins.
 	 */
 	public void reloadAllPlugins() {
-		for (String pluginName : getNames()) {
+		for (String pluginName : getFilenames()) {
 			reloadPlugin(pluginName);
 		}
 	}
@@ -161,12 +162,37 @@ public class PluginManager {
 	/**
 	 * Get a plugin instance.
 	 *
-	 * @param className Class name of plugin
-	 * @return Plugin instance, or null
+	 * @param filename File name of plugin jar
+	 * @return PluginInfo instance, or null
 	 */
-	public Plugin getPlugin(final String className) {
-		if (!knownPlugins.containsKey(className.toLowerCase())) { return null; }
-		return knownPlugins.get(className.toLowerCase());
+	public PluginInfo getPluginInfo(final String filename) {
+		if (!knownPlugins.containsKey(filename.toLowerCase())) { return null; }
+		return knownPlugins.get(filename.toLowerCase());
+	}
+	
+	/**
+	 * Get a plugin instance by plugin name.
+	 *
+	 * @param name Name of plugin to find.
+	 * @return PluginInfo instance, or null
+	 */
+	public PluginInfo getPluginInfoByName(final String name) {
+		for (String pluginName : knownPlugins.keySet()) {
+			final PluginInfo pluginInfo = knownPlugins.get(pluginName);
+			if (pluginInfo.getName().equalsIgnoreCase(name)) {
+				return pluginInfo;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Get directory where plugins are stored.
+	 *
+	 * @return Directory where plugins are stored.
+	 */
+	public String getDirectory() {
+		return myDir;
 	}
 	
 	/**
@@ -178,7 +204,36 @@ public class PluginManager {
 		final String[] result = new String[knownPlugins.size()];
 		int i = 0;
 		for (String name : knownPlugins.keySet()) {
-			result[i++] = name;
+			result[i++] = knownPlugins.get(name).getName();
+		}
+		return result;
+	}
+	
+	/**
+	 * Get string[] of known plugin file names.
+	 *
+	 * @return string[] of known plugin file names.
+	 */
+	public String[] getFilenames() {
+		final String[] result = new String[knownPlugins.size()];
+		int i = 0;
+		for (String name : knownPlugins.keySet()) {
+			result[i++] = knownPlugins.get(name).getFilename();
+		}
+		return result;
+	}
+	
+	
+	/**
+	 * Get string[] of known plugin mainclass names.
+	 *
+	 * @return string[] of known plugin mainclass names.
+	 */
+	public String[] getMainClassNames() {
+		final String[] result = new String[knownPlugins.size()];
+		int i = 0;
+		for (String name : knownPlugins.keySet()) {
+			result[i++] = knownPlugins.get(name).getMainClass();
 		}
 		return result;
 	}
@@ -186,12 +241,12 @@ public class PluginManager {
 	/**
 	 * Retrieves a list of all installed plugins.
 	 * Any file under the main plugin directory (~/.DMDirc/plugins or similar)
-	 * that matches *Plugin.class is deemed to be a valid plugin.
+	 * that matches *.jar is deemed to be a valid plugin.
 	 *
 	 * @return A list of all installed plugins
 	 */
-	public List<Plugin> getPossiblePlugins() {
-		final ArrayList<Plugin> res = new ArrayList<Plugin>();
+	public List<PluginInfo> getPossiblePluginInfos() {
+		final ArrayList<PluginInfo> res = new ArrayList<PluginInfo>();
 		
 		final LinkedList<File> dirs = new LinkedList<File>();
 		
@@ -205,18 +260,21 @@ public class PluginManager {
 				for (File file : dir.listFiles()) {
 					dirs.add(file);
 				}
-			} else if (dir.isFile() && dir.getName().matches("^.*Plugin\\.class$")) {
+			} else if (dir.isFile() && dir.getName().matches("^.*\\.jar$")) {
 				String target = dir.getPath();
-				// Remove the plugin dir & .class suffix
-				target = target.substring(myDir.length(), target.length() - 6);
-				// Change / (or \) to .
-				target = target.replace(File.separatorChar, '.');
+//				// Remove the plugin dir & .class suffix
+//				target = target.substring(myDir.length(), target.length() - 6);
+//				// Change / (or \) to .
+//				target = target.replace(File.separatorChar, '.');
+
+				// Remove the plugin dir
+				target = target.substring(myDir.length(), target.length());
 				addPlugin(target);
 			}
 		}
 		
 		for (String name : knownPlugins.keySet()) {
-			res.add(getPlugin(name));
+			res.add(getPluginInfo(name));
 		}
 		
 		return res;
@@ -225,92 +283,47 @@ public class PluginManager {
 	/**
 	 * Update the autoLoadList
 	 *
-	 * @param plugin to add/remove (Decided automatically based on isActive())
+	 * @param plugin to add/remove (Decided automatically based on isLoaded())
 	 */
-	public void updateAutoLoad(final Plugin plugin) {
+	public void updateAutoLoad(final PluginInfo plugin) {
 		if (IdentityManager.getGlobalConfig().hasOption("plugins", "autoload")) {
 			final String[] autoLoadList = IdentityManager.getGlobalConfig().getOption("plugins", "autoload").split("\n");
 			final StringBuffer newAutoLoadList = new StringBuffer();
 			boolean found = false;
 			for (String pluginName : autoLoadList) {
 				pluginName = pluginName.trim();
-				if (pluginName.equals(plugin.getClass().getName())) {
+				if (pluginName.equals(plugin.getFilename())) {
 					found = true;
-					if (plugin.isActive()) {
+					if (plugin.isLoaded()) {
 						newAutoLoadList.append(pluginName+"\n");
 					}
 				} else if (!pluginName.isEmpty()) {
 					newAutoLoadList.append(pluginName+"\n");
 				}
 			}
-			if (!found && plugin.isActive()) {
-				newAutoLoadList.append(plugin.getClass().getName()+"\n");
+			if (!found && plugin.isLoaded()) {
+				newAutoLoadList.append(plugin.getFilename()+"\n");
 			}
 			IdentityManager.getConfigIdentity().setOption("plugins", "autoload", newAutoLoadList.toString());
-		} else if (plugin.isActive()) {
-			IdentityManager.getConfigIdentity().setOption("plugins", "autoload", plugin.getClass().getName());
+		} else if (plugin.isLoaded()) {
+			IdentityManager.getConfigIdentity().setOption("plugins", "autoload", plugin.getFilename());
 		}
 	}
 	
 	/**
-	 * Get Plugin[] of known plugins.
+	 * Get PluginInfo[] of known plugins.
 	 *
-	 * @return Plugin[] of known plugins.
+	 * @return PluginInfo[] of known plugins.
 	 */
-	public Plugin[] getPlugins() {
-		final Plugin[] result = new Plugin[knownPlugins.size()];
+	public PluginInfo[] getPluginInfos() {
+		final PluginInfo[] result = new PluginInfo[knownPlugins.size()];
 		int i = 0;
 		for (String name : knownPlugins.keySet()) {
-			result[i++] = getPlugin(name);
+			result[i++] = getPluginInfo(name);
 		}
 		return result;
 	}
 	
-	
-	/**
-	 * Load a plugin with a given className
-	 *
-	 * @param className Class Name of plugin to load.
-	 * @return Loaded plugin or null
-	 */
-	private Plugin loadPlugin(final String className) {
-		Plugin result;
-		try {
-			final ClassLoader cl = new PluginClassLoader(myDir);
-			
-			final Class<?> c = cl.loadClass(className);
-			final Constructor<?> constructor = c.getConstructor(new Class[] {});
-		
-			final Object temp = constructor.newInstance(new Object[] {});
-			
-			if (temp instanceof Plugin) {
-				result = (Plugin) temp;
-			} else {
-				result = null;
-			}
-		} catch (ClassNotFoundException cnfe) {
-			Logger.userError(ErrorLevel.LOW, "Class not found ('"+className+"')");
-			result = null;
-		} catch (NoSuchMethodException nsme) {
-			Logger.userError(ErrorLevel.LOW, "Constructor missing ('"+className+"')");
-			result = null;
-		} catch (IllegalAccessException iae) {
-			Logger.userError(ErrorLevel.LOW, "Unable to access constructor ('"+className+"')");
-			result = null;
-		} catch (InvocationTargetException ite) {
-			Logger.userError(ErrorLevel.LOW, "Unable to invoke target ('"+className+"')");
-			result = null;
-		} catch (InstantiationException ie) {
-			Logger.userError(ErrorLevel.LOW, "Unable to instantiate plugin ('"+className+"')");
-			result = null;
-		} catch (NoClassDefFoundError ncdf) {
-			Logger.userError(ErrorLevel.LOW, "Unable to instantiate plugin ('"+className+"'): Unable to find class: " + ncdf.getMessage());
-			result = null;
-		}
-		
-		return result;
-	}
-
 	/**
 	 * Send an event of the specified type to plugins.
 	 *
@@ -320,12 +333,15 @@ public class PluginManager {
 	 */
 	public void processEvent(final ActionType type, final StringBuffer format, final Object ... arguments) {
 		for (String pluginName : knownPlugins.keySet()) {
-			final Plugin plugin = knownPlugins.get(pluginName);
-			if (plugin instanceof EventPlugin && plugin.isActive()) {
-				try {
-					((EventPlugin)plugin).processEvent(type, format, arguments);
-				} catch (Exception e) {
-					Logger.userError(ErrorLevel.LOW, "Error with processEvent for "+pluginName+" ("+type+") - "+e.getMessage());
+			final PluginInfo pluginInfo = knownPlugins.get(pluginName);
+			if (pluginInfo.isLoaded()) {
+				final Plugin plugin = pluginInfo.getPlugin();
+				if (plugin instanceof EventPlugin) {
+					try {
+						((EventPlugin)plugin).processEvent(type, format, arguments);
+					} catch (Exception e) {
+						Logger.userError(ErrorLevel.LOW, "Error with processEvent for "+pluginName+" ("+type+") - "+e.getMessage(), e);
+					}
 				}
 			}
 		}

src/com/dmdirc/ui/swing/MainFrame.java

@@ -33,6 +33,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.FrameManager;
@@ -770,6 +771,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 //Ignore
             }
         });
+        pluginsMenu.addMenuListener(configureMenu.getMenuListeners()[0]);
 
         menuBar.add(fileMenu);
         menuBar.add(settingsMenu);
@@ -785,18 +787,21 @@ public final class MainFrame extends JFrame implements WindowListener,
      * @param menu Menu to populate
      */
     private void populateConfigurePluginsMenu(final JMenu menu) {
-        final Plugin[] plugins =
-                PluginManager.getPluginManager().getPlugins();
+        final PluginInfo[] plugins =
+                PluginManager.getPluginManager().getPluginInfos();
         pluginList.clear();
         menu.removeAll();
 
-        for (Plugin plugin : plugins) {
-            if (plugin.isConfigurable() && plugin.isActive()) {
-                final JMenuItem mi = new JMenuItem(plugin.toString());
-                mi.setActionCommand("configurePlugin");
-                mi.addActionListener(this);
-                menu.add(mi);
-                pluginList.put(mi, plugin.getClass().getName());
+        for (PluginInfo pluginInfo : plugins) {
+            if (pluginInfo.isLoaded()) {
+                Plugin plugin = pluginInfo.getPlugin();
+                if (plugin.isConfigurable()) {
+                    final JMenuItem mi = new JMenuItem(pluginInfo.getNiceName());
+                    mi.setActionCommand("configurePlugin");
+                    mi.addActionListener(this);
+                    menu.add(mi);
+                    pluginList.put(mi, pluginInfo.getFilename());
+                }
             }
         }
         
@@ -944,7 +949,8 @@ public final class MainFrame extends JFrame implements WindowListener,
             ServerManager.getServerManager().joinDevChat();
         } else if (e.getActionCommand().equals("configurePlugin")) {
             PluginManager.getPluginManager().
-                    getPlugin(pluginList.get(e.getSource())).showConfig();
+                    getPluginInfo(pluginList.get(e.getSource())).getPlugin().
+                    showConfig();
         } else if (e.getActionCommand().equals("feedback")) {
             FeedbackDialog.showFeedbackDialog();
         }

src/com/dmdirc/ui/swing/components/PluginCellRenderer.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
@@ -55,7 +56,7 @@ public final class PluginCellRenderer implements ListCellRenderer {
             final boolean cellHasFocus) {
         
         final JPanel res = new JPanel();
-        final Plugin plugin = (Plugin) value;
+        final PluginInfo plugin = (PluginInfo) value;
         
         res.setLayout(new BorderLayout());
         
@@ -70,17 +71,17 @@ public final class PluginCellRenderer implements ListCellRenderer {
         
         Color foreground;
         
-        if (plugin.isActive()) {
+        if (plugin.isLoaded()) {
             foreground = Color.BLACK;
         } else {
             foreground = Color.GRAY;
         }
         
-        final JLabel name = new JLabel(plugin.toString());
+        final JLabel name = new JLabel(plugin.getNiceName());
         name.setFont(name.getFont().deriveFont(Font.BOLD));
         name.setForeground(foreground);
         
-        final JLabel version = new JLabel("v" + plugin.getVersion());
+        final JLabel version = new JLabel("v" + plugin.getFriendlyVersion());
         version.setForeground(foreground);
         version.setHorizontalAlignment(JLabel.CENTER);
         

src/com/dmdirc/ui/swing/dialogs/PluginDialog.java

@@ -25,6 +25,7 @@ package com.dmdirc.ui.swing.dialogs;
 import com.dmdirc.util.BrowserLauncher;
 import com.dmdirc.Main;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.components.PluginCellRenderer;
@@ -218,11 +219,11 @@ public final class PluginDialog extends StandardDialog implements
     
     /** Populates the plugins list with plugins from the plugin manager. */
     private void populateList() {
-        final List<Plugin> list = PluginManager.getPluginManager().getPossiblePlugins();
+        final List<PluginInfo> list = PluginManager.getPluginManager().getPossiblePluginInfos();
         Collections.sort(list);
         
         ((DefaultListModel) pluginList.getModel()).clear();
-        for (Plugin plugin : list) {
+        for (PluginInfo plugin : list) {
             ((DefaultListModel) pluginList.getModel()).addElement(plugin);
         }
         if (((DefaultListModel) pluginList.getModel()).size() > 0) {
@@ -248,23 +249,24 @@ public final class PluginDialog extends StandardDialog implements
         if (e.getSource() == myOkButton) {
             dispose();
         } else if (e.getSource() == configureButton && selectedPlugin >= 0) {
-            final Plugin plugin = (Plugin) pluginList.getSelectedValue();
-            if (plugin.isConfigurable()) {
+            final PluginInfo pluginInfo = (PluginInfo) pluginList.getSelectedValue();
+            final Plugin plugin = pluginInfo.getPlugin();
+            if (plugin != null && plugin.isConfigurable()) {
                 plugin.showConfig();
             }
         } else if (e.getSource() == toggleButton && selectedPlugin >= 0) {
-            final Plugin plugin = (Plugin) pluginList.getSelectedValue();
-            if (plugin.isActive()) {
-                plugin.setActive(false);
+            final PluginInfo pluginInfo = (PluginInfo) pluginList.getSelectedValue();
+            if (pluginInfo.isLoaded()) {
+                pluginInfo.unloadPlugin();
                 toggleButton.setText("Enable");
                 configureButton.setEnabled(false);
             } else {
-                plugin.setActive(true);
+                pluginInfo.loadPlugin();
                 toggleButton.setText("Disable");
-                configureButton.setEnabled(plugin.isConfigurable());
+                configureButton.setEnabled(pluginInfo.getPlugin().isConfigurable());
             }
             
-            PluginManager.getPluginManager().updateAutoLoad(plugin);
+            PluginManager.getPluginManager().updateAutoLoad(pluginInfo);
             
             pluginList.repaint();
         }
@@ -275,11 +277,17 @@ public final class PluginDialog extends StandardDialog implements
         if (!selectionEvent.getValueIsAdjusting()) {
             final int selected = ((JList) selectionEvent.getSource()).getSelectedIndex();
             if (selected >= 0) {
-                final Plugin plugin = (Plugin) ((JList) selectionEvent.getSource()).getSelectedValue();
-                if (plugin.isActive()) {
+                final PluginInfo pluginInfo = (PluginInfo) ((JList) selectionEvent.getSource()).getSelectedValue();
+                final Plugin plugin = pluginInfo.getPlugin();
+                if (pluginInfo.isLoaded()) {
                     configureButton.setEnabled(plugin.isConfigurable());
+                    pluginInfo.loadPlugin();
+                    if (pluginInfo.isPersistant()) {
+                        toggleButton.setEnabled(false);
+                    }
                     toggleButton.setText("Disable");
                 } else {
+                    pluginInfo.unloadPlugin();
                     configureButton.setEnabled(false);
                     toggleButton.setText("Enable");
                 }