Update all plugin commands to use the new arguments

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/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/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

@@ -108,7 +108,21 @@ public class CommandArguments {
     public String getArgumentsAsString() {
         parse();
         
-        return getWordsAsString(1);
+        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);
     }
 
     /**