Fix fallout from command changes

Change-Id: Ia5fb799a514aa47cbd3c407c42b3a149b147ae44
Reviewed-on: http://gerrit.dmdirc.com/1251
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -24,8 +24,11 @@ package com.dmdirc.addons.audio;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 import java.io.File;
 
@@ -34,7 +37,7 @@ import java.io.File;
  *
  * @author Shane "Dataforce" Mc Cormack
  */
-public final class AudioCommand extends GlobalCommand {
+public final class AudioCommand extends Command implements CommandInfo {
 
     /**
      * Creates a new instance of LoggingCommand.
@@ -46,46 +49,40 @@ public final class AudioCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-                        final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         final String filename = args.getArgumentsAsString();
         final File file = new File(filename);
         if (file.exists()) {
             if (AudioPlayer.isValid(file)) {
                 new AudioPlayer(file).play();
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Invalid file type");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Invalid file type");
             }
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "File does not exist");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "File does not exist");
         }
     }
 
-    /**
-     * Returns this command's name.
-     *
-     * @return The name of this command
-     */
+    /** {@inheritDoc} */
     @Override
     public String getName() {
         return "audio";
     }
 
-    /**
-     * Returns whether or not this command should be shown in help messages.
-     *
-     * @return True iff the command should be shown, false otherwise
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
         return true;
     }
 
-    /**
-     * Returns a string representing the help message for this command.
-     *
-     * @return the help message for this command
-     */
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
+    /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return this.getName() + " <file>";

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

@@ -24,8 +24,11 @@ package com.dmdirc.addons.audio;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 import java.awt.Toolkit;
 
@@ -34,7 +37,7 @@ import java.awt.Toolkit;
  *
  * @author Shane "Dataforce" Mc Cormack
  */
-public final class BeepCommand extends GlobalCommand {
+public final class BeepCommand extends Command implements CommandInfo {
 
     /**
      * Creates a new instance of BeepCommand.
@@ -46,36 +49,30 @@ public final class BeepCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-                        final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         Toolkit.getDefaultToolkit().beep();
     }
 
-    /**
-     * Returns this command's name.
-     *
-     * @return The name of this command
-     */
+    /** {@inheritDoc} */
     @Override
     public String getName() {
         return "beep";
     }
 
-    /**
-     * Returns whether or not this command should be shown in help messages.
-     *
-     * @return True iff the command should be shown, false otherwise
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
         return true;
     }
 
-    /**
-     * Returns a string representing the help message for this command.
-     *
-     * @return the help message for this command
-     */
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
+    /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return this.getName();

src/com/dmdirc/addons/calc/CalcCommand.java

@@ -24,7 +24,10 @@ package com.dmdirc.addons.calc;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 import java.text.ParseException;
 
@@ -34,12 +37,12 @@ import java.text.ParseException;
  *
  * @author chris
  */
-public class CalcCommand extends GlobalCommand {
+public class CalcCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         try {
             int offset = 0;
             boolean showexpr = false;
@@ -54,13 +57,13 @@ public class CalcCommand extends GlobalCommand {
             final Parser parser = new Parser(lexer);
             final Evaluator evaluator = new Evaluator(parser.parse());
             final Number result = evaluator.evaluate();
-            sendLine(origin, isSilent, FORMAT_OUTPUT,
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                     (showexpr ? input + " = " : "") + result);
         } catch (ParseException ex) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Unable to parse expression: "
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to parse expression: "
                     + ex.getMessage());
         } catch (ArithmeticException ex) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Unable to calculate expression: "
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to calculate expression: "
                     + ex.getMessage());
         }
     }
@@ -77,6 +80,12 @@ public class CalcCommand extends GlobalCommand {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -32,9 +32,13 @@ import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.ui_swing.SwingController;
 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;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginManager;
@@ -51,7 +55,8 @@ import javax.swing.JOptionPane;
  *
  * @author Shane "Dataforce" Mc Cormack
  */
-public final class DCCCommand extends ServerCommand implements IntelligentCommand {
+public final class DCCCommand extends Command implements IntelligentCommand,
+        CommandInfo {
 
     /** My Plugin */
     private final DCCPlugin myPlugin;
@@ -69,8 +74,10 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Server server = ((ServerCommandContext) context).getServer();
+        
         if (args.getArguments().length > 1) {
             final String type = args.getArguments()[0];
             final String target = args.getArguments()[1];
@@ -110,22 +117,22 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
                     ActionManager.processEvent(DCCActions.DCC_CHAT_REQUEST_SENT,
                             null, server, target);
 
-                    sendLine(origin, isSilent, "DCCChatStarting", target,
+                    sendLine(origin, args.isSilent(), "DCCChatStarting", target,
                             chat.getHost(), chat.getPort());
                     window.addLine("DCCChatStarting", target,
                             chat.getHost(), chat.getPort());
                 } else {
-                    sendLine(origin, isSilent, "DCCChatError",
+                    sendLine(origin, args.isSilent(), "DCCChatError",
                             "Unable to start chat with " + target
                             + " - unable to create listen socket");
                 }
             } else if (type.equalsIgnoreCase("send")) {
-                sendFile(target, origin, server, isSilent, args.getArgumentsAsString(2));
+                sendFile(target, origin, server, args.isSilent(), args.getArgumentsAsString(2));
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Unknown DCC Type: '" + type + "'");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown DCC Type: '" + type + "'");
             }
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Syntax: dcc <type> <target> [params]");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Syntax: dcc <type> <target> [params]");
         }
     }
 
@@ -236,6 +243,12 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -24,17 +24,14 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
-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.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 
 /**
  * DCC CommandParser
  */
-public class DCCCommandParser extends CommandParser {
+public class DCCCommandParser extends GlobalCommandParser {
 
     /** The singleton instance of the DCC command parser. */
     private static DCCCommandParser me;
@@ -68,20 +65,6 @@ public class DCCCommandParser extends CommandParser {
         CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
     }
 
-    /**
-     * 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 FrameContainer<?> origin,
-            final boolean isSilent, final Command command, final CommandArguments 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

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

@@ -25,8 +25,12 @@ package com.dmdirc.addons.dcop;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 import java.util.List;
 
@@ -34,7 +38,7 @@ import java.util.List;
  * The dcop command retrieves information from a dcop application.
  * @author chris
  */
-public final class DcopCommand extends ServerCommand {
+public final class DcopCommand extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of DcopCommand.
@@ -47,16 +51,17 @@ public final class DcopCommand extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length != 3) {
-            showUsage(origin, isSilent, "dcop", "<app> <object> <function>");
+            showUsage(origin, args.isSilent(), "dcop", "<app> <object> <function>");
             return;
         }
         
         final List<String> res = DcopPlugin.getDcopResult("dcop " + args.getArgumentsAsString());
         for (String line : res) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, line);
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, line);
         }
     }
     
