ValidatingCommand and WrappableCommand now use CommandArguments

/me now takes its two \001s into account (fixes issue 2291)
Removed deprecated implodeArgs methods

src/com/dmdirc/commandparser/commands/Command.java

@@ -38,37 +38,6 @@ public abstract class Command {
     
     /** The format name used for command errors. */
     protected static final String FORMAT_ERROR = "commandError";
-               
-    /**
-     * Implodes the given list of arguments.
-     * @param offset The index to start at
-     * @param args The arguments to implode
-     * @return A string containing each argument seperated by a space
-     * @deprecated Should be no need for this now
-     */
-    @Deprecated
-    protected static final String implodeArgs(final int offset, final String... args) {
-        String res = "";
-        for (int i = offset; i < args.length; i++) {
-            if (res.isEmpty()) {
-                res = args[i];
-            } else {
-                res = res.concat(" " + args[i]);
-            }
-        }
-        return res;
-    }
-    
-    /**
-     * Implodes the given list of arguments.
-     * @param args The arguments to implode
-     * @return A string containing each argument seperated by a space
-     * @deprecated Should be no need for this now
-     */
-    @Deprecated
-    protected static final String implodeArgs(final String... args) {
-        return implodeArgs(0, args);
-    } 
     
     /**
      * Sends a line, if appropriate, to the specified target.

src/com/dmdirc/commandparser/commands/ValidatingCommand.java

@@ -21,11 +21,10 @@
  */
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Validating commands are capable of validating their arguments to determine
  * whether the input would be valid or not.
@@ -40,7 +39,8 @@ public interface ValidatingCommand {
      * @param origin The window the command is being executed in
      * @param arguments The arguments that the user has entered (so far)
      * @return A validation response indicating the validity of the arguments
+     * @since 0.6.3
      */
-    ValidationResponse validateArguments(InputWindow origin, List<String> arguments);
+    ValidationResponse validateArguments(InputWindow origin, CommandArguments arguments);
 
 }

src/com/dmdirc/commandparser/commands/WrappableCommand.java

@@ -22,10 +22,9 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Wrapping commands are commands whose arguments may be wrapped into multiple
  * lines when sending.
@@ -41,7 +40,8 @@ public interface WrappableCommand {
      * @param origin The window the command is being executed in
      * @param arguments The arguments that the user has entered (so far)
      * @return The number of lines that the arguments will result in
+     * @since 0.6.3
      */
-    int getLineCount(InputWindow origin, List<String> arguments);
+    int getLineCount(InputWindow origin, CommandArguments arguments);
 
 }

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -78,13 +78,13 @@ public final class Me extends ChatCommand implements ValidatingCommand {
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validateArguments(final InputWindow origin, 
-            final List<String> arguments) {
+            final CommandArguments arguments) {
         if (origin.getContainer().getServer() == null
                 || origin.getContainer().getServer().getParser() == null) {
             return new ValidationResponse();
         }
         
-        final int length = implodeArgs(arguments.toArray(new String[arguments.size()])).length();
+        final int length = 2 + arguments.getArgumentsAsString().length();
         
         if (origin.getContainer().getServer().getParser().getMaxLength("PRIVMSG",
                 origin.getContainer().toString()) <= length) {

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -106,12 +106,11 @@ public final class Message extends ServerCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public int getLineCount(final InputWindow origin, final List<String> arguments) {
-        if (arguments.size() >= 2) {
-            final String target = arguments.get(0);
+    public int getLineCount(final InputWindow origin, final CommandArguments arguments) {
+        if (arguments.getArguments().length >= 2) {
+            final String target = arguments.getArguments()[0];
             return origin.getContainer().getServer().getNumLines("PRIVMSG "
-                    + target + " :" + implodeArgs(1,
-                    arguments.toArray(new String[arguments.size()])));
+                    + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;
         }

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -116,12 +116,11 @@ public final class OpenQuery extends ServerCommand implements
     
     /** {@inheritDoc} */
     @Override
-    public int getLineCount(final InputWindow origin, final List<String> arguments) {
-        if (arguments.size() >= 2) {
-            final String target = arguments.get(0);
+    public int getLineCount(final InputWindow origin, final CommandArguments arguments) {
+        if (arguments.getArguments().length >= 2) {
+            final String target = arguments.getArguments()[0];
             return origin.getContainer().getServer().getNumLines("PRIVMSG "
-                    + target + " :" + implodeArgs(1,
-                    arguments.toArray(new String[arguments.size()])));
+                    + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;
         }

src/com/dmdirc/parser/irc/ChannelClientInfo.java

@@ -32,7 +32,7 @@ import java.util.Map;
  * @author Chris Smith
  * @see IRCParser
  */
-public final class ChannelClientInfo {
+public class ChannelClientInfo {
 	/** Reference to ClientInfo object this represents. */
 	private final ClientInfo cClient;
 	/** Integer representation of the channel modes assocated with this user. */

src/com/dmdirc/ui/input/InputHandler.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.input;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
@@ -45,7 +46,6 @@ import com.dmdirc.util.RollingList;
 import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -215,11 +215,11 @@ public abstract class InputHandler implements ConfigChangeListener {
      */
     protected void validateText() {
         final String text = target.getText();
-        
-        if (!text.isEmpty() && text.charAt(0) == CommandManager.getCommandChar()) {
-            final List<String> args = Arrays.asList(text.split(" "));
-            final String signature = args.get(0).substring(1);
-            final Command command = CommandManager.getCommand(signature);
+
+        final CommandArguments args = new CommandArguments(text);
+
+        if (args.isCommand()) {
+            final Command command = CommandManager.getCommand(args.getCommandName());
             
             if (command instanceof ValidatingCommand) {
                 final ValidationResponse vr