Added skeleton dcop plugin

Added /loadplugin command
Made PluginManager a singleton

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

src/uk/org/ownage/dmdirc/commandparser/CommandManager.java

@@ -115,6 +115,7 @@ public final class CommandManager {
         new Help();
         new Join();
         new LoadFormatter();
+        new LoadPlugin();
         new Motd();
         new Nick();
         new Quit();

src/uk/org/ownage/dmdirc/commandparser/ServerCommand.java

@@ -37,5 +37,5 @@ public abstract class ServerCommand extends Command {
      * @param server The server instance that this command is being executed on
      * @param args Arguments passed to this command
      */
-    public abstract void execute(CommandWindow origin, Server server, String... args);
+    public abstract void execute(CommandWindow origin, Server server, String ... args);
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/LoadPlugin.java

@@ -0,0 +1,89 @@
+/*
+ * 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 uk.org.ownage.dmdirc.commandparser.commands.server;
+
+import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
+import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.plugins.PluginManager;
+import uk.org.ownage.dmdirc.ui.messages.Formatter;
+
+/**
+ * Allows the user to load a plugin.
+ * @author chris
+ */
+public final class LoadPlugin extends ServerCommand {
+    
+    /**
+     * Creates a new instance of LoadPlugin.
+     */
+    public LoadPlugin() {
+        super();
+        
+        CommandManager.registerCommand(this);
+    }
+    
+    /**
+     * Executes this command.
+     * @param origin The frame in which this command was issued
+     * @param server The server object that this command is associated with
+     * @param args The user supplied arguments
+     */
+    public void execute(final CommandWindow origin, final Server server,
+            final String... args) {
+        try {
+            PluginManager.getPluginManager().addPlugin(args[0], args[0]);
+            origin.addLine("Plugin loaded.");
+        } catch (Exception ex) {
+            origin.addLine("Load failed: " + ex.getMessage());
+        }
+    }
+    
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "loadplugin";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "loadplugin <class> - loads the specified class as a plugin";
+    }
+    
+}

src/uk/org/ownage/dmdirc/plugins/PluginManager.java

@@ -23,16 +23,11 @@
  */
 package uk.org.ownage.dmdirc.plugins;
 
-import java.util.Hashtable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Hashtable;
 
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
+import uk.org.ownage.dmdirc.Config;
 
 public class PluginManager {
 	/**
@@ -47,22 +42,33 @@ public class PluginManager {
 	/**
 	 * Directory where plugins are stored.
 	 */
-	 private String myDir;
-	
+	 private final String myDir;
+         
 	/**
-	 * Create a new PluginManager.
-	 */
-	public PluginManager() {
-		myDir = ".";
-	}
+         * Singleton instance of the plugin manager.
+         */
+         private static PluginManager me;
 	
 	/**
 	 * Create a new PluginManager.
 	 */
-	public PluginManager(final String directory) {
-		myDir = directory;
+	private PluginManager() {
+		final String fs = System.getProperty("file.separator");
+		myDir = Config.getConfigDir() + "plugins" + fs;
 	}
-	
+        
+        /**
+         * Retrieves the singleton instance of the plugin manager.
+         * @return A singleton instance of PluginManager.
+         */
+        public final static synchronized PluginManager getPluginManager() {
+            if (me == null) {
+                me = new PluginManager();
+            }
+            
+            return me;
+        }
+		
 	/**
 	 * Add a new plugin.
 	 *

src/uk/org/ownage/dmdirc/plugins/plugins/dcop/DcopPlugin.java

@@ -0,0 +1,86 @@
+/*
+ * 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 uk.org.ownage.dmdirc.plugins.plugins.dcop;
+
+import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
+import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import uk.org.ownage.dmdirc.plugins.Plugin;
+
+/**
+ * Allows the user to execute dcop commands (and read the results).
+ * @author chris
+ */
+public class DcopPlugin implements Plugin {
+    
+    /** Creates a new instance of DcopPlugin */
+    public DcopPlugin() {
+        
+    }
+    
+    public void onLoad() {
+        CommandManager.registerCommand(new ServerCommand() {
+            public void execute(CommandWindow origin, Server server, String ... args) {
+                origin.addLine("dcop test");
+            }
+            public int getArity() {
+                return 0;
+            }
+            public String getHelp() {
+                return null;
+            }
+            public String getName() {
+                return "dcoptest";
+            }
+            public boolean isPolyadic() {
+                return false;
+            }
+            public boolean showInHelp() {
+                return false;
+            }
+        });
+    }
+    
+    public void onUnload() {
+    }
+    
+    public void onActivate() {
+    }
+    
+    public void onDeactivate() {
+    }
+    
+    public int getVersion() {
+        return 0;
+    }
+    
+    public String getAuthor() {
+        return "Chris 'MD87' Smith - chris@dmdirc.com";
+    }
+    
+    public String getDescription() {
+        return "Provides commands to interface with DCOP applications";
+    }
+    
+}