Actually added the plugins this time.

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

src/dmdirc/Config.java

@@ -93,7 +93,9 @@ public class Config {
      * @param option the name of the option
      */
     public static boolean hasOption(String domain, String option) {
-	assert(properties != null);
+	if (properties == null) {
+	    initialise();
+	}
 	
 	return (properties.getProperty(domain+"."+option) != null);
     }
@@ -105,7 +107,9 @@ public class Config {
      * @param option the name of the option
      */
     public static String getOption(String domain, String option) {
-	assert(properties != null);
+	if (properties == null) {
+	    initialise();
+	}
 	
 	return properties.getProperty(domain+"."+option);
     }
@@ -117,7 +121,9 @@ public class Config {
      * @param value value of the option
      */
     public static void setOption(String domain, String option, String value) {
-	assert(properties != null);
+	if (properties == null) {
+	    initialise();
+	}
 	
 	properties.setProperty(domain+"."+option, value);
     }
@@ -159,7 +165,9 @@ public class Config {
      * Saves the config file to disc
      */
     public static void save() {
-	assert(properties != null);
+	if (properties == null) {
+	    initialise();
+	}
 	try {
 	    properties.storeToXML(new FileOutputStream(new File(getConfigFile())), null);
 	} catch (FileNotFoundException ex) {

src/dmdirc/Main.java

@@ -56,8 +56,6 @@ public class Main {
             ex.printStackTrace();
         }
         
-        Config.initialise();
-        
         MainFrame frame = MainFrame.getMainFrame();
     }
     

src/dmdirc/plugins/AbstractPlugin.java

@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package dmdirc.plugins;
+
+public abstract class AbstractPlugin {
+    
+    private boolean running = false;
+    
+    private PluginManager pm = null;
+
+    public AbstractPlugin(PluginManager pm) {
+	this.pm = pm;
+    }
+    
+    void start() {
+	running = true;
+	while (running) {
+	    //Do stuff
+	}
+	pm.removePlugin(this);
+    }
+
+    void onLoad() {
+    }
+    
+    void onUnload() {
+    }
+    
+    void stopPlugin() {
+	running = false;
+    }    
+}

src/dmdirc/plugins/PluginClassLoader.java

@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+package dmdirc.plugins;
+
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+
+/**
+ * A custom ClassLoader to load and unload plugins.
+ */
+class PluginClassLoader extends ClassLoader {
+    private String baseDir = null;
+    
+    /**
+     * Constructs new PluginClassLoader
+     *
+     * @param baseDir plugin base dir
+     */
+    public PluginClassLoader(String baseDir) {
+	this.baseDir = baseDir;
+    }
+    
+    /**
+     * Loads a plugin from disk.
+     *
+     * @param name plugin class name to load
+     * @return plugin class
+     */
+    public Class loadClass(String name) throws ClassNotFoundException {
+	Class loadedClass = findLoadedClass(name);
+	if ( loadedClass == null ) {
+	    try {
+		loadedClass = findSystemClass(name);
+	    } catch ( Exception e ) {
+		// do nothing
+	    }
+	    
+	    if ( loadedClass == null ) {
+		String fileName = baseDir + File.separator +
+			name.replace('.', File.separatorChar) + ".class";
+		byte[] data = null;
+		
+		System.out.println("Trying to load: " + fileName);
+		
+		try {
+		    data = loadClassData(fileName);
+		} catch( IOException e ) {
+		    System.out.println(e);
+		    throw new ClassNotFoundException(e.getMessage());
+		}
+		
+		loadedClass = defineClass(name,data, 0, data.length);
+		
+		if ( loadedClass == null ) {
+		    System.out.println("loadedClass == null");
+		    throw new ClassNotFoundException("Could not load " + name);
+		} else {
+		    resolveClass(loadedClass);
+		}
+	    } else {
+		//Found loaded system class
+	    }
+	} else {
+	    //Found loaded class
+	}
+	
+	return loadedClass;
+    }
+    
+    /**
+     * Loads binary class data from disk.
+     *
+     * @param fileName file name
+     * @return bytecodes
+     */
+    private byte[] loadClassData(String fileName) throws IOException {
+	File file = new File(fileName);
+	byte buffer[] = new byte[(int)file.length()];
+	
+	FileInputStream in = new FileInputStream(file);
+	DataInputStream dataIn = new DataInputStream(in);
+	
+	dataIn.readFully(buffer);
+	dataIn.close();
+	
+	return buffer;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+

src/dmdirc/plugins/PluginManager.java

@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+package dmdirc.plugins;
+
+import dmdirc.parser.IRCParser;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
+
+public class PluginManager {
+    
+    private Hashtable<String, AbstractPlugin> loadedPlugins = null;
+    
+    public PluginManager(IRCParser parser) {
+	loadedPlugins = new Hashtable<String, AbstractPlugin>();
+    }
+    
+    public void forwardCallback() {
+    }
+    
+    public boolean addPlugin(String pluginClassName, AbstractPlugin plugin) {
+	if( !loadedPlugins.containsKey(pluginClassName) ) {
+	    loadedPlugins.put(pluginClassName,plugin);
+	    
+	    plugin.onLoad();
+	} else {
+	    return false;
+	}
+	plugin.start();
+	return true;
+    }
+    
+    protected synchronized boolean removePlugin(AbstractPlugin plugin) {
+	if(loadedPlugins.contains(plugin) ) {
+	    
+	    ClassLoader loader = plugin.getClass().getClassLoader();
+	    loader = null;
+	    plugin = null;
+	    
+	    System.gc();
+	    
+	    loadedPlugins.remove(plugin);
+	    return true;
+	}
+	
+	return false;
+    }
+    
+    public void stopPlugin(String pluginClassName) {
+	AbstractPlugin plugin = null;
+	
+	if( loadedPlugins.containsKey(pluginClassName) ) {
+	    plugin = (AbstractPlugin)loadedPlugins.get(pluginClassName);
+	    plugin.onUnload();
+	    plugin.stopPlugin();
+	}
+    }
+    public void stopPlugin(AbstractPlugin plugin) {
+	if( loadedPlugins.contains(plugin) ) {
+	    plugin.onUnload();
+	    plugin.stopPlugin();
+	}
+    }
+}