Merge branch 'command-abstraction'

Fixes issue 2209
Fixes issue 2210
Fixes issue 1453
Fixes issue 1975

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.audio;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -43,16 +44,11 @@ public final class AudioCommand extends GlobalCommand {
 		CommandManager.registerCommand(this);
 	}
 		
-	/**
-	 * Executes this command.
-	 *
-	 * @param origin The frame in which this command was issued
-	 * @param isSilent Whether this command is silenced or not
-	 * @param args The user supplied arguments
-	 */
+	/** {@inheritDoc} */
     @Override
-	public void execute(final InputWindow origin, final boolean isSilent, final String... args) {
-		final String filename = implodeArgs(args);
+	public void execute(final InputWindow origin, final boolean isSilent,
+            final CommandArguments args) {
+		final String filename = args.getArgumentsAsString();
 		final File file = new File(filename);
 		if (file.exists()) {
 			if (AudioPlayer.isValid(file)) {

src/com/dmdirc/addons/audio/BeepCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.audio;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -43,15 +44,10 @@ public final class BeepCommand extends GlobalCommand {
 		CommandManager.registerCommand(this);
 	}
 		
-	/**
-	 * Executes this command.
-	 *
-	 * @param origin The frame in which this command was issued
-	 * @param isSilent Whether this command is silenced or not
-	 * @param args The user supplied arguments
-	 */
+	/** {@inheritDoc} */
     @Override
-	public void execute(final InputWindow origin, final boolean isSilent, final String... args) {
+	public void execute(final InputWindow origin, final boolean isSilent,
+            final CommandArguments args) {
 		Toolkit.getDefaultToolkit().beep();
 	}
 

src/com/dmdirc/addons/dcc/DCCChatWindow.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.Main;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 
 /**
  * This class links DCC Chat objects to a window.
@@ -57,7 +58,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
 		nickname = nick;
 		otherNickname = targetNick;
 		
-		myWindow = Main.getUI().getInputWindow(this, getDCCCommandParser());
+		myWindow = Main.getUI().getInputWindow(this, GlobalCommandParser.getGlobalCommandParser());
 		plugin.addWindow(this);
 		
 		myWindow.setTitle(title);

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -37,6 +37,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 
+import com.dmdirc.commandparser.CommandArguments;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
@@ -66,19 +67,13 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 		CommandManager.registerCommand(this);
 	}
 		
-	/**
-	 * Executes this command.
-	 *
-	 * @param origin The frame in which this command was issued
-	 * @param server The server instance that this command is being executed on
-	 * @param isSilent Whether this command is silenced or not
-	 * @param args The user supplied arguments
-	 */
+	/** {@inheritDoc} */
 	@Override
-	public void execute(final InputWindow origin, final Server server, final boolean isSilent, final String... args) {
-		if (args.length > 1) {
-			final String type = args[0];
-			final String target = args[1];
+	public void execute(final InputWindow origin, final Server server,
+            final boolean isSilent, final CommandArguments args) {
+		if (args.getArguments().length > 1) {
+			final String type = args.getArguments()[0];
+			final String target = args.getArguments()[1];
 			final IRCParser parser = server.getParser();
 			final String myNickname = parser.getMyNickname();
 				
@@ -112,7 +107,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 					sendLine(origin, isSilent, "DCCChatError", "Unable to start chat with "+target+" - unable to create listen socket");
 				}
 			} else if (type.equalsIgnoreCase("send")) {
-				sendFile(target, origin, server, isSilent, args);
+				sendFile(target, origin, server, isSilent, args.getArgumentsAsString(2));
 			} else {
 				sendLine(origin, isSilent, FORMAT_ERROR, "Unknown DCC Type: '"+type+"'");
 			}
@@ -128,11 +123,12 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 	 * @param origin The InputWindow this command was issued on
 	 * @param server The server instance that this command is being executed on
 	 * @param isSilent Whether this command is silenced or not
-	 * @param args Arguments passed.
+	 * @param filename The file to send
+     * @since 0.6.3
 	 */
-	public void sendFile(final String target, final InputWindow origin, final Server server, final boolean isSilent, final String... args) {
+	public void sendFile(final String target, final InputWindow origin, final Server server, final boolean isSilent, final String filename) {
 		// New thread to ask the user what file to send
-		final File givenFile = new File(implodeArgs(2, args));
+		final File givenFile = new File(filename);
 		final Thread dccThread = new Thread(new Runnable() {
 			/** {@inheritDoc} */
 			@Override

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -24,10 +24,7 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.IdentityManager;
@@ -69,10 +66,11 @@ public abstract class DCCFrame extends WritableFrameContainer {
 			 *
 			 * @return This window's command parser
 			 */
-        @Override
+            @Override
 			public final CommandParser getCommandParser() {
 				return GlobalCommandParser.getGlobalCommandParser();
 			}
+            
 			/** {@inheritDoc} */
 			@Override
 			public PopupType getNicknamePopupType() {
@@ -103,47 +101,6 @@ public abstract class DCCFrame extends WritableFrameContainer {
 				//Add no custom popup items
 			}
 	}
-	
-	/**
-	 * DCC CommandParser
-	 */
-	private static class DCCCommandParser extends CommandParser {
-		/** A version number for this class. */
-		private static final long serialVersionUID = 200711271;
-		
-		/** Loads the relevant commands into the parser. */
-		@Override
-		protected void loadCommands() { CommandManager.loadGlobalCommands(this); }
-		
-		/**
-		 * Executes the specified command with the given arguments.
-		 *
-		 * @param origin The window in which the command was typed
-		 * @param isSilent Whether the command is being silenced or not
-		 * @param command The command to be executed
-		 * @param args The arguments to the command
-		 */
-		@Override
-		protected void executeCommand(final InputWindow origin, final boolean isSilent, final Command command, final String... args) {
-			((GlobalCommand) command).execute(origin, isSilent, args);
-		}
-		
-		/**
-		 * Called when the input was a line of text that was not a command.
-		 * This normally means it is sent to the server/channel/user as-is, with
-		 * no further processing.
-		 *
-		 * @param origin The window in which the command was typed
-		 * @param line The line input by the user
-		 */
-		@Override
-		protected void handleNonCommand(final InputWindow origin, final String line) {
-			origin.getContainer().sendLine(line);
-		}
-	}
-	
-	/** The singleton instance of the DCC command parser. */
-	private static DCCCommandParser myDCCCommandParser;
 
 	/** The window title. */
 	protected final String title;
@@ -185,18 +142,6 @@ public abstract class DCCFrame extends WritableFrameContainer {
 		}
 	}
 	
-	/**
-	 * Retrieves a singleton instance of the DCC command parser.
-	 *
-	 * @return A DCCCommandParser
-	 */
-	static synchronized DCCCommandParser getDCCCommandParser() {
-		if (myDCCCommandParser == null) {
-			myDCCCommandParser = new DCCCommandParser();
-		}
-		return myDCCCommandParser;
-	}
-	
 	/**
 	 * Sends a line of text to this container's source.
 	 *

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.dcop;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -43,23 +44,17 @@ public final class DcopCommand extends ServerCommand {
         
         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 isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+
+    /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        if (args.length != 3) {
+            final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length != 3) {
             showUsage(origin, isSilent, "dcop", "<app> <object> <function>");
             return;
         }
         
-        final List<String> res = DcopPlugin.getDcopResult("dcop " + implodeArgs(args));
+        final List<String> res = DcopPlugin.getDcopResult("dcop " + args.getArgumentsAsString());
         for (String line : res) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, line);
         }

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dns;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -44,21 +45,25 @@ public final class DNSCommand 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, "dns", "<IP|hostname>");
             return;
         }
         
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolving: " + args[0]);
+        sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolving: " + args.getArguments()[0]);
         new Timer("DNS Command Timer").schedule(new TimerTask() {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if (args[0].matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: " + args[0] + ": " + DNSPlugin.getHostname(args[0]));
+                if (args.getArguments()[0].matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) {
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: "
+                            + args.getArguments()[0] + ": "
+                            + DNSPlugin.getHostname(args.getArguments()[0]));
                 } else {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: " + args[0] + ": " + DNSPlugin.getIPs(args[0]));
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: "
+                            + args.getArguments()[0] + ": "
+                            + DNSPlugin.getIPs(args.getArguments()[0]));
                 }
             }
         }, 0);

src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -48,16 +49,10 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 		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 isSilent Whether this command is silenced or not
-	 * @param args The user supplied arguments
-	 */
+    /** {@inheritDoc} */
     @Override
-	public void execute(final InputWindow origin, final Server server, final boolean isSilent, final String... args) {
+	public void execute(final InputWindow origin, final Server server,
+            final boolean isSilent, final CommandArguments args) {
 		final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
 		if (pluginInfo == null) { 
 			sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
@@ -72,23 +67,23 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 		
 		final LoggingPlugin plugin = (LoggingPlugin) gotPlugin;
 		
-		if (args.length > 0) {
-			if (args[0].equalsIgnoreCase("reload")) {
+		if (args.getArguments().length > 0) {
+			if (args.getArguments()[0].equalsIgnoreCase("reload")) {
 				if (PluginManager.getPluginManager().reloadPlugin(pluginInfo.getFilename())) {
 					sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin reloaded.");
 				} else {
 					sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
 				}
-			} else if (args[0].equalsIgnoreCase("history")) {
+			} else if (args.getArguments()[0].equalsIgnoreCase("history")) {
 				if (!plugin.showHistory(origin)) {
 					sendLine(origin, isSilent, FORMAT_ERROR, "Unable to open history for this window.");
     		}
-			} else if (args[0].equalsIgnoreCase("help")) {
+			} else if (args.getArguments()[0].equalsIgnoreCase("help")) {
 				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " reload           - Reload the logging plugin.");
 				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " history          - Open the history of this window, if available.");
 				sendLine(origin, isSilent, FORMAT_OUTPUT, getName() + " help             - Show this help.");
 			} else {
-				sendLine(origin, isSilent, FORMAT_ERROR, "Unknown command '" + args[0] + "'. Use " + getName() + " help for a list of commands.");
+				sendLine(origin, isSilent, FORMAT_ERROR, "Unknown command '" + args.getArguments()[0] + "'. Use " + getName() + " help for a list of commands.");
 			}
 		} else {
 			sendLine(origin, isSilent, FORMAT_ERROR, "Use " + getName() + " help for a list of commands.");

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.nowplaying;
 
 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.IntelligentCommand;
@@ -59,12 +60,14 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final String ... args) {
-        if (args.length > 0 && args[0].equalsIgnoreCase("--sources")) {
+            final MessageTarget target, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length > 0 && args.getArguments()[0]
+                .equalsIgnoreCase("--sources")) {
             doSourceList(origin, isSilent);
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("--source")) {
-            if (args.length > 1) {
-                final String sourceName = args[1];
+        } else if (args.getArguments().length > 0 && args.getArguments()[0]
+                .equalsIgnoreCase("--source")) {
+            if (args.getArguments().length > 1) {
+                final String sourceName = args.getArguments()[1];
                 final MediaSource source = parent.getSource(sourceName);
                 
                 if (source == null) {

src/com/dmdirc/addons/osd/OsdCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.osd;
 
+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,12 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
-        if (args.length > 0 && "--close".equalsIgnoreCase(args[0])) {
+            final CommandArguments args) {
+        if (args.getArguments().length > 0
+                && "--close".equalsIgnoreCase(args.getArguments()[0])) {
             OsdWindow.closeAll();
         } else {
-            new OsdWindow(Styliser.stipControlCodes(implodeArgs(args)), false);
+            new OsdWindow(Styliser.stipControlCodes(args.getArgumentsAsString()), false);
         }
     }
     

src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.redirect;
 
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -46,9 +47,9 @@ public class RedirectCommand extends ChatCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final String... args) {
+            final MessageTarget target, final boolean isSilent, final CommandArguments args) {
         target.getFrame().getCommandParser().parseCommand(new FakeInputWindow(target),
-                implodeArgs(args));
+                args.getArgumentsAsString());
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/systray/PopupCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.systray;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -52,8 +53,8 @@ public final class PopupCommand extends ServerCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String ... args) {
-        parent.notify("DMDirc", implodeArgs(args));
+            final boolean isSilent, final CommandArguments args) {
+        parent.notify("DMDirc", args.getArgumentsAsString());
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/time/TimerCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.time;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -47,17 +48,17 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent, 
-            final String... args) {
-        if (args.length < 3) {
+            final CommandArguments args) {
+        if (args.getArguments().length < 3) {
             doUsage(origin, isSilent);
         } else {
             int repetitions = 0;
             int interval = 0;
-            final String command = implodeArgs(2, args);
+            final String command = args.getArgumentsAsString(2);
             
             try {
-                repetitions = Integer.parseInt(args[0]);
-                interval = Integer.parseInt(args[1]);
+                repetitions = Integer.parseInt(args.getArguments()[0]);
+                interval = Integer.parseInt(args.getArguments()[1]);
             } catch (NumberFormatException ex) {
                 doUsage(origin, isSilent);
                 return;

src/com/dmdirc/addons/urlcatcher/UrlListCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.urlcatcher;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -44,7 +45,7 @@ public class UrlListCommand extends GlobalCommand implements IntelligentCommand
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final boolean isSilent,
-            final String... args) {
+            final CommandArguments args) {
         final String[] headers = {"URL", "Count"};
         final Map<String, Integer> map = plugin.getURLS();
         final String[][] data = new String[map.size()][];

src/com/dmdirc/commandparser/CommandArguments.java

@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2006-2009 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 com.dmdirc.commandparser;
+
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Represents a command and its arguments. In this class, input is split into
+ * 'words' which are separated by any number of whitespace characters;
+ * 'arguments' are the same but exclude the first word, which will normally be
+ * the command name.
+ *
+ * @since 0.6.3
+ * @author chris
+ */
+public class CommandArguments {
+
+    /** The raw line that was input. */
+    private final String line;
+
+    /** The line split into whitespace-delimited words. */
+    private String[] words;
+
+    /**
+     * Creates a new command arguments parser for the specified line.
+     *
+     * @param line The line to be parsed
+     */
+    public CommandArguments(final String line) {
+        this.line = line;
+    }
+
+    /**
+     * Retrieves the raw line that was input, including any command character(s)
+     * and names.
+     *
+     * @return The raw line entered
+     */
+    public String getLine() {
+        return line;
+    }
+
+    /**
+     * Retrieves the raw line that was input, including the command name but
+     * stripped of any command characters.
+     *
+     * @return The raw line entered, without command chars
+     */
+    public String getStrippedLine() {
+        final int offset = isCommand() ? isSilent() ? 2 : 1 : 0;
+
+        return line.substring(offset);
+    }
+
+    /**
+     * Retrieves the input split into distinct, whitespace-separated words. The
+     * first item in the array will be the command name complete with any
+     * command characters.
+     *
+     * @return An array of 'words' that make up the input
+     */
+    public String[] getWords() {
+        parse();
+        
+        return words;
+    }
+
+    /**
+     * Retrieves the arguments to the command split into disticnt,
+     * whitespace-separated words.
+     *
+     * @return An array of 'words' that make up the command's arguments
+     */
+    public String[] getArguments() {
+        parse();
+
+        return Arrays.copyOfRange(words, 1, words.length);
+    }
+
+    /**
+     * Retrieves all the arguments to the command (i.e., not including the
+     * command name) with their original whitespace separation preserved.
+     *
+     * @return A String representation of the command arguments
+     */
+    public String getArgumentsAsString() {
+        parse();
+        
+        return getArgumentsAsString(0);
+    }
+
+    /**
+     * Retrieves arguments to the command (i.e., not including the
+     * command name) starting with the specified argument, with their original
+     * whitespace separation preserved.
+     *
+     * @param start The index of the first argument to include
+     * @return A String representation of the command arguments
+     */
+    public String getArgumentsAsString(final int start) {
+        parse();
+
+        return getWordsAsString(start + 1);
+    }
+
+    /**
+     * Retrieves the specified words with their original whitespace separation
+     * preserved.
+     *
+     * @param start The index of the first word to include (starting at 0)
+     * @return A String representation of the requested words
+     */
+    public String getWordsAsString(final int start) {
+        return getWordsAsString(start, words.length);
+    }
+
+    /**
+     * Retrieves the specified words with their original whitespace separation
+     * preserved.
+     *
+     * @param start The index of the first word to include (starting at 0)
+     * @param end The index of the last word to include
+     * @return A String representation of the requested words
+     */
+    public String getWordsAsString(final int start, final int end) {
+        final Pattern pattern = Pattern.compile("(\\S+\\s*){" + (start) + "}"
+                + "((\\S+\\s*){" + (end - start) + "}).*?");
+        final Matcher matcher = pattern.matcher(line);
+
+        return matcher.matches() ? matcher.group(2) : "";
+    }
+
+    /**
+     * Parses the input into a set of words, if it has not been done before.
+     */
+    protected synchronized void parse() {
+        if (words == null) {
+            words = line.split("\\s+");
+        }
+    }
+
+    /**
+     * Determines if the input was a command or not.
+     *
+     * @return True if the input was a command, false otherwise
+     */
+    public boolean isCommand() {
+        return !line.isEmpty() && line.charAt(0) == CommandManager.getCommandChar();
+    }
+
+    /**
+     * Determines if the input was a silenced command or not.
+     *
+     * @return True if the input was a silenced command, false otherwise
+     */
+    public boolean isSilent() {
+        return isCommand() && line.length() >= 2 &&
+                line.charAt(1) == CommandManager.getSilenceChar();
+    }
+
+    /**
+     * Retrieves the name of the command that was used.
+     *
+     * @return The command name used
+     */
+    public String getCommandName() {
+        final int offset = isCommand() ? isSilent() ? 2 : 1 : 0;
+        return getWords()[0].substring(offset);
+    }
+
+}

src/com/dmdirc/commandparser/CommandInfo.java

@@ -27,30 +27,34 @@ package com.dmdirc.commandparser;
  * 
  * @author chris
  */
-public abstract class CommandInfo {
+public interface CommandInfo {
           
     /**
      * Returns this command's name.
+     *
      * @return The name of this command
      */
-    public abstract String getName();
+    String getName();
     
     /**
      * Returns whether or not this command should be shown in help messages.
+     *
      * @return True iff the command should be shown, false otherwise
      */
-    public abstract boolean showInHelp();
+    boolean showInHelp();
     
     /**
      * Returns a string representing the help message for this command.
+     *
      * @return the help message for this command
      */
-    public abstract String getHelp();
+    String getHelp();
     
     /**
      * Retrieves the type of this command.
+     *
      * @return This command's type
      */
-    public abstract CommandType getType();
+    CommandType getType();
 
 }

src/com/dmdirc/commandparser/CommandManager.java

@@ -25,12 +25,7 @@ package com.dmdirc.commandparser;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
-import com.dmdirc.commandparser.commands.ChannelCommand;
-import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.commandparser.commands.QueryCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.commandparser.commands.channel.*;
 import com.dmdirc.commandparser.commands.chat.*;
 import com.dmdirc.commandparser.commands.global.*;
@@ -39,8 +34,6 @@ import com.dmdirc.commandparser.commands.server.*;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.util.MapList;
@@ -78,7 +71,7 @@ public final class CommandManager {
      * Prevents creation of a new command manager.
      */
     private CommandManager() {
-        //do nothing
+        // Do nothing
     }
     
     /**
@@ -103,76 +96,75 @@ public final class CommandManager {
      * Registers a command with the command manager.
      * 
      * @param command The command to be registered
+     * @param info The information about the command
+     * @since 0.6.3
      */
-    public static void registerCommand(final Command command) {
-        registerCommand(command, true);
+    public static void registerCommand(final Command command, final CommandInfo info) {
+        registerCommand(info, command, true);
+    }
+
+    /**
+     * Registers a {@link Command} which also implements the {@link CommandInfo}
+     * interface with the command manager.
+     *
+     * @param <T> The type of object that's being registered
+     * @param command An object that extends {@link Command} and implements
+     * {@link CommandInfo} to be registered.
+     * @since 0.6.3
+     */
+    public static <T extends Command & CommandInfo> void registerCommand(final T command) {
+        registerCommand(command, command);
     }
     
     /**
      * Unregisters a command with the command manager.
      * 
-     * @param command The command to be unregistered
+     * @param info The information object for the command that should be unregistered
+     * @since 0.6.3
      */
-    public static void unregisterCommand(final Command command) {
-        registerCommand(command, false);
+    public static void unregisterCommand(final CommandInfo info) {
+        registerCommand(info, commands.get(info), false);
     }
     
     /**
      * Registers or unregisters a command.
      *
+     * @param info The information about the command
      * @param command The command to be (un)registered
      * @param register True if the command should be registered, false if it
      * should be unregistered.
+     * @since 0.6.3
      */
-    private static void registerCommand(final Command command, final boolean register) {
-        boolean canContinue = true;
-        
-        if (command instanceof ChannelCommand) {
-            registerCommand(command, parsers.get(CommandType.TYPE_CHANNEL), register);
-        } else if (command instanceof ServerCommand) {
-            registerCommand(command, parsers.get(CommandType.TYPE_SERVER), register);
-        } else if (command instanceof QueryCommand) {
-            registerCommand(command, parsers.get(CommandType.TYPE_QUERY), register);
-        } else if (command instanceof GlobalCommand) {
-            registerCommand(command, parsers.get(CommandType.TYPE_GLOBAL), register);
-        } else if (command instanceof ChatCommand) {
-            registerCommand(command, parsers.get(CommandType.TYPE_QUERY), register);
-            registerCommand(command, parsers.get(CommandType.TYPE_CHANNEL), register);
-        } else {
-            canContinue = false;
-            
-            Logger.userError(ErrorLevel.HIGH, "Attempted to (un)register an invalid command: "
-                    + command.getClass().getName());
+    private static void registerCommand(final CommandInfo info, final Command command,
+            final boolean register) {
+        if (parsers.containsKey(info.getType())) {
+            registerCommand(info, command, parsers.get(info.getType()), register);
         }
         
-        if (canContinue) {
-            if (register) {
-                commands.put(command, command);
-            } else {
-                commands.remove(command);
-            }
-            
-            registerCommandName(command, register);
+        if (register) {
+            commands.put(info, command);
+        } else {
+            commands.remove(info);
         }
+
+        registerCommandName(info, register);
     }
     
     /**
      * Registers the specified command with all of the specified parsers.
      *
+     * @param info The command information object
      * @param command The command to be reigstered
      * @param parsers The parsers to register the command with
+     * @since 0.6.3
      */
-    private static void registerCommand(final Command command,
-            final List<? extends CommandParser> parsers, final boolean register) {
-        if (parsers == null) {
-            return;
-        }
-        
-        for (CommandParser parser : parsers) {
+    private static void registerCommand(final CommandInfo info, final Command command,
+            final List<? extends CommandParser> myParsers, final boolean register) {
+        for (CommandParser parser : myParsers) {
             if (register) {
-                parser.registerCommand(command);
+                parser.registerCommand(command, info);
             } else {
-                parser.unregisterCommand(command);
+                parser.unregisterCommand(info);
             }
         }
     }
@@ -184,25 +176,30 @@ public final class CommandManager {
      * @param command The command to be registered
      * @param register True if the command should be registered, false if it
      * should be unregistered.
+     * @since 0.6.3
      */
-    private static void registerCommandName(final Command command,
+    private static void registerCommandName(final CommandInfo command,
             final boolean register) {
         // Do tab completion
         final String commandName = getCommandChar() + command.getName();
-        
+
+        // TODO: This logic is probably in two places. Abstract it.
         for (Server server : ServerManager.getServerManager().getServers()) {
-            if (command instanceof ServerCommand || command instanceof GlobalCommand) {
+            if (command.getType() == CommandType.TYPE_SERVER ||
+                    command.getType() == CommandType.TYPE_GLOBAL) {
                 registerCommandName(server.getTabCompleter(), commandName, register);
             }
             
-            if (command instanceof ChannelCommand || command instanceof ChatCommand) {
+            if (command.getType() == CommandType.TYPE_CHANNEL
+                    || command.getType() == CommandType.TYPE_CHAT) {
                 for (String channelName : server.getChannels()) {
                     registerCommandName(server.getChannel(channelName).getTabCompleter(),
                             commandName, register);
                 }
             }
             
-            if (command instanceof QueryCommand || command instanceof ChatCommand) {
+            if (command.getType() == CommandType.TYPE_QUERY
+                    || command.getType() == CommandType.TYPE_CHAT) {
                 for (Query query : server.getQueries()) {
                     registerCommandName(query.getTabCompleter(),
                             commandName, register);
@@ -309,65 +306,26 @@ public final class CommandManager {
         IdentityManager.getGlobalConfig().addChangeListener("general", "commandchar", listener);
         IdentityManager.getGlobalConfig().addChangeListener("general", "silencechar", listener);
     }
-    
-    /**
-     * Loads all channel commands into the specified parser.
-     * 
-     * @param parser The parser to load commands into
-     */
-    public static void loadChannelCommands(final CommandParser parser) {
-        for (Command com : getCommands(CommandType.TYPE_CHANNEL, null)) {
-            parser.registerCommand(com);
-        }
-        
-        for (Command com : getCommands(CommandType.TYPE_CHAT, null)) {
-            parser.registerCommand(com);
-        }
-        
-        parsers.add(CommandType.TYPE_CHANNEL, parser);
-    }
-    
-    /**
-     * Loads all server commands into the specified parser.
-     * 
-     * @param parser The parser to load commands into
-     */
-    public static void loadServerCommands(final CommandParser parser) {
-        for (Command command : getCommands(CommandType.TYPE_SERVER, null)) {
-            parser.registerCommand(command);
-        }
-        
-        parsers.add(CommandType.TYPE_SERVER, parser);
-    }
-    
-    /**
-     * Loads all global commands into the specified parser.
-     * 
-     * @param parser The parser to load commands into
-     */
-    public static void loadGlobalCommands(final CommandParser parser) {
-        for (Command com : getCommands(CommandType.TYPE_GLOBAL, null)) {
-            parser.registerCommand(com);
-        }
-        
-        parsers.add(CommandType.TYPE_GLOBAL, parser);
-    }
-    
+
     /**
-     * Loads all query commands into the specified parser.
-     * 
-     * @param parser The parser to load commands into
+     * Loads all commands of the specified types into the specified parser.
+     *
+     * @see CommandType#getComponentTypes()
+     * @since 0.6.3
+     * @param parser The {@link CommandParser} to load commands in to
+     * @param supertypes The types of commands that should be loaded
      */
-    public static void loadQueryCommands(final CommandParser parser) {
-        for (Command com : getCommands(CommandType.TYPE_QUERY, null)) {
-            parser.registerCommand(com);
-        }
-        
-        for (Command com : getCommands(CommandType.TYPE_CHAT, null)) {
-            parser.registerCommand(com);
+    public static void loadCommands(final CommandParser parser,
+            final CommandType ... supertypes) {
+        for (CommandType supertype : supertypes) {
+            for (CommandType type : supertype.getComponentTypes()) {
+                for (Map.Entry<CommandInfo, Command> pair : getCommands(type, null).entrySet()) {
+                    parser.registerCommand(pair.getValue(), pair.getKey());
+                }
+
+                parsers.add(type, parser);
+            }
         }
-        
-        parsers.add(CommandType.TYPE_QUERY, parser);
     }
     
     /**
@@ -389,9 +347,9 @@ public final class CommandManager {
      * @return A command with a matching signature, or null if none were found
      */
     public static Command getCommand(final CommandType type, final String name) {
-        final List<Command> res = getCommands(type, name);
+        final Map<CommandInfo, Command> res = getCommands(type, name);
         
-        return res.isEmpty() ? null : res.get(0);
+        return res.isEmpty() ? null : res.values().iterator().next();
     }    
      
     /**
@@ -414,7 +372,7 @@ public final class CommandManager {
     public static List<String> getCommandNames(final CommandType type) {
         final List<String> res = new ArrayList<String>();
         
-        for (Command command : getCommands(type)) {
+        for (CommandInfo command : getCommands(type).keySet()) {
             res.add(getCommandChar() + command.getName());
         }
         
@@ -422,31 +380,34 @@ public final class CommandManager {
     }
     
     /**
-     * Retrieves a list of all commands of the specified type.
+     * Retrieves a map of all {@link CommandInfo}s and their associated
+     * {@link Command}s of the specified type.
      * 
      * @param type The type of command to list
-     * @return A list of commands
+     * @return A map of commands
+     * @since 0.6.3
      */    
-    public static List<Command> getCommands(final CommandType type) {    
+    public static Map<CommandInfo, Command> getCommands(final CommandType type) {
         return getCommands(type, null);
     }
     
     /**
-     * Retrieves a list of all commands of the specified type, with the
+     * Retrieves a map of all commands of the specified type, with the
      * specified name.
      * 
      * @param type The type of command to list, or null for all types
      * @param name The name of the command to look for, or null for any name
-     * @return A list of matching commands
+     * @return A map of {@link CommandInfo}s and their associated {@link Command}.
+     * @since 0.6.3
      */    
-    private static List<Command> getCommands(final CommandType type,
+    private static Map<CommandInfo, Command> getCommands(final CommandType type,
             final String name) {
-        final List<Command> res = new ArrayList<Command>();
+        final Map<CommandInfo, Command> res = new HashMap<CommandInfo, Command>();
         
         for (Map.Entry<CommandInfo, Command> entry : commands.entrySet()) {
             if ((type == null || type.equals(entry.getKey().getType()))
                     && (name == null || name.equals(entry.getKey().getName()))) {
-                res.add(entry.getValue());
+                res.put(entry.getKey(), entry.getValue());
             }
         }
         

src/com/dmdirc/commandparser/CommandType.java

@@ -70,6 +70,24 @@ public enum CommandType {
         }
     }
 
+    /**
+     * Retrieves an array of component types that make up this command type.
+     * Generally this will only contain the type itself, but some commands may
+     * be registered in multiple queues (such as CHANNEL commands going into
+     * both CHAT and CHANNEL queues). Note that for obvious reasons there is
+     * no recursion done on the values returned here.
+     *
+     * @since 0.6.3
+     * @return An array of types which this type should be registered as.
+     */
+    public CommandType[] getComponentTypes() {
+        if (this == TYPE_CHANNEL || this == TYPE_QUERY) {
+            return new CommandType[]{this, TYPE_CHAT};
+        } else {
+            return new CommandType[]{this};
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public String toString() {

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

@@ -24,22 +24,34 @@ package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a channel.
  * @author chris
  */
-public abstract class ChannelCommand extends Command {
+public abstract class ChannelCommand extends Command implements CommandInfo {
     
     /**
      * Executes this command.
+     *
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param channel The channel instance that this command is being executed on
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
+     * @since 0.6.3
      */
     public abstract void execute(InputWindow origin, Server server, Channel channel,
-            boolean isSilent, String... args);
+            boolean isSilent, CommandArguments args);
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
+    
 }

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

@@ -24,6 +24,9 @@ package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -32,7 +35,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
  *
  * @author Chris
  */
-public abstract class ChatCommand extends Command {
+public abstract class ChatCommand extends Command implements CommandInfo {
     
     /**
      * Executes this command.
@@ -42,7 +45,14 @@ public abstract class ChatCommand extends Command {
      * @param target The target of this command
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
+     * @since 0.6.3
      */
     public abstract void execute(InputWindow origin, Server server, MessageTarget target,
-            boolean isSilent, String... args);
+            boolean isSilent, CommandArguments args);
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHAT;
+    }
 }

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

@@ -22,17 +22,16 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 
 /**
  * Represents a generic command.
+ *
  * @author chris
  */
-public abstract class Command extends CommandInfo implements Comparable<Command> {
+public abstract class Command {
     
     /** The format name used for command output. */
     protected static final String FORMAT_OUTPUT = "commandOutput";
@@ -45,8 +44,10 @@ public abstract class Command extends CommandInfo implements Comparable<Command>
      * @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
      */
-    protected final String implodeArgs(final int offset, final String... args) {
+    @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()) {
@@ -62,8 +63,10 @@ public abstract class Command extends CommandInfo implements Comparable<Command>
      * 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
      */
-    protected final String implodeArgs(final String... args) {
+    @Deprecated
+    protected static final String implodeArgs(final String... args) {
         return implodeArgs(0, args);
     } 
     
@@ -148,18 +151,6 @@ public abstract class Command extends CommandInfo implements Comparable<Command>
         for (int i = 0; i < size - data.length(); i++) {
             builder.append(' ');
         }
-    }    
-    
-    /** {@inheritDoc} */
-    @Override
-    public final int compareTo(final Command o) {
-        return getName().compareTo(o.getName());
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.fromCommand(this);
     }
 
 }

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

@@ -22,6 +22,7 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -40,8 +41,9 @@ public interface ExternalCommand {
      * @param channel The name of the channel the command is being executed for
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
+     * @since 0.6.3
      */
     void execute(InputWindow origin, Server server, String channel,
-            boolean isSilent, String... args);    
+            boolean isSilent, CommandArguments args);
 
 }

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

@@ -22,21 +22,33 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic global command. Global commands are associated with
  * no servers.
+ *
  * @author chris
  */
-public abstract class GlobalCommand extends Command {
+public abstract class GlobalCommand extends Command implements CommandInfo {
         
     /**
      * Executes this command. Note that for global commands, origin may be
      * null.
+     *
      * @param origin The window in which the command was typed
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
+     * @since 0.6.3
      */
-    public abstract void execute(InputWindow origin, boolean isSilent, String ... args);
+    public abstract void execute(InputWindow origin, boolean isSilent, CommandArguments args);
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
 }

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

@@ -24,22 +24,34 @@ package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.Query;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a query.
+ *
  * @author chris
  */
-public abstract class QueryCommand extends Command {
+public abstract class QueryCommand extends Command implements CommandInfo {
         
     /**
      * Executes this command.
+     *
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param query The query object that the commadparser is associated with
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
+     * @since 0.6.3
      */
     public abstract void execute(InputWindow origin, Server server, Query query,
-            boolean isSilent, String... args);
+            boolean isSilent, CommandArguments args);
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_QUERY;
+    }
 }

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

@@ -23,22 +23,34 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic server command. Server commands are associated with
  * a server instance.
+ *
  * @author chris
  */
-public abstract class ServerCommand extends Command {
+public abstract class ServerCommand extends Command implements CommandInfo {
     
     /**
      * Executes this command.
+     *
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
+     * @since 0.6.3
      */
     public abstract void execute(InputWindow origin, Server server,
-            boolean isSilent, String ... args);
+            boolean isSilent, CommandArguments args);
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
 }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -51,14 +52,14 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "ban", "<user|host>");
             return;
         }
         
-        String host = args[0];
-        final ChannelClientInfo user = channel.getChannelInfo().getUser(args[0]);
+        String host = args.getArguments()[0];
+        final ChannelClientInfo user = channel.getChannelInfo().getUser(host);
         if (user != null && !user.getClient().getHost().isEmpty()) {
             // TODO: Customisable ban masks, somehow.
             host = "*!*@" + user.getClient().getHost();
@@ -95,6 +96,6 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
         }
         
         return res;
-    } 
+    }
     
 }

src/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -49,7 +50,7 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
         Main.getUI().showChannelSettingsDialog(channel);
     }
     

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -45,8 +46,8 @@ public final class Cycle extends ChannelCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
-        channel.part(args.length > 0 ? implodeArgs(args)
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
+        channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "cyclemessage"));
         channel.join();
     }

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -51,18 +52,20 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "kick", "<user> [reason]");
             return;
         }
         
-        final ChannelClientInfo victim = channel.getChannelInfo().getUser(args[0]);
+        final ChannelClientInfo victim = channel.getChannelInfo().getUser(args
+                .getArguments()[0]);
         
         if (victim == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "User not found: " + args[0]);
+            sendLine(origin, isSilent, FORMAT_ERROR, "User not found: "
+                    + args.getArguments()[0]);
         } else {
-            victim.kick(args.length > 1 ? implodeArgs(1, args) :
+            victim.kick(args.getArguments().length > 1 ? args.getArgumentsAsString(1) :
                 origin.getConfigManager().getOption("general", "kickmessage"));
         }
     }

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
@@ -52,24 +53,24 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
 
-        if (args.length == 0) {
+        if (args.getArguments().length == 0) {
             sendLine(origin, isSilent, "channelModeDiscovered", cChannel.getModeStr(), cChannel);
         } else {
-            server.getParser().sendLine("MODE " + cChannel + " " + implodeArgs(args));
+            server.getParser().sendLine("MODE " + cChannel + " " + args.getArgumentsAsString());
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final String channel, final boolean isSilent, final String ... args) {
-        if (args.length == 0) {
+            final String channel, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             server.getParser().sendLine("MODE " + channel);
         } else {
-            server.getParser().sendLine("MODE " + channel + " " + implodeArgs(args));
+            server.getParser().sendLine("MODE " + channel + " " + args.getArgumentsAsString());
         }
     }
 

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.commands.ExternalCommand;
@@ -52,7 +53,7 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server, 
-            final Channel channel, final boolean isSilent, final String... args) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendLine("NAMES " + channel.getChannelInfo().getName());
     }
     
@@ -60,7 +61,7 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final String channel, final boolean isSilent, final String ... args) {
+            final String channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendLine("NAMES " + channel);
     }    
 

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -44,8 +45,8 @@ public final class Part extends ChannelCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
-        channel.part(args.length > 0 ? implodeArgs(args)
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
+        channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "partmessage"));
         channel.close();
     }

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -54,31 +55,31 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked") @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
         
         int offset = 0;
         boolean nicklist = true;
         boolean text = true;
         
-        if (args.length > offset && args[offset].equalsIgnoreCase("--nicklist")) {
+        if (args.getArguments().length > offset && args.getArguments()[offset].equalsIgnoreCase("--nicklist")) {
             text = false;
             offset++;
-        } else if (args.length > offset && args[offset].equalsIgnoreCase("--text")) {
+        } else if (args.getArguments().length > offset && args.getArguments()[offset].equalsIgnoreCase("--text")) {
             nicklist = false;
             offset++;
         }
         
-        if (args.length <= offset) {
+        if (args.getArguments().length <= offset) {
             showUsage(origin, isSilent, "setnickcolour", "[--nicklist|--text] <nick> [colour]");
             return;
         }
         
-        final ChannelClientInfo target = channel.getChannelInfo().getUser(args[offset]);
+        final ChannelClientInfo target = channel.getChannelInfo().getUser(args.getArguments()[offset]);
         offset++;
         
         if (target == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "No such nickname (" + args[offset - 1] + ")!");
-        } else if (args.length <= offset) {
+            sendLine(origin, isSilent, FORMAT_ERROR, "No such nickname (" + args.getArguments()[offset - 1] + ")!");
+        } else if (args.getArguments().length <= offset) {
             // We're removing the colour
             if (nicklist) {
                 target.getMap().remove(ChannelClientProperty.NICKLIST_FOREGROUND);
@@ -89,7 +90,7 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
             ((ChannelWindow) channel.getFrame()).redrawNicklist();
         } else {
             // We're setting the colour
-            final Color newColour = ColourManager.parseColour(args[offset], null);
+            final Color newColour = ColourManager.parseColour(args.getArguments()[offset], null);
             if (newColour == null) {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Invalid colour specified.");
                 return;

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
@@ -47,8 +48,8 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final Channel channel, final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final Channel channel, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             final ChannelInfo cChannel = channel.getChannelInfo();
 
             if (cChannel.getTopic().isEmpty()) {
@@ -61,18 +62,18 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
                         1000 * cChannel.getTopicTime(), cChannel);
             }
         } else {
-            channel.setTopic(implodeArgs(args));
+            channel.setTopic(args.getArgumentsAsString());
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final String channel, final boolean isSilent, final String ... args) {
-        if (args.length == 0) {
+            final String channel, final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             server.getParser().sendLine("TOPIC " + channel);
         } else {
-            server.getParser().sendLine("TOPIC " + channel + " :" + implodeArgs(args));
+            server.getParser().sendLine("TOPIC " + channel + " :" + args.getArgumentsAsString());
         }
     }
 

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,7 +22,8 @@
 
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -33,10 +34,9 @@ import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.QueryWindow;
 import com.dmdirc.ui.interfaces.ServerWindow;
-
 import com.dmdirc.ui.messages.Styliser;
+
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -59,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]);
         }
     }
     
@@ -74,30 +74,30 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      */
     private void showAllCommands(final InputWindow origin, final boolean isSilent) {
-        final List<Command> commands = new ArrayList<Command>();
+        final List<CommandInfo> commands = new ArrayList<CommandInfo>();
 
-        commands.addAll(CommandManager.getCommands(CommandType.TYPE_GLOBAL));
+        commands.addAll(CommandManager.getCommands(CommandType.TYPE_GLOBAL).keySet());
         
         if (origin instanceof ServerWindow) {
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_SERVER));
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_SERVER).keySet());
         } else if (origin instanceof ChannelWindow) {
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_CHANNEL));
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_CHAT));
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_SERVER));
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_CHANNEL).keySet());
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_CHAT).keySet());
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_SERVER).keySet());
         } else if (origin instanceof QueryWindow) {
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_QUERY));
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_CHAT));
-            commands.addAll(CommandManager.getCommands(CommandType.TYPE_SERVER));
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_QUERY).keySet());
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_CHAT).keySet());
+            commands.addAll(CommandManager.getCommands(CommandType.TYPE_SERVER).keySet());
         }
         
-        Collections.sort(commands);
+        //Collections.sort(commands);
         
         sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
                 + "----------------------- Available commands -------");
         
         final StringBuilder builder = new StringBuilder();
         
-        for (Command command : commands) {
+        for (CommandInfo command : commands) {
             if (builder.length() + command.getName().length() + 1 > 50) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
                 builder.delete(0, builder.length());
@@ -125,13 +125,14 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
      */
     private void showCommand(final InputWindow origin, final boolean isSilent,
             final String name) {
-        Command command;
-        
+        CommandInfo command = null;
+
+        /* TODO: Add methods to enable this to work and uncomment
         if (name.length() > 0 && name.charAt(0) == CommandManager.getCommandChar()) {
             command = CommandManager.getCommand(name.substring(1));
         } else {
             command = CommandManager.getCommand(name);
-        }
+        }*/
         
         if (command == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Command '" + name + "' not found.");

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/ReloadIdentities.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;
@@ -47,7 +48,8 @@ public class ReloadIdentities extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override    
-    public void execute(final InputWindow origin, final boolean isSilent, final String... args) {
+    public void execute(final InputWindow origin, final boolean isSilent,
+            final CommandArguments args) {
         IdentityManager.loadUser();
         
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Identities 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())) {

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -49,8 +50,8 @@ public final class AllChannels extends ServerCommand implements IntelligentComma
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        final String command = implodeArgs(args);
+            final boolean isSilent, final CommandArguments args) {
+        final String command = args.getArgumentsAsString();
         InputWindow window;
         
         for (String channel : server.getChannels()) {

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -46,9 +47,9 @@ public final class Away extends ServerCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         if (server.getState() == ServerState.CONNECTED) {
-            final String line = implodeArgs(args);
+            final String line = args.getArgumentsAsString();
 
             server.getParser().sendLine("AWAY :" + line);
         } else {

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -56,7 +57,7 @@ public final class Back extends ServerCommand implements IntelligentCommand {
      */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         if (server.getState() != ServerState.CONNECTED) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");
             return;

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.logger.ErrorLevel;
@@ -48,8 +49,8 @@ public final class ChangeServer extends ServerCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "server", "<host[:[+]port]> [password]");
             return;
         }
@@ -61,7 +62,7 @@ public final class ChangeServer extends ServerCommand {
         int offset = 0;
         
         // Check for SSL
-        if (args[offset].equalsIgnoreCase("--ssl")) {
+        if (args.getArguments()[offset].equalsIgnoreCase("--ssl")) {
             Logger.userError(ErrorLevel.LOW,
                     "Using /server --ssl is deprecated, and may be removed in the future."
                     + " Use /server <host>:+<port> instead.");
@@ -71,8 +72,8 @@ public final class ChangeServer extends ServerCommand {
         }
         
         // 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) == '+') {
@@ -92,12 +93,12 @@ public final class ChangeServer extends ServerCommand {
                 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);
         }
         
         server.connect(host, port, pass, ssl, server.getProfile());

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -57,18 +58,19 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
      */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         if (server.getState() != ServerState.CONNECTED) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");
             return;
         }
 
-        if (args.length < 2) {
+        if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "ctcp", "<target> <type> [arguments]");
         } else {
-            server.getParser().sendLine("PRIVMSG " + args[0] + " :"
-                    + ((char) 1) + implodeArgs(1, args) + ((char) 1));
-            sendLine(origin, isSilent, "selfCTCP", args[0], implodeArgs(1, args));
+            server.getParser().sendLine("PRIVMSG " + args.getArguments()[0] + " :"
+                    + ((char) 1) + args.getArgumentsAsString(1) + ((char) 1));
+            sendLine(origin, isSilent, "selfCTCP", args.getArguments()[0],
+                    args.getArgumentsAsString(1));
         }
     }
     

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -50,13 +51,13 @@ public final class Disconnect extends ServerCommand {
      * @param args The user supplied arguments
      */
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         String line;
         
-        if (args.length == 0) {
+        if (args.getArguments().length == 0) {
             line = origin.getConfigManager().getOption("general", "quitmessage");
         } else {
-            line = implodeArgs(args);
+            line = args.getArgumentsAsString();
         }
         
         server.disconnect(line);

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -57,11 +58,12 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
      */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         
         final Identity identity = server.getNetworkIdentity();
         
-        if (args.length == 0 || args[0].toLowerCase().equals("view")) {
+        if (args.getArguments().length == 0
+                || args.getArguments()[0].toLowerCase().equals("view")) {
             
             if (identity.hasOptionString("network", "ignorelist")) {
                 final List<String> list = identity.getOptionList("network", "ignorelist");
@@ -86,9 +88,10 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
                 sendLine(origin, isSilent, FORMAT_ERROR, "No ignore list entries for this network.");
             }
             
-        } else if (args[0].toLowerCase().equals("add") && args.length > 1) {
+        } else if (args.getArguments()[0].toLowerCase().equals("add")
+                && args.getArguments().length > 1) {
             
-            final String host = implodeArgs(1, args);
+            final String host = args.getArgumentsAsString(1);
             String list = host;
             
             if (identity.hasOptionString("network", "ignorelist")) {
@@ -100,9 +103,11 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
             
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Added " + host + " to the ignore list.");
             
-        } else if (args[0].toLowerCase().equals("remove") && args.length > 1) {
+        } else if (args.getArguments()[0].toLowerCase().equals("remove")
+                && args.getArguments().length > 1) {
             
-            final String host = server.getParser().getIRCStringConverter().toLowerCase(implodeArgs(1, args));
+            final String host = server.getParser().getIRCStringConverter()
+                    .toLowerCase(args.getArgumentsAsString(1));
             
             final StringBuffer newlist = new StringBuffer();
             boolean found = false;
@@ -112,7 +117,8 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
                 
                 
                 for (String entry : list.split("\n")) {
-                    if (server.getParser().getIRCStringConverter().toLowerCase(entry).equals(host)) {
+                    if (server.getParser().getIRCStringConverter()
+                            .toLowerCase(entry).equals(host)) {
                         found = true;
                     } else {
                         if (newlist.length() > 0) {

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

@@ -27,6 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -60,13 +61,13 @@ public final class JoinChannelCommand extends ServerCommand implements
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "join", "join <channel [key]>[,channel [key]...]");
             return;
         }
 
-        for (String pair : implodeArgs(args).split(",")) {
+        for (String pair : args.getArgumentsAsString().split(",")) {
             if (pair.trim().indexOf(' ') == -1) {
                 server.join(pair);
             } else {
@@ -74,24 +75,25 @@ public final class JoinChannelCommand extends ServerCommand implements
             }
         }
 
-        if (server.getParser().isValidChannelName(args[0])) {
+        if (server.getParser().isValidChannelName(args.getArguments()[0])) {
             sendLine(origin, isSilent, FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD + CommandManager.getCommandChar()
-                    + (args.length > 1 ? "msg" : "join") + " " + implodeArgs(args)
+                    + (args.getArguments().length > 1 ? "msg" : "join")
+                    + " " + args.getArgumentsAsString()
                     + Styliser.CODE_BOLD + Styliser.CODE_FIXED + "?");
             return;
         }
 
-        if (server.hasQuery(args[0])) {
-            server.getQuery(args[0]).activateFrame();
+        if (server.hasQuery(args.getArguments()[0])) {
+            server.getQuery(args.getArguments()[0]).activateFrame();
         } else {
-            server.addQuery(args[0]);
-            server.getQuery(args[0]).show();                
+            server.addQuery(args.getArguments()[0]);
+            server.getQuery(args.getArguments()[0]).show();
         }
 
-        if (args.length > 1) {
-            server.getQuery(args[0]).sendLine(implodeArgs(1, args));
+        if (args.getArguments().length > 1) {
+            server.getQuery(args.getArguments()[0]).sendLine(args.getArgumentsAsString(1));
         }
     }
     

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -53,18 +54,19 @@ public final class Message extends ServerCommand implements IntelligentCommand,
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         if (server.getState() != ServerState.CONNECTED) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");
             return;
         }
         
-        if (args.length < 2) {
+        if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "msg", "<target> <message>");
         } else {
-            server.getParser().sendLine("PRIVMSG " + args[0] + " :"
-                    + implodeArgs(1, args));
-            sendLine(origin, isSilent, "selfMessage", args[0], implodeArgs(1, args));
+            server.getParser().sendLine("PRIVMSG " + args.getArguments()[0] + " :"
+                    + args.getArgumentsAsString(1));
+            sendLine(origin, isSilent, "selfMessage", args.getArguments()[0],
+                    args.getArgumentsAsString(1));
         }
     }
     

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -47,35 +48,33 @@ public final class Nick extends ServerCommand implements IntelligentCommand {
         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 isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "nick", "<new nickname>");
             return;
         }
         
-        server.getParser().setNickname(args[0]);
+        server.getParser().setNickname(args.getArguments()[0]);
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "nick";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "nick <new nickname> - attempts to change your nickname to the one specified";
     }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -51,18 +52,19 @@ public final class Notice extends ServerCommand implements IntelligentCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         if (server.getState() != ServerState.CONNECTED) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");
             return;
         }
         
-        if (args.length < 2) {
+        if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "notice", "<target> <message>");
         } else {
-            server.getParser().sendLine("NOTICE " + args[0] + " :"
-                    + implodeArgs(1, args));
-            sendLine(origin, isSilent, "selfNotice", args[0], implodeArgs(1, args));
+            server.getParser().sendLine("NOTICE " + args.getArguments()[0] + " :"
+                    + args.getArgumentsAsString(1));
+            sendLine(origin, isSilent, "selfNotice", args.getArguments()[0],
+                    args.getArgumentsAsString(1));
         }
     }
     

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -53,30 +54,31 @@ public final class OpenQuery extends ServerCommand implements
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        if (args.length == 0) {
+            final boolean isSilent, final CommandArguments args) {
+        if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "query", "<target> <message>");
             return;
         }
             
-        if (server.getParser().isValidChannelName(args[0])) {
+        if (server.getParser().isValidChannelName(args.getArguments()[0])) {
             sendLine(origin, isSilent, FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD + CommandManager.getCommandChar()
-                    + (args.length > 1 ? "msg" : "join") + " " + implodeArgs(args)
+                    + (args.getArguments().length > 1 ? "msg" : "join") + " "
+                    + args.getArgumentsAsString()
                     + Styliser.CODE_BOLD + Styliser.CODE_FIXED + "?");
             return;
         }
 
-        if (server.hasQuery(args[0])) {
-            server.getQuery(args[0]).activateFrame();
+        if (server.hasQuery(args.getArguments()[0])) {
+            server.getQuery(args.getArguments()[0]).activateFrame();
         } else {
-            server.addQuery(args[0]);
-            server.getQuery(args[0]).show();                
+            server.addQuery(args.getArguments()[0]);
+            server.getQuery(args.getArguments()[0]).show();
         }
 
-        if (args.length > 1) {
-            server.getQuery(args[0]).sendLine(implodeArgs(1, args));
+        if (args.getArguments().length > 1) {
+            server.getQuery(args.getArguments()[0]).sendLine(args.getArgumentsAsString(1));
         }
     }
     

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -43,33 +44,31 @@ public final class Raw extends ServerCommand {
         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 isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        final String line = implodeArgs(args);
+            final boolean isSilent, final CommandArguments args) {
+        final String line = args.getArgumentsAsString();
         
         server.getParser().sendLine(line);
         sendLine(origin, isSilent, "rawCommand", line);
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "raw";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "raw <text> - sends the specified text directly to the server";
     }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -54,8 +55,8 @@ public final class RawServerCommand extends ServerCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        server.getParser().sendLine(myName.toUpperCase() + " " + implodeArgs(args));
+            final boolean isSilent, final CommandArguments args) {
+        server.getParser().sendLine(myName.toUpperCase() + " " + args.getArgumentsAsString());
     }
     
     

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -45,13 +46,13 @@ public final class Reconnect extends ServerCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         String line;
         
-        if (args.length == 0) {
+        if (args.getArguments().length == 0) {
             line = origin.getConfigManager().getOption("general", "reconnectmessage");
         } else {
-            line = implodeArgs(args);
+            line = args.getArgumentsAsString();
         }
         
         server.reconnect(line);

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -47,14 +48,14 @@ public class Umode extends ServerCommand {
     /** {@inheritDoc} */
     @Override
     public void execute(final InputWindow origin, final Server server, 
-            final boolean isSilent, final String... args) {
+            final boolean isSilent, final CommandArguments args) {
         if (server.getState() != ServerState.CONNECTED) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");
             return;
         }
 
         server.getParser().sendLine("MODE " + server.getParser().getMyNickname()
-                + " " + implodeArgs(args));
+                + " " + args.getArgumentsAsString());
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -24,7 +24,9 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.Command;
@@ -67,16 +69,17 @@ public final class ChannelCommandParser extends CommandParser {
         this.channel = newChannel;
     }
     
-    /** Loads the relevant commands into the parser. */
+    /** {@inheritDoc} */
+    @Override
     protected void loadCommands() {
-        CommandManager.loadGlobalCommands(this);
-        CommandManager.loadServerCommands(this);
-        CommandManager.loadChannelCommands(this);
+        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
+                CommandType.TYPE_SERVER, CommandType.TYPE_CHANNEL);
     }
     
     /** {@inheritDoc} */
+    @Override
     protected void executeCommand(final InputWindow origin,
-            final boolean isSilent, final Command command, final String... args) {
+            final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, server, channel, isSilent, args);
         } else if (command instanceof ChatCommand) {
@@ -91,9 +94,11 @@ public final class ChannelCommandParser extends CommandParser {
     /**
      * Called when the input was a line of text that was not a command. This normally
      * means it is sent to the server/channel/user as-is, with no further processing.
+     *
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
+    @Override
     protected void handleNonCommand(final InputWindow origin, final String line) {
         channel.sendLine(line);
     }

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -25,6 +25,8 @@ package com.dmdirc.commandparser.parsers;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
@@ -79,19 +81,22 @@ public abstract class CommandParser implements Serializable {
     /**
      * Registers the specified command with this parser.
      *
+     * @since 0.6.3
      * @param command Command to be registered
+     * @param info The information the command should be registered with
      */
-    public final void registerCommand(final Command command) {
-        commands.put(command.getName().toLowerCase(), command);
+    public final void registerCommand(final Command command, final CommandInfo info) {
+        commands.put(info.getName().toLowerCase(), command);
     }
 
     /**
      * Unregisters the specified command with this parser.
      *
-     * @param command Command to be unregistered
+     * @param info Command information to be unregistered
+     * @since 0.6.3
      */
-    public final void unregisterCommand(final Command command) {
-        commands.remove(command.getName().toLowerCase());
+    public final void unregisterCommand(final CommandInfo info) {
+        commands.remove(info.getName().toLowerCase());
     }
 
     /**
@@ -104,67 +109,42 @@ public abstract class CommandParser implements Serializable {
      */
     public final void parseCommand(final InputWindow origin,
             final String line, final boolean parseChannel) {
-        if (line.isEmpty()) {
-            return;
-        }
-
-        if (line.charAt(0) == CommandManager.getCommandChar()) {
-            int offset = 1;
-            boolean silent = false;
-
-            if (line.length() > offset && line.charAt(offset) == CommandManager.getSilenceChar()) {
-                silent = true;
-                offset++;
-            }
+        final CommandArguments args = new CommandArguments(line);
 
-            final String[] args = line.split(" ");
-            final String command = args[0].substring(offset);
-            String[] comargs;
+        if (args.isCommand()) {
+            final boolean silent = args.isSilent();
+            final String command = args.getCommandName();
+            final String[] cargs = args.getArguments();
 
-            if (args.length >= 2 && parseChannel && origin != null
+            if (args.getArguments().length > 0 && parseChannel && origin != null
                     && origin.getContainer() != null
                     && origin.getContainer().getServer() != null
-                    && origin.getContainer().getServer().isValidChannelName(args[1])
+                    && origin.getContainer().getServer().isValidChannelName(cargs[0])
                     && CommandManager.isChannelCommand(command)) {
                 final Server server = origin.getContainer().getServer();
 
-                if (server.hasChannel(args[1])) {
-
-                    final StringBuilder newLine = new StringBuilder();
-                    for (int i = 0; i < args.length; i++) {
-                        if (i == 1) { continue; }
-                        newLine.append(" ").append(args[i]);
-                    }
-
-                    server.getChannel(args[1]).getFrame().getCommandParser()
-                            .parseCommand(origin, newLine.substring(1), false);
-
+                if (server.hasChannel(cargs[0])) {
+                    server.getChannel(cargs[0]).getFrame().getCommandParser()
+                            .parseCommand(origin, args.getWordsAsString(2), false);
                     return;
                 } else {
                     final Command actCommand = CommandManager.getCommand(
                             CommandType.TYPE_CHANNEL, command);
 
                     if (actCommand instanceof ExternalCommand) {
-                        comargs = new String[args.length - 2];
-                        System.arraycopy(args, 2, comargs, 0, args.length - 2);
-
-                        ((ExternalCommand) actCommand).execute(origin, server,
-                                args[1], silent, comargs);
+                        ((ExternalCommand) actCommand).execute(
+                                origin, server, cargs[0], silent,
+                                new CommandArguments(args.getWordsAsString(2)));
                         return;
                     }
                 }
             }
 
-            comargs = new String[args.length - 1];
-            System.arraycopy(args, 1, comargs, 0, args.length - 1);
-
-            final String signature = command;
-
-            if (commands.containsKey(signature.toLowerCase())) {
-                addHistory(line.substring(offset));
-                executeCommand(origin, silent, commands.get(signature.toLowerCase()), comargs);
+            if (commands.containsKey(command.toLowerCase())) {
+                addHistory(args.getStrippedLine());
+                executeCommand(origin, silent, commands.get(command.toLowerCase()), args);
            } else {
-                handleInvalidCommand(origin, command, comargs);
+                handleInvalidCommand(origin, args);
             }
         } else {
             handleNonCommand(origin, line);
@@ -233,30 +213,32 @@ public abstract class CommandParser implements Serializable {
      * @param isSilent Whether the command is being silenced or not
      * @param command The command to be executed
      * @param args The arguments to the command
+     * @since 0.6.3
      */
     protected abstract void executeCommand(final InputWindow origin,
-            final boolean isSilent, final Command command, final String... args);
+            final boolean isSilent, final Command command, final CommandArguments args);
 
     /**
      * Called when the user attempted to issue a command (i.e., used the command
      * character) that wasn't found. It could be that the command has a different
      * arity, or that it plain doesn't exist.
+     *
      * @param origin The window in which the command was typed
-     * @param command The command the user tried to execute
      * @param args The arguments passed to the command
+     * @since 0.6.3
      */
     protected void handleInvalidCommand(final InputWindow origin,
-            final String command, final String... args) {
+            final CommandArguments args) {
         if (origin == null) {
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, null,
-                    null, command, args);
+                    null, args.getCommandName(), args.getArguments());
         } else {
             final StringBuffer buff = new StringBuffer("unknownCommand");
 
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, buff,
-                    origin.getContainer(), command, args);
+                    origin.getContainer(), args.getCommandName(), args.getArguments());
 
-            origin.addLine(buff, command);
+            origin.addLine(buff, args.getCommandName());
         }
     }
 

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -22,7 +22,9 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.logger.ErrorLevel;
@@ -67,13 +69,15 @@ public final class GlobalCommandParser extends CommandParser {
     }
     
     /** Loads the relevant commands into the parser. */
+    @Override
     protected void loadCommands() {
-        CommandManager.loadGlobalCommands(this);
+        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
     }
     
     /** {@inheritDoc} */
+    @Override
     protected void executeCommand(final InputWindow origin,
-            final boolean isSilent, final Command command, final String... args) {
+            final boolean isSilent, final Command command, final CommandArguments args) {
         ((GlobalCommand) command).execute(origin, isSilent, args);
     }
     
@@ -83,6 +87,7 @@ public final class GlobalCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
+    @Override
     protected void handleNonCommand(final InputWindow origin, final String line) {
         if (origin == null) {
             Logger.userError(ErrorLevel.MEDIUM, "Invalid global command: " + line);

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -24,7 +24,9 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Query;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -68,15 +70,16 @@ public final class QueryCommandParser extends CommandParser {
     }
     
     /** Loads the relevant commands into the parser. */
+    @Override
     protected void loadCommands() {
-        CommandManager.loadGlobalCommands(this);
-        CommandManager.loadServerCommands(this);
-        CommandManager.loadQueryCommands(this);
+        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
+                CommandType.TYPE_SERVER, CommandType.TYPE_QUERY);
     }
     
     /** {@inheritDoc} */
+    @Override
     protected void executeCommand(final InputWindow origin,
-            final boolean isSilent, final Command command, final String... args) {
+            final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, server, query, isSilent, args);
         } else if (command instanceof ChatCommand) {
@@ -94,6 +97,7 @@ public final class QueryCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
+    @Override
     protected void handleNonCommand(final InputWindow origin, final String line) {
         query.sendLine(line);
     }

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -23,7 +23,9 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
@@ -58,14 +60,15 @@ public final class ServerCommandParser extends CommandParser {
     }
     
     /** Loads the relevant commands into the parser. */
+    @Override
     protected void loadCommands() {
-        CommandManager.loadGlobalCommands(this);
-        CommandManager.loadServerCommands(this);
+        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL, CommandType.TYPE_SERVER);
     }
     
     /** {@inheritDoc} */
+    @Override
     protected void executeCommand(final InputWindow origin,
-            final boolean isSilent, final Command command, final String... args) {
+            final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof ServerCommand) {
             ((ServerCommand) command).execute(origin, server, isSilent, args);
         } else {
@@ -79,6 +82,7 @@ public final class ServerCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
+    @Override
     protected void handleNonCommand(final InputWindow origin, final String line) {
         server.sendLine(line);
     }

src/com/dmdirc/config/defaults/default/defaults

@@ -163,7 +163,9 @@ ui:
   shownickcoloursintext=false
   showversion=true
   stylelinks=true
+  treeviewActiveBackground=false:f0f0f0
   treeviewActiveBold=true
+  treeviewActiveForeground=false:1
   treeviewRolloverColour=false:f0f0f0
   useOneTouchExpandable=false
   channelSplitPanePosition=150
@@ -172,6 +174,8 @@ treeview:
   dragSelection=true
   sortwindows=true
   sortservers=true
+  backgroundcolour=false:0
+  foregroundcolour=false:0
 
 channel:
   splitusermodes=false

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -333,7 +333,7 @@ public class PreferencesManager {
         options.put("showWhenMaximised", "Show only when windows maximised");
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "browser", "userlaunchdelay", "Use browser launch delay",
+                "browser", "uselaunchdelay", "Use browser launch delay",
                 "Enable delay between browser launches (to prevent mistakenly" +
                 " double clicking)?"));
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,
@@ -468,10 +468,10 @@ public class PreferencesManager {
                 "ui", "nickListAltBackgroundColour", "Alternate background colour",
                 "Background colour to use for every other nicklist entry"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "sortByMode", "Sort nicklist by user mode",
+                "nicklist", "sortByMode", "Sort nicklist by user mode",
                 "Sort nicknames by the modes that they have?"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "sortByCase", "Sort nicklist by case",
+                "nicklist", "sortByCase", "Sort nicklist by case",
                 "Sort nicknames in a case-sensitive manner?"));
 
         parent.addSubCategory(category);

src/com/dmdirc/config/prefs/PreferencesSetting.java

@@ -299,12 +299,9 @@ public class PreferencesSetting {
      * @return true iif the setting will be changed if saved
      */
     public boolean needsSaving() {
-        if ((current != null && current.equals(original)) 
-                || (current == null && original == null)
-                || (validator != null && validator.validate(current).isFailure())) {
-            return false;
-        }
-        return true;
+        return (current == null || !current.equals(original))
+                && (current != null || original != null)
+                && (validator == null || !validator.validate(current).isFailure());
     }
 
 }

test/com/dmdirc/IgnoreListTest.java

@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 
-public class IgnoreListTest extends junit.framework.TestCase {
+public class IgnoreListTest {
     
     private final String[][] tests = {
         {"a@b.c", "a@b\\.c"},

test/com/dmdirc/ProgramErrorTest.java

@@ -33,7 +33,7 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProgramErrorTest extends junit.framework.TestCase {
+public class ProgramErrorTest {
     
     private ErrorLevel level;
     private String message;

test/com/dmdirc/StringTranscoderTest.java

@@ -29,7 +29,7 @@ import java.nio.charset.Charset;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class StringTranscoderTest extends junit.framework.TestCase {
+public class StringTranscoderTest {
 
     @Test
     public void testTranscode() {

test/com/dmdirc/WritableFrameContainerTest.java

@@ -28,7 +28,7 @@ import java.util.Arrays;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class WritableFrameContainerTest extends junit.framework.TestCase {
+public class WritableFrameContainerTest {
     
     @Test
     public void testGetNumLines() {

test/com/dmdirc/actions/ActionComparisonNamesTest.java

@@ -56,9 +56,5 @@ public class ActionComparisonNamesTest {
         
         return res;
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ActionComparisonNamesTest.class);
-    }    
 
 }

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.config.IdentityManager;
+
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -30,6 +32,7 @@ public class ActionComponentChainTest {
 
     @Before
     public void setUp() throws Exception {
+        IdentityManager.load();
         ActionManager.init();
     }
 
@@ -111,10 +114,6 @@ public class ActionComponentChainTest {
     public void testEmptyToString() {
         final ActionComponentChain chain = new ActionComponentChain(String.class, "");
         chain.toString();
-    }    
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ActionComponentChainTest.class);
-    }    
+    }      
 
 }

test/com/dmdirc/actions/ActionConditionTest.java

@@ -22,14 +22,18 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.config.IdentityManager;
+
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionConditionTest extends junit.framework.TestCase {
+public class ActionConditionTest {
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
+        IdentityManager.load();
         ActionManager.init();
     }
 

test/com/dmdirc/actions/ActionGroupTest.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionGroupTest extends junit.framework.TestCase {
+public class ActionGroupTest {
 
     @Test
     public void testGetAuthor() {

test/com/dmdirc/actions/ActionManagerTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.config.IdentityManager;
 import java.io.File;
 
 import java.util.ArrayList;
@@ -30,17 +31,18 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionManagerTest extends junit.framework.TestCase {
+public class ActionManagerTest {
     
     @BeforeClass
-    public void setUpClass() throws Exception {
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
         ActionManager.init();
         
         tearDownClass();
     }
     
     @AfterClass
-    public void tearDownClass() throws Exception {
+    public static void tearDownClass() throws Exception {
         if (ActionManager.getGroups().containsKey("unit-test")) {
             ActionManager.removeGroup("unit-test");
         }

test/com/dmdirc/actions/ActionModelTest.java

@@ -23,15 +23,22 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.config.IdentityManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionModelTest extends junit.framework.TestCase {
+public class ActionModelTest {
+
+    @BeforeClass
+    public static void setUpClass() {
+        IdentityManager.load();
+    }
 
     @Test
     public void testConditions() {

test/com/dmdirc/actions/ActionTest.java

@@ -35,13 +35,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionTest extends junit.framework.TestCase {
+public class ActionTest {
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         IdentityManager.load();
         ActionManager.init();
     }

test/com/dmdirc/actions/ActionTypeComparatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionTypeComparatorTest extends junit.framework.TestCase {
+public class ActionTypeComparatorTest {
 
     @Test
     public void testCompare() {

test/com/dmdirc/actions/ConditionTreeTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ConditionTreeTest extends junit.framework.TestCase {
+public class ConditionTreeTest {
 
     @Test
     public void testParseString() {

test/com/dmdirc/actions/CoreActionComparisonTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class CoreActionComparisonTest extends junit.framework.TestCase {
+public class CoreActionComparisonTest {
 
     @Test
     public void testStringRegex() {

test/com/dmdirc/actions/CoreActionTypeTest.java

@@ -25,7 +25,7 @@ import com.dmdirc.actions.metatypes.PluginEvents;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class CoreActionTypeTest extends junit.framework.TestCase {
+public class CoreActionTypeTest {
 
     @Test
     public void testGetName() {

test/com/dmdirc/actions/StringComponentsTest.java

@@ -79,9 +79,5 @@ public class StringComponentsTest {
             {"abc foo def", "foo"}
         });
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(StringComponentsTest.class);
-    }    
 
 }

test/com/dmdirc/actions/metatypes/ActionEventsTest.java

@@ -25,7 +25,7 @@ import com.dmdirc.actions.interfaces.ActionMetaType;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionEventsTest extends junit.framework.TestCase {
+public class ActionEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/ChannelEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ChannelEventsTest extends junit.framework.TestCase {
+public class ChannelEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/ClientEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ClientEventsTest extends junit.framework.TestCase {
+public class ClientEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/PluginEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class PluginEventsTest extends junit.framework.TestCase {
+public class PluginEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/QueryEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class QueryEventsTest extends junit.framework.TestCase {
+public class QueryEventsTest {
 
     @Test
     public void testArity() {