* Added me and me/0 commands

* Updated command parser to create a new set of arguments for passing to Commands
* Updated Command to include a protected method to implode arguments
* Updated Quit command to actually use the user supplied method
* Updated Channel class to include a method to send an action

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

src/uk/org/ownage/dmdirc/Channel.java

@@ -79,6 +79,11 @@ public class Channel implements IRCParser.IChannelMessage,
         frame.addLine("> "+line);
     }
     
+    public void sendAction(String action) {
+        channelInfo.sendAction(action);
+        frame.addLine("*> "+action);
+    }    
+    
     public void onChannelMessage(IRCParser tParser, ChannelInfo cChannel,
             ChannelClientInfo cChannelClient, String sMessage, String sHost) {
         if (cChannelClient != null) {

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

@@ -91,4 +91,21 @@ public abstract class Command {
         return name+" "+arguments+" - "+description;
     }
     
+    /**
+     * Implodes the given list of arguments
+     * @param args The arguments to implode
+     * @return A string containing each argument seperated by a space
+     */
+    protected String implodeArgs(String... args) {
+        String res = "";
+        for (int i = 0; i < args.length; i++) {
+            if (res.equals("")) {
+                res = args[i];
+            } else {
+                res = res.concat(" "+args[i]);
+            }
+        }
+        return res;
+    }
+    
 }

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

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser;
 import java.util.Vector;
 import uk.org.ownage.dmdirc.commandparser.commands.*;
 import uk.org.ownage.dmdirc.commandparser.commands.server.*;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.*;
 
 /**
  * The command manager creates and manages a single instance of all commands,
@@ -50,6 +51,8 @@ public class CommandManager {
         if (channelCommands == null) {
             channelCommands = new Vector<Command>(0,1);
             
+            channelCommands.add(new Me());
+            channelCommands.add(new MeEmpty());
         }
         
         for (Command com : channelCommands) {

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

@@ -63,22 +63,30 @@ abstract public class CommandParser {
     public void parseCommand(CommandWindow origin, String line) {
         if (line.charAt(0) == Config.getOption("general","commandchar").charAt(0)) {
             String[] args = line.split(" ");
+            String[] comargs;
+            String command;
             
             assert(args.length > 0);
             
-            String command = args[0].substring(1);
+            command = args[0].substring(1);
             
-            String signature = command+"/"+(args.length-1);
+            comargs = new String[args.length-1];
+            
+            for (int i = 1; i < args.length; i++) {
+                comargs[i-1] = args[i];
+            }
+            
+            String signature = command+"/"+(comargs.length);
             
             // Check the specific signature first, so that polyadic commands can
             // have error handlers if there are too few arguments (e.g., msg/0 and
             // msg/1 would return errors, so msg only gets called with 2+ args).
             if (commands.containsKey(signature)) {
-                executeCommand(origin, commands.get(signature), args);
+                executeCommand(origin, commands.get(signature), comargs);
             } else if (commands.containsKey(command)) {
-                executeCommand(origin, commands.get(command), args);
+                executeCommand(origin, commands.get(command), comargs);
             } else {
-                handleInvalidCommand(origin, command, args);
+                handleInvalidCommand(origin, command, comargs);
             }
         } else {
             handleNonCommand(origin, line);

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Me.java

@@ -0,0 +1,50 @@
+/*
+ * 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.channel;
+
+import uk.org.ownage.dmdirc.Channel;
+import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+
+/**
+ *
+ * @author chris
+ */
+public class Me extends ChannelCommand {
+    
+    /** Creates a new instance of Me */
+    public Me() {
+        description = "sends an action to the current channel";
+        arguments = "<action>";
+        polyadic = true;
+        arity = 0;
+        name = "me";
+        show = true;
+    }
+
+    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
+        channel.sendAction(implodeArgs(args));
+    }
+    
+}

src/uk/org/ownage/dmdirc/commandparser/commands/channel/MeEmpty.java

@@ -0,0 +1,51 @@
+/*
+ * 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.channel;
+
+import uk.org.ownage.dmdirc.Channel;
+import uk.org.ownage.dmdirc.Config;
+import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+
+/**
+ *
+ * @author chris
+ */
+public class MeEmpty extends ChannelCommand {
+    
+    /** Creates a new instance of Me */
+    public MeEmpty() {
+        description = "informs the user of the correct usage of the me command";
+        arguments = "";
+        polyadic = false;
+        arity = 0;
+        name = "me";
+        show = true;
+    }
+
+    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
+        origin.addLine("Usage: "+Config.getOption("general","commandchar")+"me <action>");
+    }
+    
+}

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

@@ -45,10 +45,9 @@ public class Quit extends ServerCommand {
         name = "quit";
         show = true;
     }
-
+    
     public void execute(CommandWindow origin, Server server, String... args) {
-        // TODO: Read proper quit reason
-        ServerManager.getServerManager().disconnectAll("...");
+        ServerManager.getServerManager().disconnectAll(implodeArgs(args));
         Config.save();
         System.exit(0);
     }