Chat and global commands

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.chat;
 
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
@@ -48,11 +49,11 @@ public final class Me extends ChatCommand implements ValidatingCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final MessageTarget target, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "me", "<action>");
         } else {
-            target.sendAction(implodeArgs(args));
+            target.sendAction(args.getArgumentsAsString());
         }
     }
     

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Main;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -50,8 +51,8 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        final String command = implodeArgs(args);
+            final CommandArguments args) {
+        final String command = args.getArgumentsAsString();
         
         final InputWindow window = (InputWindow) Main.getUI().getActiveWindow();
         

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

@@ -26,6 +26,7 @@ import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -55,15 +56,15 @@ public final class AliasCommand extends GlobalCommand implements
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-                        final String... args) {
-        if (args.length < 2) {
+                        final CommandArguments args) {
+        if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "alias", "[--remove] <name> [command]");
             return;
         }
 
-        if (args[0].equalsIgnoreCase("--remove")) {
-            final String name = args[1].charAt(0) == CommandManager.getCommandChar()
-                ? args[1].substring(1) : args[1];
+        if (args.getArguments()[0].equalsIgnoreCase("--remove")) {
+            final String name = args.getArguments()[1].charAt(0) == CommandManager.getCommandChar()
+                ? args.getArguments()[1].substring(1) : args.getArguments()[1];
 
             if (doRemove(name)) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Alias '" + name +
@@ -76,8 +77,8 @@ public final class AliasCommand extends GlobalCommand implements
             return;
         }
 
-        final String name = args[0].charAt(0) == CommandManager.getCommandChar()
-                ? args[0].substring(0) : args[1];
+        final String name = args.getArguments()[0].charAt(0) == CommandManager.getCommandChar()
+                ? args.getArguments()[0].substring(0) : args.getArguments()[1];
 
         for (Action alias : AliasWrapper.getAliasWrapper()) {
             if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
@@ -89,7 +90,7 @@ public final class AliasCommand extends GlobalCommand implements
         }
 
         final Alias myAlias = new Alias(name);
-        myAlias.setResponse(new String[]{implodeArgs(1, args)});
+        myAlias.setResponse(new String[]{args.getArgumentsAsString(1)});
         myAlias.createAction().save();
 
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Alias '" + name +

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -49,8 +50,8 @@ public final class AllServers extends GlobalCommand implements IntelligentComman
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        final String command = implodeArgs(args);
+            final CommandArguments args) {
+        final String command = args.getArgumentsAsString();
         InputWindow window;
         
         for (Server target : ServerManager.getServerManager().getServers()) {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -49,7 +50,7 @@ public final class Clear extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent, 
-            final String... args) {
+            final CommandArguments args) {
         origin.clear();
     }
     

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Main;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -64,42 +65,42 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String ... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "debug", "<debug command> [options]");
-        } else if ("error".equals(args[0])) {
-            doError(args);
-        } else if ("showraw".equals(args[0])) {
+        } else if ("error".equals(args.getArguments()[0])) {
+            doError(args.getArguments());
+        } else if ("showraw".equals(args.getArguments()[0])) {
             doShowRaw(origin, isSilent);
-        } else if ("configstats".equals(args[0])) {
+        } else if ("configstats".equals(args.getArguments()[0])) {
             doConfigStats(origin, isSilent);
-        } else if ("configinfo".equals(args[0])) {
+        } else if ("configinfo".equals(args.getArguments()[0])) {
             doConfigInfo(origin, isSilent);
-        } else if ("globalconfiginfo".equals(args[0])) {
+        } else if ("globalconfiginfo".equals(args.getArguments()[0])) {
             doGlobalConfigInfo(origin, isSilent);
-        } else if ("colourspam".equals(args[0])) {
+        } else if ("colourspam".equals(args.getArguments()[0])) {
             doColourSpam(origin, isSilent);
-        } else if ("meminfo".equals(args[0])) {
+        } else if ("meminfo".equals(args.getArguments()[0])) {
             doMemInfo(origin, isSilent);
-        } else if ("rungc".equals(args[0])) {
+        } else if ("rungc".equals(args.getArguments()[0])) {
             doGarbage(origin, isSilent);
-        } else if ("threads".equals(args[0])) {
+        } else if ("threads".equals(args.getArguments()[0])) {
             doThreads(origin, isSilent);
-        } else if ("forceupdate".equals(args[0])) {
+        } else if ("forceupdate".equals(args.getArguments()[0])) {
             doForceUpdate();
-        } else if ("serverinfo".equals(args[0])) {
+        } else if ("serverinfo".equals(args.getArguments()[0])) {
             doServerInfo(origin, isSilent);
-        } else if ("serverstate".equals(args[0])) {
+        } else if ("serverstate".equals(args.getArguments()[0])) {
             doServerState(origin, isSilent);
-        } else if ("benchmark".equals(args[0])) {
+        } else if ("benchmark".equals(args.getArguments()[0])) {
             doBenchmark(origin);
-        } else if ("services".equals(args[0])) {
-            doServices(origin, isSilent, args);
-        } else if ("firstrun".equals(args[0])) {
+        } else if ("services".equals(args.getArguments()[0])) {
+            doServices(origin, isSilent, args.getArguments());
+        } else if ("firstrun".equals(args.getArguments()[0])) {
             Main.getUI().showFirstRunWizard();
-        } else if ("migration".equals(args[0])) {
+        } else if ("migration".equals(args.getArguments()[0])) {
             Main.getUI().showMigrationWizard();
-        } else if ("notify".equals(args[0])) {
+        } else if ("notify".equals(args.getArguments()[0])) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Current notification colour is: "
                     + origin.getContainer().getNotification());
         } else {

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Main;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -52,35 +53,36 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length > 0 && args[0].equalsIgnoreCase("--active")) {
+            final CommandArguments args) {
+        if (args.getArguments().length > 0
+                && args.getArguments()[0].equalsIgnoreCase("--active")) {
             final Window frame = Main.getUI().getActiveWindow();
             if (frame instanceof InputWindow) {
-                ((InputWindow) frame).addLine(FORMAT_OUTPUT, implodeArgs(1,
-                        args));
+                ((InputWindow) frame).addLine(FORMAT_OUTPUT, args.getArgumentsAsString(1));
             }
-        } else if (args.length > 1 && args[0].equalsIgnoreCase("--target")) {
+        } else if (args.getArguments().length > 1
+                && args.getArguments()[0].equalsIgnoreCase("--target")) {
             Window frame = null;
             Window target = origin;
 
             while (frame == null && target != null) {
-                frame = WindowManager.findCustomWindow(target, args[1]);
+                frame = WindowManager.findCustomWindow(target, args.getArguments()[1]);
                 target = WindowManager.getParent(target);
             }
 
             if (frame == null) {
-                frame = WindowManager.findCustomWindow(args[1]);
+                frame = WindowManager.findCustomWindow(args.getArguments()[1]);
             }
 
             if (frame == null) {
                 sendLine(origin, isSilent, FORMAT_ERROR,
                         "Unable to find target window");
             } else {
-                frame.addLine(FORMAT_OUTPUT, implodeArgs(2, args));
+                frame.addLine(FORMAT_OUTPUT, args.getArgumentsAsString(2));
             }
 
         } else {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, implodeArgs(args));
+            sendLine(origin, isSilent, FORMAT_OUTPUT, args.getArgumentsAsString());
         }
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Main;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -47,8 +48,8 @@ public final class Exit extends GlobalCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {                
-        Main.quit(args.length > 0 ? implodeArgs(args)
+            final CommandArguments args) {
+        Main.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));
     }
     

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
@@ -58,11 +59,11 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showAllCommands(origin, isSilent);
         } else {
-            showCommand(origin, isSilent, args[0]);
+            showCommand(origin, isSilent, args.getArguments()[0]);
         }
     }
     

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
@@ -54,15 +55,15 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length <= 1) {
+            final CommandArguments args) {
+        if (args.getArguments().length <= 1) {
             showUsage(origin, isSilent, "ifplugin", "<[!]plugin> <command>");
             return;
         }
         
-        final boolean negative = args[0].charAt(0) == '!';
+        final boolean negative = args.getArguments()[0].charAt(0) == '!';
         
-        final String pname = args[0].substring(negative ? 1 : 0);
+        final String pname = args.getArguments()[0].substring(negative ? 1 : 0);
         
         final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName(pname);
         
@@ -75,9 +76,9 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
         if (result != negative) {
             if (origin == null) {
                 GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
-                        implodeArgs(1, args));
+                        args.getArgumentsAsString(1));
             } else {
-                origin.getCommandParser().parseCommand(origin, implodeArgs(1, args));
+                origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(1));
             }
         }
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -50,15 +51,16 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "loadplugin", "<plugin>");
             return;
         }
 
         // Add previously unknown plugin to plugin manager