@@ -72,6 +77,12 @@ public final class DcopCommand extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,8 +24,11 @@ package com.dmdirc.addons.dns;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -33,7 +36,7 @@ import java.util.TimerTask;
 /**
  * Performs DNS lookups for nicknames, hostnames or IPs.
  */
-public final class DNSCommand extends GlobalCommand {
+public final class DNSCommand extends Command implements CommandInfo {
     
     /** Creates a new instance of DNSCommand. */
     public DNSCommand() {
@@ -44,24 +47,24 @@ public final class DNSCommand extends GlobalCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
-            showUsage(origin, isSilent, "dns", "<IP|hostname>");
+            showUsage(origin, args.isSilent(), "dns", "<IP|hostname>");
             return;
         }
         
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolving: " + args.getArguments()[0]);
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Resolving: " + args.getArguments()[0]);
         new Timer("DNS Command Timer").schedule(new TimerTask() {
             /** {@inheritDoc} */
             @Override
             public void run() {
                 if (args.getArguments()[0].matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: "
+                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Resolved: "
                             + args.getArguments()[0] + ": "
                             + DNSPlugin.getHostname(args.getArguments()[0]));
                 } else {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolved: "
+                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Resolved: "
                             + args.getArguments()[0] + ": "
                             + DNSPlugin.getIPs(args.getArguments()[0]));
                 }
@@ -80,6 +83,12 @@ public final class DNSCommand extends GlobalCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -24,8 +24,11 @@ package com.dmdirc.addons.freedesktop_notifications;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 /**
  * The FDNotify Command shows a nice popup on using the FreeDesktop
@@ -33,7 +36,7 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class FDNotifyCommand extends GlobalCommand {
+public final class FDNotifyCommand extends Command implements CommandInfo {
     /** Plugin that owns this command. */
     final FreeDesktopNotificationsPlugin myPlugin;
     
@@ -50,8 +53,8 @@ public final class FDNotifyCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         myPlugin.showNotification("", args.getArgumentsAsString());
     }
     
@@ -67,6 +70,12 @@ public final class FDNotifyCommand extends GlobalCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,9 +25,13 @@ package com.dmdirc.addons.logging;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 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;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -38,7 +42,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  *
  * @author Shane "Dataforce" Mc Cormack
  */
-public final class LoggingCommand extends ServerCommand implements IntelligentCommand {
+public final class LoggingCommand extends Command implements IntelligentCommand,
+        CommandInfo {
 
     /**
      * Creates a new instance of LoggingCommand.
@@ -50,17 +55,18 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-                        final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Server server = ((ServerCommandContext) context).getServer();
         final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
         if (pluginInfo == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Logging Plugin is not loaded.");
             return;
         }
         final Plugin gotPlugin = pluginInfo.getPlugin();
 
         if (!(gotPlugin instanceof LoggingPlugin)) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Logging Plugin is not loaded.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Logging Plugin is not loaded.");
             return;
         }
 
@@ -69,23 +75,23 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
         if (args.getArguments().length > 0) {
             if (args.getArguments()[0].equalsIgnoreCase("reload")) {
                 if (PluginManager.getPluginManager().reloadPlugin(pluginInfo.getFilename())) {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin reloaded.");
+                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin reloaded.");
                 } else {
-                    sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin failed to reload.");
                 }
             } else if (args.getArguments()[0].equalsIgnoreCase("history")) {
                 if (!plugin.showHistory(origin)) {
-                    sendLine(origin, isSilent, FORMAT_ERROR, "Unable to open history for this window.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to open history for this window.");
                 }
             } 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.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, getName() + " reload           - Reload the logging plugin.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, getName() + " history          - Open the history of this window, if available.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, getName() + " help             - Show this help.");
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Unknown command '" + args.getArguments()[0] + "'. Use " + getName() + " help for a list of commands.");
+                sendLine(origin, args.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.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Use " + getName() + " help for a list of commands.");
         }
     }
 
@@ -103,31 +109,25 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
         return res;
     }
 
-    /**
-     * Returns this command's name.
-     *
-     * @return The name of this command
-     */
+    /** {@inheritDoc} */
     @Override
     public String getName() {
         return "logging";
     }
 
-    /**
-     * Returns whether or not this command should be shown in help messages.
-     *
-     * @return True iff the command should be shown, false otherwise
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
         return true;
     }
 
-    /**
-     * Returns a string representing the help message for this command.
-     *
-     * @return the help message for this command
-     */
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
+
+    /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return this.getName() + " <set|help> [parameters]";

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

@@ -24,11 +24,14 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChatCommand;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
@@ -41,7 +44,8 @@ import java.util.List;
  * variety of media players.
  * @author chris
  */
-public final class NowPlayingCommand extends ChatCommand implements IntelligentCommand {
+public final class NowPlayingCommand extends Command implements 
+        IntelligentCommand, CommandInfo {
     
     /** The plugin that's using this command. */
     final NowPlayingPlugin parent;
@@ -61,11 +65,12 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final MessageTarget<?> target, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final MessageTarget<?> target = ((ChatCommandContext) context).getChat();
         if (args.getArguments().length > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--sources")) {
-            doSourceList(origin, isSilent, args.getArgumentsAsString(1));
+            doSourceList(origin, args.isSilent(), args.getArgumentsAsString(1));
         } else if (args.getArguments().length > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--source")) {
             if (args.getArguments().length > 1) {
@@ -73,26 +78,26 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                 final MediaSource source = parent.getSource(sourceName);
                 
                 if (source == null) {
-                    sendLine(origin, isSilent, FORMAT_ERROR, "Source not found.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source not found.");
                 } else {
                     if (source.getState() != MediaSourceState.CLOSED) {
-                        target.getCommandParser().parseCommand(origin,
+                        target.getCommandParser().parseCommand(origin, context.getSource(),
                                 getInformation(source, args.getArgumentsAsString(2)));
                     } else {
-                        sendLine(origin, isSilent, FORMAT_ERROR, "Source is not running.");
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source is not running.");
                     }
                 }
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR,
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "You must specify a source when using --source.");
             }
         } else {
             if (parent.hasRunningSource()) {
-                target.getCommandParser().parseCommand(origin,
+                target.getCommandParser().parseCommand(origin, context.getSource(),
                         getInformation(parent.getBestSource(), args.
                         getArgumentsAsString(0)));
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "No running media sources available.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "No running media sources available.");
             }
         }
     }
@@ -169,6 +174,12 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
         return "nowplaying [--sources|--source <source>] [format] - " +
                 "tells the channel the song you're currently playing";
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHAT;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,9 +24,12 @@ package com.dmdirc.addons.osd;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -34,7 +37,8 @@ import com.dmdirc.ui.messages.Styliser;
  * The osd command shows an on screen message.
  * @author chris
  */
-public final class OsdCommand extends GlobalCommand implements IntelligentCommand {
+public final class OsdCommand extends Command implements 
+        IntelligentCommand, CommandInfo {
 
     /** The plugin that owns this command. */
     private final OsdPlugin plugin;
@@ -70,8 +74,8 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 0
                 && "--close".equalsIgnoreCase(args.getArguments()[0])) {
             osdManager.closeAll();
@@ -91,6 +95,12 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc}. */
     @Override

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

@@ -24,10 +24,13 @@ package com.dmdirc.addons.redirect;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChatCommand;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -38,17 +41,19 @@ import com.dmdirc.ui.input.TabCompleter;
  *
  * @author Chris
  */
-public class RedirectCommand extends ChatCommand implements IntelligentCommand {
+public class RedirectCommand extends Command implements IntelligentCommand,
+        CommandInfo {
     
     public RedirectCommand() {
     }
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final MessageTarget<?> target, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final MessageTarget<?> target = ((ChatCommandContext) context).getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(target),
-                args.getArgumentsAsString());
+                context.getSource(), args.getArgumentsAsString());
     }
     
     /** {@inheritDoc} */
@@ -62,6 +67,12 @@ public class RedirectCommand extends ChatCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHAT;
+    }
     
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -24,10 +24,13 @@ package com.dmdirc.addons.scriptplugin;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.LinkedList;
@@ -43,12 +46,15 @@ import java.lang.reflect.Method;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class ScriptCommand extends GlobalCommand implements IntelligentCommand {
+public final class ScriptCommand extends Command implements IntelligentCommand,
+        CommandInfo {
     /** My Plugin */
     final ScriptPlugin myPlugin;
 
     /**
      * Creates a new instance of ScriptCommand.
+     *
+     * @param plugin Parent plugin
      */
     public ScriptCommand(final ScriptPlugin plugin) {
         super();
@@ -58,31 +64,31 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
         
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments commandArgs) {
-        final String[] args = commandArgs.getArguments();
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final String[] sargs = args.getArguments();
     
-        if (args.length > 0 && (args[0].equalsIgnoreCase("rehash") || args[0].equalsIgnoreCase("reload"))) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Reloading scripts");
+        if (sargs.length > 0 && (sargs[0].equalsIgnoreCase("rehash") || sargs[0].equalsIgnoreCase("reload"))) {
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Reloading scripts");
             myPlugin.rehash();
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("load")) {
-            if (args.length > 1) {
-                final String filename = commandArgs.getArgumentsAsString(1);
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Loading: "+filename+" ["+myPlugin.loadScript(myPlugin.getScriptDir()+filename)+"]");
+        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("load")) {
+            if (sargs.length > 1) {
+                final String filename = args.getArgumentsAsString(1);
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Loading: "+filename+" ["+myPlugin.loadScript(myPlugin.getScriptDir()+filename)+"]");
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify a script to load");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify a script to load");
             }
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("unload")) {
-            if (args.length > 1) {
-                final String filename = commandArgs.getArgumentsAsString(1);
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Unloading: "+filename+" ["+myPlugin.loadScript(myPlugin.getScriptDir()+filename)+"]");
+        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("unload")) {
+            if (sargs.length > 1) {
+                final String filename = args.getArgumentsAsString(1);
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Unloading: "+filename+" ["+myPlugin.loadScript(myPlugin.getScriptDir()+filename)+"]");
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify a script to unload");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify a script to unload");
             }
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("eval")) {
-            if (args.length > 1) {
-                final String script = commandArgs.getArgumentsAsString(1);
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Evaluating: "+script);
+        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("eval")) {
+            if (sargs.length > 1) {
+                final String script = args.getArgumentsAsString(1);
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Evaluating: "+script);
                 try {
                     ScriptEngineWrapper wrapper;
                     if (IdentityManager.getGlobalConfig().hasOptionString(myPlugin.getDomain(), "eval.baseFile")) {
@@ -96,11 +102,11 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
                         wrapper = new ScriptEngineWrapper(myPlugin, null);
                     }
                     wrapper.getScriptEngine().put("cmd_origin", origin);
-                    wrapper.getScriptEngine().put("cmd_isSilent", isSilent);
-                    wrapper.getScriptEngine().put("cmd_args", args);
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Result: "+wrapper.getScriptEngine().eval(script));
+                    wrapper.getScriptEngine().put("cmd_isSilent", args.isSilent());
+                    wrapper.getScriptEngine().put("cmd_args", sargs);
+                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Result: "+wrapper.getScriptEngine().eval(script));
                 } catch (Exception e) {
-                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Exception: "+e+" -> "+e.getMessage());
+                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Exception: "+e+" -> "+e.getMessage());
                     
                     if (IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "eval.showStackTrace")) {
                         try {
@@ -111,24 +117,24 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
                                 
                                 final String[] stacktrace = (String[])exceptionToStringArray.invoke(null, e);
                                 for (String line : stacktrace) {
-                                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Stack trace: "+line);
+                                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: "+line);
                                 }
                             }
                         } catch (Exception ex) {
-                            sendLine(origin, isSilent, FORMAT_OUTPUT, "Stack trace: Exception showing stack trace: "+ex+" -> "+ex.getMessage());
+                            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: Exception showing stack trace: "+ex+" -> "+ex.getMessage());
                         }
                     }
                     
                 }
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify some script to eval.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify some script to eval.");
             }
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("savetobasefile")) {
-            if (args.length > 2) {
-                final String[] bits = args[1].split("/");
+        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("savetobasefile")) {
+            if (sargs.length > 2) {
+                final String[] bits = sargs[1].split("/");
                 final String functionName = bits[0];
-                final String script = commandArgs.getArgumentsAsString(2);
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Saving as '"+functionName+"': "+script);
+                final String script = args.getArgumentsAsString(2);
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Saving as '"+functionName+"': "+script);
                 if (IdentityManager.getGlobalConfig().hasOptionString(myPlugin.getDomain(), "eval.baseFile")) {
                     try {
                         final String baseFile = myPlugin.getScriptDir()+'/'+IdentityManager.getGlobalConfig().getOption(myPlugin.getDomain(), "eval.baseFile");
@@ -146,29 +152,29 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
                         writer.flush();
                         writer.close();
                     } catch (IOException ioe) {
-                        sendLine(origin, isSilent, FORMAT_ERROR, "IOException: "+ioe.getMessage());
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "IOException: "+ioe.getMessage());
                     }
                 } else {
-                    sendLine(origin, isSilent, FORMAT_ERROR, "No baseFile specified, please /set "+myPlugin.getDomain()+" eval.baseFile filename (stored in scripts dir of profile)");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "No baseFile specified, please /set "+myPlugin.getDomain()+" eval.baseFile filename (stored in scripts dir of profile)");
                 }
-            } else if (args.length > 1) {
-                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify some script to save.");
+            } else if (sargs.length > 1) {
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify some script to save.");
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify a function name and some script to save.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify a function name and some script to save.");
             }
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("help")) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "This command allows you to interact with the script plugin");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "-------------------");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "reload/rehash                  - Reload all loaded scripts");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "load <script>                  - load scripts/<script> (file name relative to scripts dir)");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "unload <script>                - unload <script> (full file name)");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "eval <script>                  - evaluate the code <script> and return the result");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "savetobasefile <name> <script> - save the code <script> to the eval basefile ("+myPlugin.getDomain()+".eval.basefile)");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "                                 as the function <name> (name/foo/bar will save it as 'name' with foo and");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "                                 bar as arguments.");
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "-------------------");
+        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("help")) {
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "This command allows you to interact with the script plugin");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "-------------------");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "reload/rehash                  - Reload all loaded scripts");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "load <script>                  - load scripts/<script> (file name relative to scripts dir)");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "unload <script>                - unload <script> (full file name)");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "eval <script>                  - evaluate the code <script> and return the result");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "savetobasefile <name> <script> - save the code <script> to the eval basefile ("+myPlugin.getDomain()+".eval.basefile)");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "                                 as the function <name> (name/foo/bar will save it as 'name' with foo and");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "                                 bar as arguments.");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "-------------------");
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Unknown subcommand.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown subcommand.");
         }
     }
 
@@ -230,28 +236,28 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
         return res;
     }
 
-    /**
-     * Returns this command's name.
-     *
-     * @return The name of this command
-     */
+    /** {@inheritDoc} */
     @Override
-    public String getName() { return "script"; }
+    public String getName() { 
+        return "script";
+    }
     
-    /**
-     * Returns whether or not this command should be shown in help messages.
-     *
-     * @return True iff the command should be shown, false otherwise
-     */
+    /** {@inheritDoc} */
     @Override
-    public boolean showInHelp() { return true; }
+    public boolean showInHelp() { 
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
-    /**
-     * Returns a string representing the help message for this command.
-     *
-     * @return the help message for this command
-     */
+    /** {@inheritDoc} */
     @Override
-    public String getHelp() { return "script - Allows controlling the script plugin"; }
+    public String getHelp() { 
+        return "script - Allows controlling the script plugin";
+    }
 }
 

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

@@ -23,17 +23,19 @@
 package com.dmdirc.addons.systray;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 /**
  * The /popup command allows the user to show a popup message from the system
  * tray icon.
  * @author chris
  */
-public final class PopupCommand extends ServerCommand {
+public final class PopupCommand extends Command implements CommandInfo {
     
     /** The SystrayPlugin that we belong to. */
     private final SystrayPlugin parent;
@@ -64,8 +66,8 @@ public final class PopupCommand extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         showPopup("DMDirc", args.getArgumentsAsString());
     }
 
@@ -81,6 +83,12 @@ public final class PopupCommand extends ServerCommand {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.ui.interfaces.Window;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -41,8 +42,11 @@ public final class TimedCommand extends TimerTask {
     /** The command to execute. */
     private final String command;
     
-    /** The window to use for executing commands. */
+    /** The container to use for executing commands. */
     private final FrameContainer<?> origin;
+
+    /** The window the command came from. */
+    private final Window window;
     
     /** The timer we're using for scheduling this command. */
     private final Timer timer;
@@ -52,15 +56,18 @@ public final class TimedCommand extends TimerTask {
      * @param repetitions The number of times this command will be executed
      * @param delay The number of seconds between each execution
      * @param command The command to be executed
-     * @param origin The command window to use for the execution
+     * @param origin The frame container to use for the execution
+     * @param window The window the command came from
      */
     public TimedCommand(final int repetitions, final int delay,
-            final String command, final FrameContainer<?> origin) {
+            final String command, final FrameContainer<?> origin,
+            final Window window) {
         super();
         
         this.repetitions = repetitions;
         this.command = command;
         this.origin = origin;
+        this.window = window;
         
         timer = new Timer("Timed Command Timer");
         timer.schedule(this, delay * 1000L, delay * 1000L);
@@ -76,7 +83,7 @@ public final class TimedCommand extends TimerTask {
             parser = ((WritableFrameContainer<?>) origin).getCommandParser();
         }
         
-        parser.parseCommand(origin, command);
+        parser.parseCommand(origin, window, command);
                 
         if (--repetitions <= 0) {
             timer.cancel();

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

@@ -24,9 +24,12 @@ package com.dmdirc.addons.time;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -35,7 +38,8 @@ import com.dmdirc.ui.input.TabCompleter;
  * interval, or to repeatedly occur with a specified delay.
  * @author chris
  */
-public final class TimerCommand extends GlobalCommand implements IntelligentCommand {
+public final class TimerCommand extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of TimerCommand.
@@ -46,10 +50,10 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length < 3) {
-            doUsage(origin, isSilent);
+            doUsage(origin, args.isSilent());
         } else {
             int repetitions = 0;
             int interval = 0;
@@ -59,12 +63,12 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
                 repetitions = Integer.parseInt(args.getArguments()[0]);
                 interval = Integer.parseInt(args.getArguments()[1]);
             } catch (NumberFormatException ex) {
-                doUsage(origin, isSilent);
+                doUsage(origin, args.isSilent());
                 return;
             }
             
-            new TimedCommand(repetitions, interval, command, origin);
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Command scheduled.");
+            new TimedCommand(repetitions, interval, command, origin, context.getSource());
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
         }
     }
     
@@ -88,6 +92,12 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/ui_swing/actions/CommandAction.java

@@ -74,7 +74,7 @@ public class CommandAction extends AbstractAction {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        parser.parseCommand(window.getContainer(), command);
+        parser.parseCommand(window.getContainer(), window, command);
     }
     
 }

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

@@ -24,8 +24,11 @@ package com.dmdirc.addons.urlcatcher;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.GlobalCommand;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.Map;
@@ -34,18 +37,25 @@ import java.util.Map;
  *
  * @author chris
  */
-public class UrlListCommand extends GlobalCommand implements IntelligentCommand {
+public class UrlListCommand extends Command implements IntelligentCommand,
+        CommandInfo {
     
     private final UrlCatcherPlugin plugin;
-    
+
+    /**
+     * Creates a new URL List command, outputting all known URLs seen by the URL
+     * catcher plugin to the active window.
+     *
+     * @param plugin Parent plugin
+     */
     public UrlListCommand(final UrlCatcherPlugin plugin) {
         this.plugin = plugin;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
         final String[] headers = {"URL", "Count"};
         final Map<String, Integer> map = plugin.getURLS();
         final String[][] data = new String[map.size()][];
@@ -55,7 +65,7 @@ public class UrlListCommand extends GlobalCommand implements IntelligentCommand
             data[i++] = new String[]{entry.getKey(), entry.getValue().toString()};
         }
         
-        sendLine(origin, isSilent, FORMAT_OUTPUT, doTable(headers, data));
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, doTable(headers, data));
     }
 
     /** {@inheritDoc} */
@@ -70,6 +80,12 @@ public class UrlListCommand extends GlobalCommand implements IntelligentCommand
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -25,11 +25,14 @@ package com.dmdirc.addons.redirect;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.ui.interfaces.InputWindow;
+import java.util.ArrayList;
+import java.util.Arrays;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -47,14 +50,15 @@ public class RedirectCommandTest {
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand();
-        final MessageTarget<?> target = mock(MessageTarget.class);
+        final MessageTarget<InputWindow> target = mock(MessageTarget.class);
         final InputWindow window = mock(InputWindow.class);
-        when(target.getFrame()).thenReturn(window);
+        when(target.getWindows()).thenReturn(new ArrayList<InputWindow>(Arrays.asList(window)));
         final CommandParser parser = new ServerCommandParser();
         when(window.getCommandParser()).thenReturn(parser);
-        when(window.getConfigManager()).thenReturn(IdentityManager.getGlobalConfig());
+        when(window.getContainer().getConfigManager()).thenReturn(IdentityManager.getGlobalConfig());
 
-        command.execute(target, null, target, false, new CommandArguments("/redirect /echo test"));
+        command.execute(target, new CommandArguments("/redirect /echo test"),
+                new ChatCommandContext(window, command, target));
         
         verify(target).sendLine("test");
     }