-        PluginManager.getPluginManager().addPlugin(args[0]);
-        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfo(args[0]);
+        PluginManager.getPluginManager().addPlugin(args.getArguments()[0]);
+        final PluginInfo plugin = PluginManager.getPluginManager()
+                .getPluginInfo(args.getArguments()[0]);
         
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin loading failed");

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.config.IdentityManager;
@@ -49,8 +50,8 @@ public final class NewServer extends GlobalCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "newserver", "<host[:[+]port]> [password]");
             return;
         }
@@ -62,7 +63,7 @@ public final class NewServer extends GlobalCommand {
         int offset = 0;
         
         // Check for SSL
-        if (args[offset].equalsIgnoreCase("--ssl")) {
+        if (args.getArguments()[offset].equalsIgnoreCase("--ssl")) {
             Logger.userError(ErrorLevel.LOW, 
                     "Using /newserver --ssl is deprecated, and may be removed in the future."
                     + " Use /newserver <host>:+<port> instead.");
@@ -72,8 +73,8 @@ public final class NewServer extends GlobalCommand {
         }
         
         // Check for port
-        if (args[offset].indexOf(':') > -1) {
-            final String[] parts = args[offset].split(":");
+        if (args.getArguments()[offset].indexOf(':') > -1) {
+            final String[] parts = args.getArguments()[offset].split(":");
             host = parts[0];
             
             if (parts[1].length() > 0 && parts[1].charAt(0) == '+') {
@@ -93,12 +94,12 @@ public final class NewServer extends GlobalCommand {
                 return;
             }            
         } else {
-            host = args[offset];
+            host = args.getArguments()[offset];
         }
         
         // Check for password
-        if (args.length > ++offset) {
-            pass = implodeArgs(offset, args);
+        if (args.getArguments().length > ++offset) {
+            pass = args.getArgumentsAsString(offset);
         }
         
         new Server(host, port, pass, ssl, IdentityManager.getProfiles().get(0));

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -52,13 +53,13 @@ public final class Notify extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "notify", "<colour>");
             return;
         }
         
-        final Color colour = ColourManager.parseColour(args[0], null);
+        final Color colour = ColourManager.parseColour(args.getArguments()[0], null);
         
         if (colour == null) {
             showUsage(origin, isSilent, "notify",

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.CustomWindow;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -49,11 +50,11 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
+            final CommandArguments args) {
         int start = 0;
         Window parent = null;
 
-        if (args.length > 0 && "--server".equals(args[0])) {
+        if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
             if (origin.getContainer().getServer() == null) {
                 sendLine(origin, isSilent, FORMAT_ERROR,
                         "This window doesn't have an associated server.");
@@ -62,31 +63,31 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
 
             parent = origin.getContainer().getServer().getFrame();
             start = 1;
-        } else if (args.length > 0 && "--child".equals(args[0])) {
+        } else if (args.getArguments().length > 0 && "--child".equals(args.getArguments()[0])) {
             parent = origin;
             start = 1;
         }
 
-        if (args.length == start || args[start].isEmpty()) {
+        if (args.getArguments().length == start || args.getArguments()[start].isEmpty()) {
             showUsage(origin, isSilent, "openwindow",
                     "[--server|--child] <name> [title]");
         } else {
             Window window;
             
             if (parent == null) {
-                window = WindowManager.findCustomWindow(args[start]);
+                window = WindowManager.findCustomWindow(args.getArguments()[start]);
             } else {
-                window = WindowManager.findCustomWindow(parent, args[start]);
+                window = WindowManager.findCustomWindow(parent, args.getArguments()[start]);
             }
             
-            final String title = args.length > start + 1 ? implodeArgs(
-                    start + 1, args) : args[start];
+            final String title = args.getArguments().length > start + 1 ?
+                args.getArgumentsAsString(start + 1): args.getArguments()[start];
 
             if (window == null) {
                 if (parent == null) {
-                    new CustomWindow(args[start], title);
+                    new CustomWindow(args.getArguments()[start], title);
                 } else {
-                    new CustomWindow(args[start], title, parent);
+                    new CustomWindow(args.getArguments()[start], title, parent);
                 }
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -48,7 +49,7 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     
     /** {@inheritDoc} */
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
+            final CommandArguments args) {
         ActionManager.loadActions();
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Actions reloaded.");
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -51,13 +52,13 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "reloadplugin", "<plugin>");
             return;
         }
         
-        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
+        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed - Plugin not loaded");
         } else if (PluginManager.getPluginManager().reloadPlugin(plugin.getRelativeFilename())) {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -48,25 +49,29 @@ public final class SaveConfig extends GlobalCommand implements IntelligentComman
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
+            final CommandArguments args) {
         IdentityManager.save();
         
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Configuration file saved.");
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "saveconfig";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "saveconfig - force the client to save its configuration to disk";
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -52,38 +53,43 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
+            final CommandArguments args) {
         int i = 0;
         
         Identity identity = IdentityManager.getConfigIdentity();
         ConfigManager manager = IdentityManager.getGlobalConfig();
         
-        if (args.length > 0 && "--server".equalsIgnoreCase(args[0]) && origin != null
+        if (args.getArguments().length > 0
+                && "--server".equalsIgnoreCase(args.getArguments()[0]) && origin != null
                 && origin.getContainer().getServer() != null) {
             i = 1;
             identity = origin.getContainer().getServer().getServerIdentity();
             manager = origin.getContainer().getServer().getConfigManager();
         }
         
-        switch (args.length - i) {
+        switch (args.getArguments().length - i) {
         case 0:
             doDomainList(origin, isSilent, manager);
             break;
         case 1:
-            doOptionsList(origin, isSilent, manager, args[i]);
+            doOptionsList(origin, isSilent, manager, args.getArguments()[i]);
             break;
         case 2:
-            doShowOption(origin, isSilent, manager, args[i], args[1 + i]);
+            doShowOption(origin, isSilent, manager, args.getArguments()[i],
+                    args.getArguments()[1 + i]);
             break;
         default:
-            if (args[i].equalsIgnoreCase("--unset")) {
-                doUnsetOption(origin, isSilent, identity, args[1 + i], args[2 + i]);
-            } else if (args[i].equalsIgnoreCase("--append") && args.length > 3 + i) {
-                doAppendOption(origin, isSilent, identity, manager, args[1 + i], args[2 + i],
-                        implodeArgs(3 + i, args));
+            if (args.getArguments()[i].equalsIgnoreCase("--unset")) {
+                doUnsetOption(origin, isSilent, identity, args.getArguments()[1 + i],
+                        args.getArguments()[2 + i]);
+            } else if (args.getArguments()[i].equalsIgnoreCase("--append")
+                    && args.getArguments().length > 3 + i) {
+                doAppendOption(origin, isSilent, identity, manager, 
+                        args.getArguments()[1 + i], args.getArguments()[2 + i],
+                        args.getArgumentsAsString(3 + i));
             } else {
-                doSetOption(origin, isSilent, identity, args[i], args[1 + i],
-                        implodeArgs(2 + i, args));
+                doSetOption(origin, isSilent, identity, args.getArguments()[i],
+                        args.getArguments()[1 + i], args.getArgumentsAsString(2 + i));
             }
         }
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -51,13 +52,14 @@ public final class UnloadPlugin extends GlobalCommand implements IntelligentComm
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length == 0) {
+            final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "unloadplugin", "<plugin>");
             return;
         }
         
-        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
+        final PluginInfo plugin = PluginManager.getPluginManager()
+                .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin unloading failed - Plugin not loaded");
         } else if (PluginManager.getPluginManager().delPlugin(plugin.getRelativeFilename())) {