Introduce command contexts.

Fixes issue 4152
Fixes issue 4002

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

src/com/dmdirc/Channel.java

@@ -99,7 +99,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
                 ChannelWindow.class,
                 new ConfigManager(newServer.getProtocol(), newServer.getIrcd(),
                 newServer.getNetwork(), newServer.getAddress(), newChannelInfo.getName()),
-                new ChannelCommandParser());
+                new ChannelCommandParser(newServer));
 
         channelInfo = newChannelInfo;
         server = newServer;

src/com/dmdirc/GlobalWindow.java

@@ -94,10 +94,7 @@ public class GlobalWindow extends WritableFrameContainer<InputWindow> {
     /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
-        if (!line.isEmpty()) {
-            GlobalCommandParser.getGlobalCommandParser().parseCommand(this,
-                    CommandManager.getCommandChar() + line);
-        }
+        addLine("commandError", "You may only enter commands in the global window.");
     }
 
     /** {@inheritDoc} */
@@ -106,11 +103,8 @@ public class GlobalWindow extends WritableFrameContainer<InputWindow> {
         return -1;
     }
 
-    /**
-     * Retrieves the tab completer used by this global window.
-     *
-     * @return This global window's tab completer.
-     */
+    /** {@inheritDoc} */
+    @Override
     public TabCompleter getTabCompleter() {
         return tabCompleter;
     }

src/com/dmdirc/Query.java

@@ -74,7 +74,7 @@ public class Query extends MessageTarget<QueryWindow> implements PrivateActionLi
         super("query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 QueryWindow.class, newServer.getConfigManager(),
-                new QueryCommandParser());
+                new QueryCommandParser(newServer));
 
         this.server = newServer;
         this.host = newHost;

src/com/dmdirc/actions/ActionModel.java

@@ -30,6 +30,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.Window;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -132,6 +133,7 @@ public class ActionModel {
         }
 
         final FrameContainer<?> active = WindowManager.getActiveWindow();
+        Window window = null;
         WritableFrameContainer<?> cw = null;
         CommandParser cp = null;
 
@@ -143,6 +145,12 @@ public class ActionModel {
             cw = ServerManager.getServerManager().getServers().get(0);
         }
 
+        if (arguments.length > 0 && arguments[0] instanceof Window) {
+            window = (Window) arguments[0];
+        } else {
+            window = cw.getFrame();
+        }
+
         if (cw == null) {
             cp = GlobalCommandParser.getGlobalCommandParser();
         } else {
@@ -150,7 +158,7 @@ public class ActionModel {
         }
 
         for (String command : response) {
-            cp.parseCommand(cw, sub.doSubstitution(command, arguments));
+            cp.parseCommand(cw, window, sub.doSubstitution(command, arguments));
         }
 
         if (newFormat != null && format != null) {

src/com/dmdirc/commandparser/CommandInfoPair.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2010 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 com.dmdirc.commandparser.commands.Command;
+
+/**
+ * A combination of a {@link Command} and the {@link CommandInfo} which
+ * triggered it.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class CommandInfoPair {
+
+    /** The command info which caused the command to be triggered. */
+    private final CommandInfo commandInfo;
+    /** The command in question. */
+    private final Command command;
+
+    /**
+     * Creates a new CommandInfoPair.
+     *
+     * @param commandInfo The command info associated with the command
+     * @param command The command
+     */
+    public CommandInfoPair(final CommandInfo commandInfo, final Command command) {
+        this.commandInfo = commandInfo;
+        this.command = command;
+    }
+
+    /**
+     * Retrieves the command part of this pair.
+     *
+     * @return This pair's command
+     */
+    public Command getCommand() {
+        return command;
+    }
+
+    /**
+     * Retrieves the commandinfo part of this pair.
+     *
+     * @return This pair's commandinfo
+     */
+    public CommandInfo getCommandInfo() {
+        return commandInfo;
+    }
+
+}

src/com/dmdirc/commandparser/CommandType.java

@@ -53,7 +53,9 @@ public enum CommandType {
      * 
      * @param command The command to look up
      * @return The type of the specified command
+     * @deprecated Shouldn't be required any longer
      */
+    @Deprecated
     public static CommandType fromCommand(final Command command) {
         if (command instanceof GlobalCommand) {
             return TYPE_GLOBAL;

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

@@ -22,37 +22,22 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-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.
+ *
+ * @deprecated Commands should extend {@link Command} directly
  * @author chris
  */
+@Deprecated
 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.3m1
-     */
-    public abstract void execute(FrameContainer<?> origin, Server server, Channel channel,
-            boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */
     @Override
     public CommandType getType() {
         return CommandType.TYPE_CHANNEL;
     }
-    
+
 }

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

@@ -22,10 +22,6 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 
@@ -33,26 +29,16 @@ import com.dmdirc.commandparser.CommandType;
  * Represents a command that can be performed in the context of a "chat" window
  * (i.e., a channel or a query).
  *
+ * @deprecated Commands should extend {@link Command} directly
  * @author Chris
  */
+@Deprecated
 public abstract class ChatCommand 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 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.3m1
-     */
-    public abstract void execute(FrameContainer<?> origin, Server server, MessageTarget<?> target,
-            boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */
     @Override
     public CommandType getType() {
         return CommandType.TYPE_CHAT;
     }
+
 }

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

@@ -23,7 +23,9 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.messages.Styliser;
 
 /**
@@ -122,4 +124,15 @@ public abstract class Command {
         }
     }
 
+    /**
+     * Executes this command.
+     *
+     * @param origin The container which received the command
+     * @param args Arguments passed to this command
+     * @param context The context the command was executed in
+     * @since 0.6.4
+     */
+    public abstract void execute(FrameContainer<?> origin,
+            CommandArguments args, CommandContext context);
+
 }

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

@@ -22,8 +22,6 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 
@@ -31,21 +29,12 @@ import com.dmdirc.commandparser.CommandType;
  * Represents a generic global command. Global commands are associated with
  * no servers.
  *
+ * @deprecated Commands should extend {@link Command} directly
  * @author chris
  */
+@Deprecated
 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.3m1
-     */
-    public abstract void execute(FrameContainer<?> origin, boolean isSilent, CommandArguments args);
-
     /** {@inheritDoc} */
     @Override
     public CommandType getType() {

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

@@ -22,33 +22,18 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Query;
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 
 /**
  * Represents a command which can be performed only in the context of a query.
  *
+ * @deprecated Commands should extend {@link Command} directly
  * @author chris
  */
+@Deprecated
 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.3m1
-     */
-    public abstract void execute(FrameContainer<?> origin, Server server, Query query,
-            boolean isSilent, CommandArguments args);
-
     /** {@inheritDoc} */
     @Override
     public CommandType getType() {

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

@@ -22,9 +22,6 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 
@@ -32,22 +29,12 @@ import com.dmdirc.commandparser.CommandType;
  * Represents a generic server command. Server commands are associated with
  * a server instance.
  *
+ * @deprecated Commands should extend {@link Command} directly
  * @author chris
  */
+@Deprecated
 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.3m1
-     */
-    public abstract void execute(FrameContainer<?> origin, Server server,
-            boolean isSilent, CommandArguments args);
-
     /** {@inheritDoc} */
     @Override
     public CommandType getType() {

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

@@ -24,61 +24,72 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+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.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
 /**
  * The kick command bans a specified user or host from the channel.
- * 
+ *
  * @author chris
  */
-public final class Ban extends ChannelCommand implements IntelligentCommand {
-    
+public final class Ban extends Command implements IntelligentCommand, CommandInfo {
+
     /** Creates a new instance of Ban. */
     public Ban() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
+
         if (args.getArguments().length == 0) {
-            showUsage(origin, isSilent, "ban", "<user|host>");
+            showUsage(origin, args.isSilent(), "ban", "<user|host>");
             return;
         }
-        
+
         String host = args.getArguments()[0];
         final ChannelClientInfo user = channel.getChannelInfo().getChannelClient(host);
         if (user != null && !user.getClient().getHostname().isEmpty()) {
             // TODO: Customisable ban masks, somehow.
             host = "*!*@" + user.getClient().getHostname();
         }
-        
+
         channel.getChannelInfo().alterMode(true, 'b', host);
         channel.getChannelInfo().flushModes();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "ban";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
         return true;
     }
-    
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -90,12 +101,11 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
-        
+
         if (arg == 0) {
             res.include(TabCompletionType.CHANNEL_NICK);
         }
-        
+
         return res;
     }
-    
 }

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

@@ -22,15 +22,16 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+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.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -38,7 +39,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class ChannelSettings extends ChannelCommand implements IntelligentCommand {
+public final class ChannelSettings extends Command implements
+        IntelligentCommand, CommandInfo {
     
     /** Creates a new instance of ChannelSettings. */
     public ChannelSettings() {
@@ -49,9 +51,10 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
-        Main.getUI().showChannelSettingsDialog(channel);
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        context.getSource().getController().showChannelSettingsDialog(
+                ((ChannelCommandContext) context).getChannel());
     }
     
     /** {@inheritDoc} */
@@ -65,6 +68,12 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,11 +24,14 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
@@ -36,7 +39,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Cycle extends ChannelCommand {
+public final class Cycle extends Command implements CommandInfo {
     
     /** Creates a new instance of Cycle. */
     public Cycle() {
@@ -47,8 +50,9 @@ public final class Cycle extends ChannelCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "cyclemessage"));
         channel.join();
@@ -65,11 +69,16 @@ public final class Cycle extends ChannelCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
     
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return "cycle [message] - parts and rejoins the channel";
     }
-    
 }

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

@@ -24,12 +24,15 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+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.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -40,7 +43,8 @@ import com.dmdirc.ui.input.TabCompletionType;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class KickReason extends ChannelCommand implements IntelligentCommand {
+public final class KickReason extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /** Creates a new instance of KickReason. */
     public KickReason() {
@@ -51,10 +55,11 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
         if (args.getArguments().length == 0) {
-            showUsage(origin, isSilent, "kick", "<user> [reason]");
+            showUsage(origin, args.isSilent(), "kick", "<user> [reason]");
             return;
         }
         
@@ -62,7 +67,7 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
                 .getArguments()[0]);
         
         if (victim == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "User not found: "
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "User not found: "
                     + args.getArguments()[0]);
         } else {
             victim.kick(args.getArguments().length > 1 ? args.getArgumentsAsString(1) :
@@ -81,6 +86,12 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
     
     /** {@inheritDoc} */
     @Override
@@ -100,6 +111,6 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
         }
         
         return res;
-    }    
+    }
     
 }

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

@@ -26,11 +26,15 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -40,8 +44,8 @@ import com.dmdirc.ui.input.TabCompletionType;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Mode extends ChannelCommand implements IntelligentCommand,
-        ExternalCommand {
+public final class Mode extends Command implements IntelligentCommand,
+        ExternalCommand, CommandInfo {
 
     /** Creates a new instance of Mode. */
     public Mode() {
@@ -52,14 +56,16 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
         final ChannelInfo cChannel = channel.getChannelInfo();
 
         if (args.getArguments().length == 0) {
-            sendLine(origin, isSilent, "channelModeDiscovered", cChannel.getModes(), cChannel);
+            sendLine(origin, args.isSilent(), "channelModeDiscovered", cChannel.getModes(), cChannel);
         } else {
-            server.getParser().sendRawMessage("MODE " + cChannel + " " + args.getArgumentsAsString());
+            channel.getServer().getParser().sendRawMessage("MODE "
+                    + cChannel + " " + args.getArgumentsAsString());
         }
     }
 
@@ -86,6 +92,12 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -26,11 +26,15 @@ import com.dmdirc.Channel;
 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.ChannelCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -39,7 +43,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public class Names extends ChannelCommand implements IntelligentCommand, ExternalCommand {
+public class Names extends Command implements IntelligentCommand, 
+        ExternalCommand, CommandInfo {
     
     /**
      * Creates a new instance of Names.
@@ -52,9 +57,11 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
-        server.getParser().sendRawMessage("NAMES " + channel.getChannelInfo().getName());
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
+        channel.getServer().getParser().sendRawMessage("NAMES "
+                + channel.getChannelInfo().getName());
     }
     
 
@@ -77,6 +84,12 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -88,6 +101,6 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
-    } 
+    }
 
 }

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

@@ -24,18 +24,21 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+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.CommandOptions;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 
 /**
  * The part command parts the current channel with a specified part message.
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Part extends ChannelCommand {
+public final class Part extends Command implements CommandInfo {
     
     /** Creates a new instance of Part. */
     public Part() {
@@ -46,8 +49,9 @@ public final class Part extends ChannelCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "partmessage"));
         channel.close();
@@ -64,6 +68,12 @@ public final class Part extends ChannelCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,11 +25,14 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.ChannelClientProperty;
 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.ChannelCommand;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -42,7 +45,8 @@ import java.awt.Color;
  * Allows the user to set a nickname on the channel to use a custom colour.
  * @author chris
  */
-public final class SetNickColour extends ChannelCommand implements IntelligentCommand {
+public final class SetNickColour extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /** Creates a new instance of SetNickColour. */
     public SetNickColour() {
@@ -52,9 +56,11 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
     }
     
     /** {@inheritDoc} */
-    @SuppressWarnings("unchecked") @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    @SuppressWarnings("unchecked")
+    @Override
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
         
         int offset = 0;
         boolean nicklist = true;
@@ -71,7 +77,7 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
         }
         
         if (args.getArguments().length <= offset) {
-            showUsage(origin, isSilent, "setnickcolour", "[--nicklist|--text] <nick> [colour]");
+            showUsage(origin, args.isSilent(), "setnickcolour", "[--nicklist|--text] <nick> [colour]");
             return;
         }
         
@@ -80,7 +86,7 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
         offset++;
         
         if (target == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "No such nickname ("
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "No such nickname ("
                     + args.getArguments()[offset - 1] + ")!");
         } else if (args.getArguments().length <= offset) {
             // We're removing the colour
@@ -98,7 +104,7 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
             // We're setting the colour
             final Color newColour = ColourManager.parseColour(args.getArguments()[offset], null);
             if (newColour == null) {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Invalid colour specified.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Invalid colour specified.");
                 return;
             }
 
@@ -127,6 +133,12 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -26,10 +26,14 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.commands.ChannelCommand;
+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.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
 /**
@@ -37,7 +41,8 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class ShowTopic extends ChannelCommand implements ExternalCommand {
+public final class ShowTopic extends Command implements ExternalCommand,
+        CommandInfo {
 
     /** Creates a new instance of ShowTopic. */
     public ShowTopic() {
@@ -48,17 +53,18 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final Channel channel, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final Channel channel = ((ChannelCommandContext) context).getChannel();
         if (args.getArguments().length == 0) {
             final ChannelInfo cChannel = channel.getChannelInfo();
 
             if (cChannel.getTopic().isEmpty()) {
-                sendLine(origin, isSilent, "channelNoTopic", cChannel);
+                sendLine(origin, args.isSilent(), "channelNoTopic", cChannel);
             } else {
-                final String[] parts = server.parseHostmask(cChannel.getTopicSetter());
+                final String[] parts = channel.getServer().parseHostmask(cChannel.getTopicSetter());
 
-                sendLine(origin, isSilent, "channelTopicDiscovered",
+                sendLine(origin, args.isSilent(), "channelTopicDiscovered",
                         "", parts[0], parts[1], parts[2], cChannel.getTopic(),
                         1000 * cChannel.getTopicTime(), cChannel);
             }
@@ -90,6 +96,12 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHANNEL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -1,96 +1,105 @@
-/*
- * Copyright (c) 2006-2010 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.commands.chat;
-
-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.CommandManager;
-import com.dmdirc.commandparser.commands.ValidatingCommand;
-import com.dmdirc.config.prefs.validator.ValidationResponse;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-/**
- * The me command sends a CTCP action to the current channel.
- * @author chris
- */
-public final class Me extends ChatCommand implements ValidatingCommand {
-    
-    /** Creates a new instance of Me. */
-    public Me() {
-        super();
-        
-        CommandManager.registerCommand(this);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void execute(final FrameContainer<?> origin, final Server server,
-            final MessageTarget<?> target, final boolean isSilent, final CommandArguments args) {
-        if (args.getArguments().length == 0) {
-            showUsage(origin, isSilent, "me", "<action>");
-        } else {
-            target.sendAction(args.getArgumentsAsString());
-        }
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "me";
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "me <action> - sends the specified action";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validateArguments(final InputWindow origin, 
-            final CommandArguments arguments) {
-        if (origin.getContainer().getServer() == null
-                || origin.getContainer().getServer().getParser() == null) {
-            return new ValidationResponse();
-        }
-        
-        final int length = 2 + arguments.getArgumentsAsString().length();
-        
-        if (origin.getContainer().getServer().getParser().getMaxLength("PRIVMSG",
-                origin.getContainer().toString()) <= length) {
-            return new ValidationResponse("Too long");
-        } else {
-            return new ValidationResponse();
-        }
-    }
-    
-}
+/*
+ * Copyright (c) 2006-2010 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.commands.chat;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.MessageTarget;
+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.ValidatingCommand;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.config.prefs.validator.ValidationResponse;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+/**
+ * The me command sends a CTCP action to the current channel.
+ * @author chris
+ */
+public final class Me extends Command implements ValidatingCommand, CommandInfo {
+
+    /** Creates a new instance of Me. */
+    public Me() {
+        super();
+
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        final MessageTarget<?> target = ((ChatCommandContext) context).getChat();
+        if (args.getArguments().length == 0) {
+            showUsage(origin, args.isSilent(), "me", "<action>");
+        } else {
+            target.sendAction(args.getArgumentsAsString());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return "me";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_CHAT;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHelp() {
+        return "me <action> - sends the specified action";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ValidationResponse validateArguments(final InputWindow origin,
+            final CommandArguments arguments) {
+        if (origin.getContainer().getServer() == null
+                || origin.getContainer().getServer().getParser() == null) {
+            return new ValidationResponse();
+        }
+
+        final int length = 2 + arguments.getArgumentsAsString().length();
+
+        if (origin.getContainer().getServer().getParser().getMaxLength("PRIVMSG",
+                origin.getContainer().toString()) <= length) {
+            return new ValidationResponse("Too long");
+        } else {
+            return new ValidationResponse();
+        }
+    }
+}

src/com/dmdirc/commandparser/commands/context/ChannelCommandContext.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2006-2010 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.commands.context;
+
+import com.dmdirc.Channel;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * A specialised {@link CommandContext} for commands executed in channels.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ChannelCommandContext extends ChatCommandContext {
+
+    /** The channel associated with the command. */
+    private final Channel channel;
+
+    /**
+     * Creates a new channel command context.
+     *
+     * @param source The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     * @param channel The channel associated with the command
+     */
+    public ChannelCommandContext(Window source, CommandInfo commandInfo, Channel channel) {
+        super(source, commandInfo, channel);
+        this.channel = channel;
+    }
+
+    /**
+     * Retrieves the channel associated with this context.
+     *
+     * @return This context's channel
+     */
+    public Channel getChannel() {
+        return channel;
+    }
+
+}

src/com/dmdirc/commandparser/commands/context/ChatCommandContext.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2006-2010 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.commands.context;
+
+import com.dmdirc.MessageTarget;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * A command context specific to chat windows.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ChatCommandContext extends ServerCommandContext {
+
+    /** The chat container associated with this context. */
+    private final MessageTarget<?> chat;
+
+    /**
+     * Creates a new chat command context.
+     *
+     * @param source The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     * @param chat The chat container associated with the command
+     */
+    public ChatCommandContext(final Window source, final CommandInfo commandInfo,
+            final MessageTarget<?> chat) {
+        super(source, commandInfo, chat.getServer());
+        this.chat = chat;
+    }
+
+    /**
+     * Retrieves the chat container's associated with the command.
+     *
+     * @return This context's associated container
+     */
+    public MessageTarget<?> getChat() {
+        return chat;
+    }
+}

src/com/dmdirc/commandparser/commands/context/CommandContext.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2006-2010 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.commands.context;
+
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * Provides information relating to the context that a command was executed in.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class CommandContext {
+
+    /** The command info object which associated the command with the input. */
+    protected final CommandInfo commandInfo;
+
+    /** The source of this command. */
+    protected final Window source;
+
+    /**
+     * Creates a new command context.
+     *
+     * @param source The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     */
+    public CommandContext(final Window source, final CommandInfo commandInfo) {
+        this.source = source;
+        this.commandInfo = commandInfo;
+    }
+
+    /**
+     * Retrieves the command information object which caused the command to
+     * be selected in response to the user's input.
+     *
+     * @return The relevant command info object
+     */
+    public CommandInfo getCommandInfo() {
+        return commandInfo;
+    }
+
+    /**
+     * Retrieves the window, if any, where the command was entered.
+     *
+     * @return The window the command came from, or null
+     */
+    public Window getSource() {
+        return source;
+    }
+
+}

src/com/dmdirc/commandparser/commands/context/QueryCommandContext.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2006-2010 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.commands.context;
+
+import com.dmdirc.Query;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * A query-specific command context.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class QueryCommandContext extends ChatCommandContext {
+
+    /** The query the command was executed for. */
+    private final Query query;
+
+    /**
+     * Creates a new query command context.
+     *
+     * @param source The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     * @param query The query associated with the command
+     */
+    public QueryCommandContext(final Window source, final CommandInfo commandInfo, final Query query) {
+        super(source, commandInfo, query);
+        this.query = query;
+    }
+
+    /**
+     * Retrieves the query associated with this context.
+     *
+     * @return This context's query
+     */
+    public Query getQuery() {
+        return query;
+    }
+
+}

src/com/dmdirc/commandparser/commands/context/ServerCommandContext.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2010 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.commands.context;
+
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * A command context for server commands.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerCommandContext extends CommandContext {
+
+    /** The server the command was executed for. */
+    private final Server server;
+
+    /**
+     * Creates a new server command context.
+     *
+     * @param source The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     * @param server The server associated with the command
+     */
+    public ServerCommandContext(final Window source, final CommandInfo commandInfo,
+            final Server server) {
+        super(source, commandInfo);
+        this.server = server;
+    }
+
+    /**
+     * Retrieves the server associated with this context.
+     *
+     * @return This context's server
+     */
+    public Server getServer() {
+        return server;
+    }
+
+}

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

@@ -25,9 +25,12 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 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.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
@@ -36,7 +39,8 @@ import com.dmdirc.ui.input.TabCompleter;
  * The Active command issues a command to the active window.
  * @author chris
  */
-public final class Active extends GlobalCommand implements IntelligentCommand {
+public final class Active extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Active.
@@ -49,15 +53,15 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
     
     /** {@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 command = args.getArgumentsAsString();
         
         final FrameContainer<?> window = WindowManager.getActiveWindow();
         
         if (window != null && window instanceof WritableFrameContainer<?>) {
             ((WritableFrameContainer<?>) window).getCommandParser()
-                    .parseCommand(window, command);
+                    .parseCommand(window, context.getSource(), command);
         }
     }
     
@@ -73,6 +77,12 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -28,9 +28,12 @@ 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.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;
 
@@ -39,8 +42,8 @@ import com.dmdirc.ui.input.TabCompleter;
  * 
  * @author chris
  */
-public final class AliasCommand extends GlobalCommand implements
-        IntelligentCommand {
+public final class AliasCommand extends Command implements
+        IntelligentCommand, CommandInfo {
 
     /**
      * Creates a new instance of Active.
@@ -53,10 +56,10 @@ public final class AliasCommand extends GlobalCommand implements
 
     /** {@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 < 2) {
-            showUsage(origin, isSilent, "alias", "[--remove] <name> [command]");
+            showUsage(origin, args.isSilent(), "alias", "[--remove] <name> [command]");
             return;
         }
 
@@ -66,10 +69,10 @@ public final class AliasCommand extends GlobalCommand implements
                     ? args.getArguments()[1].substring(1) : args.getArguments()[1];
 
             if (doRemove(name)) {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Alias '" + name +
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '" + name +
                          "' removed.");
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Alias '" + name +
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name +
                          "' not found.");
             }
 
@@ -82,7 +85,7 @@ public final class AliasCommand extends GlobalCommand implements
         for (Action alias : AliasWrapper.getAliasWrapper()) {
             if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
                     name)) {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Alias '" + name +
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name +
                          "' already exists.");
                 return;
             }
@@ -92,7 +95,7 @@ public final class AliasCommand extends GlobalCommand implements
         myAlias.setResponse(new String[]{args.getArgumentsAsString(1)});
         myAlias.createAction().save();
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Alias '" + name +
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '" + name +
                  "' created.");
     }
 
@@ -128,6 +131,12 @@ public final class AliasCommand extends GlobalCommand implements
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -26,9 +26,12 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 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;
 
@@ -36,7 +39,8 @@ import com.dmdirc.ui.input.TabCompleter;
  * The AllServers command allows users to issue commands to all servers.
  * @author chris
  */
-public final class AllServers extends GlobalCommand implements IntelligentCommand {
+public final class AllServers extends Command implements IntelligentCommand,
+        CommandInfo{
     
     /** Creates a new instance of AllServers. */
     public AllServers() {
@@ -47,12 +51,12 @@ public final class AllServers 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) {
         final String command = args.getArgumentsAsString();
         
         for (Server target : ServerManager.getServerManager().getServers()) {
-            target.getCommandParser().parseCommand(target, command);
+            target.getCommandParser().parseCommand(target, context.getSource(), command);
         }
     }
     
@@ -68,6 +72,12 @@ public final class AllServers extends GlobalCommand implements IntelligentComman
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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;
 
 /**
@@ -34,7 +37,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * 
  * @author chris
  */
-public final class Clear extends GlobalCommand implements IntelligentCommand {
+public final class Clear extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Clear.
@@ -47,8 +51,8 @@ public final class Clear extends GlobalCommand implements IntelligentCommand {
     
     /** {@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) {
         origin.getDocument().clear();
     }
     
@@ -64,6 +68,12 @@ public final class Clear extends GlobalCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -26,9 +26,12 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 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.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -53,7 +56,7 @@ import java.util.TreeSet;
  *
  * @author Chris
  */
-public class Debug extends GlobalCommand implements IntelligentCommand {
+public class Debug extends Command implements IntelligentCommand, CommandInfo {
     
     /**
      * Creates a new instance of Debug.
@@ -64,47 +67,47 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     
     /** {@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, "debug", "<debug command> [options]");
+            showUsage(origin, args.isSilent(), "debug", "<debug command> [options]");
         } else if ("error".equals(args.getArguments()[0])) {
             doError(args.getArguments());
         } else if ("showraw".equals(args.getArguments()[0])) {
-            doShowRaw(origin, isSilent);
+            doShowRaw(origin, args.isSilent());
         } else if ("configstats".equals(args.getArguments()[0])) {
-            doConfigStats(origin, isSilent, args.getArguments());
+            doConfigStats(origin, args.isSilent(), args.getArguments());
         } else if ("configinfo".equals(args.getArguments()[0])) {
-            doConfigInfo(origin, isSilent);
+            doConfigInfo(origin, args.isSilent());
         } else if ("globalconfiginfo".equals(args.getArguments()[0])) {
-            doGlobalConfigInfo(origin, isSilent);
+            doGlobalConfigInfo(origin, args.isSilent());
         } else if ("colourspam".equals(args.getArguments()[0])) {
-            doColourSpam(origin, isSilent);
+            doColourSpam(origin, args.isSilent());
         } else if ("meminfo".equals(args.getArguments()[0])) {
-            doMemInfo(origin, isSilent);
+            doMemInfo(origin, args.isSilent());
         } else if ("rungc".equals(args.getArguments()[0])) {
-            doGarbage(origin, isSilent);
+            doGarbage(origin, args.isSilent());
         } else if ("threads".equals(args.getArguments()[0])) {
-            doThreads(origin, isSilent);
+            doThreads(origin, args.isSilent());
         } else if ("forceupdate".equals(args.getArguments()[0])) {
-            doForceUpdate(origin, isSilent);
+            doForceUpdate(origin, args.isSilent());
         } else if ("serverinfo".equals(args.getArguments()[0])) {
-            doServerInfo(origin, isSilent);
+            doServerInfo(origin, args.isSilent());
         } else if ("serverstate".equals(args.getArguments()[0])) {
-            doServerState(origin, isSilent);
+            doServerState(origin, args.isSilent());
         } else if ("benchmark".equals(args.getArguments()[0])) {
             doBenchmark(origin);
         } else if ("services".equals(args.getArguments()[0])) {
-            doServices(origin, isSilent, args.getArguments());
+            doServices(origin, args.isSilent(), args.getArguments());
         } else if ("firstrun".equals(args.getArguments()[0])) {
             Main.getUI().showFirstRunWizard();
         } else if ("migration".equals(args.getArguments()[0])) {
             Main.getUI().showMigrationWizard();
         } else if ("notify".equals(args.getArguments()[0])) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Current notification colour is: "
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Current notification colour is: "
                     + origin.getNotification());
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Unknown debug action.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown debug action.");
         }
     }
     
@@ -465,6 +468,12 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return false;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -26,9 +26,12 @@ import com.dmdirc.CustomWindow;
 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.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.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -41,7 +44,8 @@ import java.util.List;
  *
  * @author chris
  */
-public final class Echo extends GlobalCommand implements IntelligentCommand {
+public final class Echo extends Command implements IntelligentCommand,
+        CommandInfo {
 
     /**
      * Creates a new instance of Echo.
@@ -54,8 +58,8 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
 
     /** {@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) {
         int offset = 0;
         Date time = new Date();
 
@@ -64,7 +68,7 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
             try {
                 time = new Date(Long.parseLong(args.getWordsAsString(2, 2)));
             } catch (NumberFormatException ex) {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Unable to process timestamp");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to process timestamp");
                 return;
             }
 
@@ -73,7 +77,7 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
 
         if (args.getArguments().length > offset
                 && args.getArguments()[offset].equalsIgnoreCase("--active")) {
-            if (!isSilent) {
+            if (!args.isSilent()) {
                 final FrameContainer<?> frame = WindowManager.getActiveWindow();
                 frame.addLine(FORMAT_OUTPUT, time, args.getArgumentsAsString(offset + 1));
             }
@@ -91,13 +95,13 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
             }
 
             if (frame == null) {
-                sendLine(origin, isSilent, FORMAT_ERROR,
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "Unable to find target window");
-            } else if (!isSilent) {
+            } else if (!args.isSilent()) {
                 frame.addLine(FORMAT_OUTPUT, time, args.getArgumentsAsString(offset + 2));
             }
 
-        } else if (origin != null && !isSilent) {
+        } else if (origin != null && !args.isSilent()) {
             origin.addLine(FORMAT_OUTPUT, time, args.getArgumentsAsString(offset));
         }
     }
@@ -114,6 +118,12 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -25,8 +25,11 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 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 exit command allows the user to quit DMDirc with a custom quit message.
@@ -34,7 +37,7 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
  * supplied) and saves the config file.
  * @author chris
  */
-public final class Exit extends GlobalCommand {
+public final class Exit extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of Exit.
@@ -47,8 +50,8 @@ public final class Exit 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) {
         Main.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));
     }
@@ -65,6 +68,12 @@ public final class Exit extends GlobalCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
         
     /** {@inheritDoc}. */
     @Override

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

@@ -1,170 +1,177 @@
-/*
- * Copyright (c) 2006-2010 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.commands.global;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.messages.Styliser;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The help command shows the user a list of available commands, along with
- * their arguments, and a description. It is context-aware, so channel commands
- * are only displayed when in a channel window, for example.
- * @author chris
- */
-public final class Help extends GlobalCommand implements IntelligentCommand {
-    
-    /**
-     * Creates a new instance of Help.
-     */
-    public Help() {
-        super();
-        
-        CommandManager.registerCommand(this);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void execute(final FrameContainer<?> origin, final boolean isSilent,
-            final CommandArguments args) {
-        if (args.getArguments().length == 0) {
-            showAllCommands(origin, isSilent);
-        } else {
-            showCommand(origin, isSilent, args.getArguments()[0]);
-        }
-    }
-    
-    /**
-     * Shows a list of all commands valid for the current window.
-     * 
-     * @param origin The window the command was executed in
-     * @param isSilent Whether this command has been silenced or not
-     */
-    private void showAllCommands(final FrameContainer<?> origin, final boolean isSilent) {
-        final List<String> commands = new ArrayList<String>(((WritableFrameContainer<?>) origin)
-                .getCommandParser().getCommands().keySet());
-
-        Collections.sort(commands);
-        
-        sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                + "----------------------- Available commands -------");
-        
-        final StringBuilder builder = new StringBuilder();
-        
-        for (String command : commands) {
-            if (builder.length() + command.length() + 1 > 50) {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
-                builder.delete(0, builder.length());
-            } else if (builder.length() > 0) {
-                builder.append(' ');
-            }
-            
-            builder.append(command);
-        }
-        
-        if (builder.length() > 0) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
-        }
-        
-        sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                + "--------------------------------------------------");
-    }
-    
-    /**
-     * Shows information about the specified command.
-     * 
-     * @param origin The window the command was executed in
-     * @param isSilent Whether this command has been silenced or not
-     * @param name The name of the command to display info for
-     */
-    private void showCommand(final FrameContainer<?> origin, final boolean isSilent,
-            final String name) {
-        Map.Entry<CommandInfo, Command> command = null;
-
-        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.");
-        } else {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                    + "---------------------- Command information -------");            
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                    + " Name: " + name);
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                    + " Type: " + command.getKey().getType());
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                    + "Usage: " + command.getKey().getHelp());
-            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
-                    + "--------------------------------------------------");            
-        }
-    }
-    
-    /** {@inheritDoc}. */
-    @Override
-    public String getName() {
-        return "help";
-    }
-    
-    /** {@inheritDoc}. */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    @Override
-    public String getHelp() {
-        return "help [command] - shows client command help";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public AdditionalTabTargets getSuggestions(final int arg,
-            final IntelligentCommandContext context) {
-        final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
-
-        if (arg == 0) {
-            res.include(TabCompletionType.COMMAND);
-        }
-        
-        return res;
-    } 
-    
-}
+/*
+ * Copyright (c) 2006-2010 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.commands.global;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
+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.context.CommandContext;
+import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.input.TabCompletionType;
+import com.dmdirc.ui.messages.Styliser;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The help command shows the user a list of available commands, along with
+ * their arguments, and a description. It is context-aware, so channel commands
+ * are only displayed when in a channel window, for example.
+ * @author chris
+ */
+public final class Help extends Command implements IntelligentCommand, CommandInfo {
+
+    /**
+     * Creates a new instance of Help.
+     */
+    public Help() {
+        super();
+
+        CommandManager.registerCommand(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final FrameContainer<?> origin,
+            final CommandArguments args, final CommandContext context) {
+        if (args.getArguments().length == 0) {
+            showAllCommands(origin, args.isSilent());
+        } else {
+            showCommand(origin, args.isSilent(), args.getArguments()[0]);
+        }
+    }
+
+    /**
+     * Shows a list of all commands valid for the current window.
+     *
+     * @param origin The window the command was executed in
+     * @param isSilent Whether this command has been silenced or not
+     */
+    private void showAllCommands(final FrameContainer<?> origin, final boolean isSilent) {
+        final List<String> commands = new ArrayList<String>(((WritableFrameContainer<?>) origin)
+                .getCommandParser().getCommands().keySet());
+
+        Collections.sort(commands);
+
+        sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                + "----------------------- Available commands -------");
+
+        final StringBuilder builder = new StringBuilder();
+
+        for (String command : commands) {
+            if (builder.length() + command.length() + 1 > 50) {
+                sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
+                builder.delete(0, builder.length());
+            } else if (builder.length() > 0) {
+                builder.append(' ');
+            }
+
+            builder.append(command);
+        }
+
+        if (builder.length() > 0) {
+            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED + builder.toString());
+        }
+
+        sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                + "--------------------------------------------------");
+    }
+
+    /**
+     * Shows information about the specified command.
+     *
+     * @param origin The window the command was executed in
+     * @param isSilent Whether this command has been silenced or not
+     * @param name The name of the command to display info for
+     */
+    private void showCommand(final FrameContainer<?> origin, final boolean isSilent,
+            final String name) {
+        Map.Entry<CommandInfo, Command> command = null;
+
+        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.");
+        } else {
+            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                    + "---------------------- Command information -------");
+            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                    + " Name: " + name);
+            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                    + " Type: " + command.getKey().getType());
+            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                    + "Usage: " + command.getKey().getHelp());
+            sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_FIXED
+                    + "--------------------------------------------------");
+        }
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public String getName() {
+        return "help";
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
+    /** {@inheritDoc}. */
+    @Override
+    public String getHelp() {
+        return "help [command] - shows client command help";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
+
+        if (arg == 0) {
+            res.include(TabCompletionType.COMMAND);
+        }
+
+        return res;
+    }
+
+}

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

@@ -25,10 +25,13 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 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.parsers.GlobalCommandParser;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -40,7 +43,8 @@ import com.dmdirc.ui.input.TabCompleter;
  *
  * @author chris
  */
-public final class Ifplugin extends GlobalCommand implements IntelligentCommand {
+public final class Ifplugin extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Ifplugin.
@@ -53,10 +57,10 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
     
     /** {@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 <= 1) {
-            showUsage(origin, isSilent, "ifplugin", "<[!]plugin> <command>");
+            showUsage(origin, args.isSilent(), "ifplugin", "<[!]plugin> <command>");
             return;
         }
         
@@ -75,10 +79,10 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
         if (result != negative) {
             if (origin == null) {
                 GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
-                        args.getArgumentsAsString(1));
+                        context.getSource(), args.getArgumentsAsString(1));
             } else {
                 ((WritableFrameContainer<?>) origin).getCommandParser()
-                        .parseCommand(origin, args.getArgumentsAsString(1));
+                        .parseCommand(origin, context.getSource(), args.getArgumentsAsString(1));
             }
         }
     }
@@ -94,6 +98,12 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,12 +24,15 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 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.interfaces.InputWindow;
 
 /**
  * The input command allows you to maniplulate text in a windows inputField.
@@ -37,7 +40,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * @author Simon
  * @since 0.6.4
  */
-public class Input extends GlobalCommand implements IntelligentCommand {
+public class Input extends Command implements IntelligentCommand, CommandInfo {
 
     /**
      * Creates a new instance of Input.
@@ -50,20 +53,19 @@ public class Input extends GlobalCommand implements IntelligentCommand {
 
     /** {@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, "input",
+            showUsage(origin, args.isSilent(), "input",
                     "[--clear] <text to insert into inputfield");
             return;
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
-            ((WritableFrameContainer<?>) origin).getFrame()
-                    .getInputHandler().clearInputField();
+            ((InputWindow) context.getSource()).getInputHandler()
+                    .clearInputField();
         } else {
-            ((WritableFrameContainer<?>) origin).getFrame()
-                    .getInputHandler().addToInputField(args.getArgumentsAsString());
+            ((InputWindow) context.getSource()).getInputHandler()
+                    .addToInputField(args.getArgumentsAsString());
         }
     }
 
@@ -79,6 +81,12 @@ public class Input extends GlobalCommand implements IntelligentCommand {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -35,7 +38,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * Allows the user to load a plugin.
  * @author chris
  */
-public final class LoadPlugin extends GlobalCommand implements IntelligentCommand {
+public final class LoadPlugin extends Command implements IntelligentCommand,
+        CommandInfo {
 
     /**
      * Creates a new instance of LoadPlugin.
@@ -48,10 +52,10 @@ public final class LoadPlugin 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) {
-            showUsage(origin, isSilent, "loadplugin", "<plugin>");
+            showUsage(origin, args.isSilent(), "loadplugin", "<plugin>");
             return;
         }
 
@@ -61,16 +65,16 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
                 .getPluginInfo(args.getArguments()[0]);
         
         if (plugin == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin loading failed");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin loading failed");
         } else if (plugin.isLoaded()) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin already loaded.");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin already loaded.");
         } else {
             plugin.loadPlugin();
             if (plugin.isLoaded()) {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin loaded.");
                 PluginManager.getPluginManager().updateAutoLoad(plugin);
             } else {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Loading plugin failed. ("
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Loading plugin failed. ("
                         + plugin.getLastError() + ")");
             }
         }
@@ -89,6 +93,12 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -25,9 +25,12 @@ package com.dmdirc.commandparser.commands.global;
 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.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.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -45,7 +48,8 @@ import java.util.regex.Pattern;
  * 
  * @author chris
  */
-public final class NewServer extends GlobalCommand implements IntelligentCommand {
+public final class NewServer extends Command implements IntelligentCommand,
+        CommandInfo {
 
     /**
      * Creates a new instance of NewServer.
@@ -58,12 +62,12 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
 
     /** {@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) {
         URI address = null;
 
         if (args.getArguments().length == 0) {
-            showUsage(origin, isSilent, "newserver",
+            showUsage(origin, args.isSilent(), "newserver",
                     "<host[:[+]port]> [password]");
             address = null;
             return;
@@ -77,7 +81,7 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
             }
         }
         if (address == null) {
-            address = parseInput(origin, isSilent, args);
+            address = parseInput(origin, args.isSilent(), args);
         }
 
         if (address == null) {
@@ -137,7 +141,7 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
      *
      * @return URI is input was valid
      */
-    public static URI parseInput(final FrameContainer origin, final boolean isSilent,
+    public static URI parseInput(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
 
         boolean ssl = false;
@@ -192,7 +196,7 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
                 if (origin == null) {
                     Logger.userError(ErrorLevel.LOW, "Port must be between 1 " +
                             "and 65535 in newserver command");
-                } else if (!isSilent) {
+                } else if (!args.isSilent()) {
                     origin.addLine(FORMAT_ERROR, "Port must be between 1 and 65535");
                 }
 
@@ -213,7 +217,7 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
             if (origin == null) {
                 Logger.userError(ErrorLevel.LOW, "Invalid address provided to "
                         + "newserver command. Host: " + host + ", Port: " + port, ex);
-            } else if (!isSilent) {
+            } else if (!args.isSilent()) {
                 origin.addLine(FORMAT_ERROR, "Invalid address specified.");
             }
 
@@ -233,6 +237,12 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.ColourManager;
 
@@ -38,7 +41,8 @@ import java.awt.Color;
  * 
  * @author chris
  */
-public final class Notify extends GlobalCommand implements IntelligentCommand {
+public final class Notify extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Notify.
@@ -51,17 +55,17 @@ public final class Notify extends GlobalCommand implements IntelligentCommand {
     
     /** {@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, "notify", "<colour>");
+            showUsage(origin, args.isSilent(), "notify", "<colour>");
             return;
         }
         
         final Color colour = ColourManager.parseColour(args.getArguments()[0], null);
         
         if (colour == null) {
-            showUsage(origin, isSilent, "notify",
+            showUsage(origin, args.isSilent(), "notify",
                     "<colour> - colour must be an IRC colour code (0-15) or a " +
                     "hex string (e.g. FFFF00).");
         } else if (origin != null) {            
@@ -82,6 +86,12 @@ public final class Notify extends GlobalCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return false;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,9 +25,12 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.CustomWindow;
 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.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -36,7 +39,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * 
  * @author chris
  */
-public class OpenWindow extends GlobalCommand implements IntelligentCommand {
+public class OpenWindow extends Command implements IntelligentCommand, CommandInfo {
     
     /**
      * Creates a new instance of OpenWindow.
@@ -47,14 +50,14 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
 
     /** {@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) {
         int start = 0;
-        FrameContainer parent = null;
+        FrameContainer<?> parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
             if (origin.getServer() == null) {
-                sendLine(origin, isSilent, FORMAT_ERROR,
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "This window doesn't have an associated server.");
                 return;
             }
@@ -67,10 +70,10 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
         }
 
         if (args.getArguments().length == start || args.getArguments()[start].isEmpty()) {
-            showUsage(origin, isSilent, "openwindow",
+            showUsage(origin, args.isSilent(), "openwindow",
                     "[--server|--child] <name> [title]");
         } else {
-            FrameContainer window;
+            FrameContainer<?> window;
             
             if (parent == null) {
                 window = WindowManager.findCustomWindow(args.getArguments()[start]);
@@ -88,7 +91,7 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
                     new CustomWindow(args.getArguments()[start], title, parent);
                 }
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR,
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
                 "A custom window by that name already exists.");
             }
         }
@@ -107,6 +110,12 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
         return "openwindow";
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {

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

@@ -25,9 +25,12 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 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;
 
 /**
@@ -35,7 +38,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  *
  * @author chris
  */
-public final class ReloadActions extends GlobalCommand implements IntelligentCommand {
+public final class ReloadActions extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of ReloadActions.
@@ -48,10 +52,10 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     
     /** {@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) {
         ActionManager.loadActions();
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Actions reloaded.");
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actions reloaded.");
     }
     
     
@@ -66,6 +70,12 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc}. */
     @Override

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -35,7 +38,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * 
  * @author chris
  */
-public class ReloadIdentities extends GlobalCommand implements IntelligentCommand {
+public class ReloadIdentities extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of ReloadIdentities.
@@ -46,11 +50,11 @@ public class ReloadIdentities 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) {
         IdentityManager.loadUser();
         
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Identities reloaded.");
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Identities reloaded.");
     }
 
     /** {@inheritDoc} */
@@ -65,6 +69,12 @@ public class ReloadIdentities extends GlobalCommand implements IntelligentComman
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -36,7 +39,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * 
  * @author chris
  */
-public final class ReloadPlugin extends GlobalCommand implements IntelligentCommand {
+public final class ReloadPlugin extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of ReloadPlugin.
@@ -49,20 +53,22 @@ public final class ReloadPlugin 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 == 0) {
-            showUsage(origin, isSilent, "reloadplugin", "<plugin>");
+            showUsage(origin, args.isSilent(), "reloadplugin", "<plugin>");
             return;
         }
         
-        final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args.getArguments()[0]);
+        final PluginInfo plugin = PluginManager.getPluginManager()
+                .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed - Plugin not loaded");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                    "Plugin Reloading failed - Plugin not loaded");
         } else if (PluginManager.getPluginManager().reloadPlugin(plugin.getRelativeFilename())) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin Reloaded.");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin Reloaded.");
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Reloading failed");
         }
     }
     
@@ -77,6 +83,12 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -35,7 +38,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * 
  * @author chris
  */
-public final class SaveConfig extends GlobalCommand implements IntelligentCommand {
+public final class SaveConfig extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of SaveConfig.
@@ -48,11 +52,11 @@ public final class SaveConfig 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) {
         IdentityManager.save();
         
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Configuration file saved.");
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
     }
     
     
@@ -67,6 +71,12 @@ public final class SaveConfig extends GlobalCommand implements IntelligentComman
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -39,26 +42,26 @@ import java.util.List;
  *
  * @author chris
  */
-public final class Set extends GlobalCommand implements IntelligentCommand {
-    
+public final class Set extends Command implements IntelligentCommand, CommandInfo {
+
     /**
      * Creates a new instance of Set.
      */
     public Set() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@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) {
         int i = 0;
-        
+
         Identity identity = IdentityManager.getConfigIdentity();
         ConfigManager manager = IdentityManager.getGlobalConfig();
-        
+
         if (args.getArguments().length > 0
                 && "--server".equalsIgnoreCase(args.getArguments()[0]) && origin != null
                 && origin.getServer() != null) {
@@ -66,34 +69,34 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
             identity = origin.getServer().getServerIdentity();
             manager = origin.getServer().getConfigManager();
         }
-        
+
         switch (args.getArguments().length - i) {
         case 0:
-            doDomainList(origin, isSilent, manager);
+            doDomainList(origin, args.isSilent(), manager);
             break;
         case 1:
-            doOptionsList(origin, isSilent, manager, args.getArguments()[i]);
+            doOptionsList(origin, args.isSilent(), manager, args.getArguments()[i]);
             break;
         case 2:
-            doShowOption(origin, isSilent, manager, args.getArguments()[i],
+            doShowOption(origin, args.isSilent(), manager, args.getArguments()[i],
                     args.getArguments()[1 + i]);
             break;
         default:
             if (args.getArguments()[i].equalsIgnoreCase("--unset")) {
-                doUnsetOption(origin, isSilent, identity, args.getArguments()[1 + i],
+                doUnsetOption(origin, args.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, 
+                doAppendOption(origin, args.isSilent(), identity, manager,
                         args.getArguments()[1 + i], args.getArguments()[2 + i],
                         args.getArgumentsAsString(3 + i));
             } else {
-                doSetOption(origin, isSilent, identity, args.getArguments()[i],
+                doSetOption(origin, args.isSilent(), identity, args.getArguments()[i],
                         args.getArguments()[1 + i], args.getArgumentsAsString(2 + i));
             }
         }
     }
-    
+
     /**
      * Shows the user a list of valid domains.
      *
@@ -101,22 +104,22 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether or not the command is being silenced or not
      * @param manager The config manager to use to retrieve data
      */
-    private void doDomainList(final FrameContainer origin, final boolean isSilent,
+    private void doDomainList(final FrameContainer<?> origin, final boolean isSilent,
             final ConfigManager manager) {
         final StringBuffer output = new StringBuffer(67);
-        
+
         output.append("Valid domains (use ");
         output.append(CommandManager.getCommandChar());
         output.append("set <domain> to see options within a domain): ");
-        
+
         for (String domain : manager.getDomains()) {
             output.append(domain);
             output.append(", ");
         }
-        
+
         sendLine(origin, isSilent, FORMAT_OUTPUT, output.substring(0, output.length() - 2));
     }
-    
+
     /**
      * Shows the user a list of valid options within a domain.
      *
@@ -125,30 +128,30 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param manager The config manager to use to retrieve data
      * @param domain The domain to be inspected
      */
-    private void doOptionsList(final FrameContainer origin,
+    private void doOptionsList(final FrameContainer<?> origin,
             final boolean isSilent, final ConfigManager manager, final String domain) {
         final StringBuffer output = new StringBuffer(24);
-        
+
         output.append("Options in domain '");
         output.append(domain);
         output.append("': ");
-        
+
         boolean found = false;
-        
+
         for (String option : manager.getOptions(domain).keySet()) {
             output.append(option);
             output.append(", ");
             found = true;
         }
-        
+
         if (found) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, output.substring(0, output.length() - 2));
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, 
+            sendLine(origin, isSilent, FORMAT_ERROR,
                     "There are no options in the domain '" + domain + "'.");
         }
     }
-    
+
     /**
      * Shows the user the current value of one option.
      *
@@ -158,7 +161,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param domain The domain of the option
      * @param option The name of the option
      */
-    private void doShowOption(final FrameContainer origin,
+    private void doShowOption(final FrameContainer<?> origin,
             final boolean isSilent, final ConfigManager manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
@@ -168,7 +171,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
             sendLine(origin, isSilent, FORMAT_ERROR, "Option not found: " + domain + "." + option);
         }
     }
-    
+
     /**
      * Sets the value of the specified option.
      *
@@ -179,15 +182,15 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param option The name of the option
      * @param newvalue The value the option should be set to
      */
-    private void doSetOption(final FrameContainer origin,
+    private void doSetOption(final FrameContainer<?> origin,
             final boolean isSilent, final Identity identity,
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
-        
+
         sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option +
                 " has been set to: " + newvalue);
     }
-    
+
     /**
      * Appends data to the specified option.
      *
@@ -199,14 +202,14 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param option The name of the option
      * @param data The data to be appended
      */
-    private void doAppendOption(final FrameContainer origin,
+    private void doAppendOption(final FrameContainer<?> origin,
             final boolean isSilent, final Identity identity, final ConfigManager manager,
             final String domain,final String option, final String data) {
         doSetOption(origin, isSilent, identity, domain, option,
                 (manager.hasOptionString(domain, option) ?
                     manager.getOption(domain, option) : "") + data);
     }
-    
+
     /**
      * Unsets the specified option.
      *
@@ -216,26 +219,32 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param domain The domain of the option
      * @param option The name of the option
      */
-    private void doUnsetOption(final FrameContainer origin,
+    private void doUnsetOption(final FrameContainer<?> origin,
             final boolean isSilent, final Identity identity, final String domain,
             final String option) {
         identity.unsetOption(domain, option);
-        
+
         sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option + " has been unset.");
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "set";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
         return true;
     }
-    
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -243,14 +252,14 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
                 + "\nset [--server] --append <domain> <option> <data> - appends data to the specified option"
                 + "\nset [--server] --unset <domain> <option> - unsets the specified option";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final List<String> previousArgs = context.getPreviousArgs();
         final AdditionalTabTargets res = new AdditionalTabTargets();
-        
+
         if (arg == 0) {
             res.addAll(context.getWindow().getContainer().getConfigManager()
                     .getDomains());
@@ -276,8 +285,8 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
                     .getOptions(previousArgs.get(1)).keySet());
             res.excludeAll();
         }
-        
+
         return res;
     }
-    
+
 }

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

@@ -24,9 +24,12 @@ package com.dmdirc.commandparser.commands.global;
 
 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.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -36,7 +39,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * 
  * @author chris
  */
-public final class UnloadPlugin extends GlobalCommand implements IntelligentCommand {
+public final class UnloadPlugin extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of UnloadPlugin.
@@ -49,22 +53,22 @@ public final class UnloadPlugin 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 == 0) {
-            showUsage(origin, isSilent, "unloadplugin", "<plugin>");
+            showUsage(origin, args.isSilent(), "unloadplugin", "<plugin>");
             return;
         }
         
         final PluginInfo plugin = PluginManager.getPluginManager()
                 .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin unloading failed - Plugin not loaded");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin unloading failed - Plugin not loaded");
         } else if (PluginManager.getPluginManager().delPlugin(plugin.getRelativeFilename())) {
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin Unloaded.");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin Unloaded.");
             PluginManager.getPluginManager().updateAutoLoad(plugin);
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Unloading failed");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Unloading failed");
         }
     }
     
@@ -79,6 +83,12 @@ public final class UnloadPlugin extends GlobalCommand implements IntelligentComm
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_GLOBAL;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,9 +25,13 @@ package com.dmdirc.commandparser.commands.server;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -36,7 +40,8 @@ import com.dmdirc.ui.input.TabCompleter;
  * on a server.
  * @author chris
  */
-public final class AllChannels extends ServerCommand implements IntelligentCommand {
+public final class AllChannels extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /** Creates a new instance of AllChannels. */
     public AllChannels() {
@@ -47,13 +52,14 @@ public final class AllChannels extends ServerCommand implements IntelligentComma
     
     /** {@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 String command = args.getArgumentsAsString();
         
         for (String channel : server.getChannels()) {
             server.getChannel(channel).getCommandParser()
-                    .parseCommand(server.getChannel(channel), command);
+                    .parseCommand(server.getChannel(channel), context.getSource(), command);
         }
     }
     
@@ -69,6 +75,12 @@ public final class AllChannels extends ServerCommand implements IntelligentComma
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,16 +25,20 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 /**
  * The away command allows the user to set their away message.
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Away extends ServerCommand {
+public final class Away extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of Away.
@@ -47,8 +51,9 @@ public final class Away 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();
         final String line = args.getArgumentsAsString();
 
         server.getParser().getLocalClient().setAway(line);
@@ -66,6 +71,12 @@ public final class Away extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,10 +25,14 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
 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.ui.input.AdditionalTabTargets;
 
 /**
@@ -36,7 +40,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Back extends ServerCommand implements IntelligentCommand {
+public final class Back extends Command implements IntelligentCommand, CommandInfo {
     
     /**
      * Creates a new instance of Back.
@@ -47,16 +51,11 @@ public final class Back 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 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();
         server.getParser().getLocalClient().setBack();
     }
     
@@ -72,6 +71,12 @@ public final class Back extends ServerCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc}. */
     @Override

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

@@ -25,8 +25,12 @@ package com.dmdirc.commandparser.commands.server;
 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 com.dmdirc.commandparser.commands.global.NewServer;
 
 import java.net.URI;
@@ -37,7 +41,7 @@ import java.net.URISyntaxException;
  * 
  * @author chris
  */
-public final class ChangeServer extends ServerCommand {
+public final class ChangeServer extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of ChangeServer.
@@ -50,11 +54,12 @@ public final class ChangeServer 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();
         URI address = null;
         if (args.getArguments().length == 0) {
-            showUsage(origin, isSilent, "server", "<host[:[+]port]> [password]");
+            showUsage(origin, args.isSilent(), "server", "<host[:[+]port]> [password]");
             address = null;
             return;
         } else if (args.getArguments().length == 1
@@ -66,7 +71,7 @@ public final class ChangeServer extends ServerCommand {
             }
         }
         if (address == null) {
-            address = NewServer.parseInput(origin, isSilent, args);
+            address = NewServer.parseInput(origin, args.isSilent(), args);
         }
 
         if (address == null) {
@@ -87,6 +92,12 @@ public final class ChangeServer extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,10 +25,14 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -37,7 +41,8 @@ import com.dmdirc.ui.input.TabCompletionType;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Ctcp extends ServerCommand implements IntelligentCommand {
+public final class Ctcp extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Ctcp.
@@ -48,22 +53,17 @@ public final class Ctcp 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 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 < 2) {
-            showUsage(origin, isSilent, "ctcp", "<target> <type> [arguments]");
+            showUsage(origin, args.isSilent(), "ctcp", "<target> <type> [arguments]");
         } else {
             server.getParser().sendCTCP(args.getArguments()[0],
                     args.getArguments()[1], args.getArgumentsAsString(2));
-            sendLine(origin, isSilent, "selfCTCP", args.getArguments()[0],
+            sendLine(origin, args.isSilent(), "selfCTCP", args.getArguments()[0],
                     args.getArgumentsAsString(1));
         }
     }
@@ -80,6 +80,12 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc}. */
     @Override

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

@@ -25,14 +25,18 @@ package com.dmdirc.commandparser.commands.server;
 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;
 
 /**
  * The disconnect command disconnects from the current server.
  * @author chris
  */
-public final class Disconnect extends ServerCommand {
+public final class Disconnect extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of Disconnect.
@@ -43,16 +47,11 @@ public final class Disconnect 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 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();
         String line;
         
         if (args.getArguments().length == 0) {
@@ -76,6 +75,12 @@ public final class Disconnect extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,9 +25,13 @@ package com.dmdirc.commandparser.commands.server;
 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.parser.common.IgnoreList;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -40,7 +44,8 @@ import java.util.regex.PatternSyntaxException;
  * Allows the user to add/view/delete ignores.
  * @author chris
  */
-public final class Ignore extends ServerCommand implements IntelligentCommand {
+public final class Ignore extends Command implements IntelligentCommand,
+        CommandInfo{
     
     /**
      * Creates a new instance of Ignore.
@@ -51,34 +56,29 @@ public final class Ignore 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 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 == 0) {
-            executeView(origin, server, isSilent, args, false);
+            executeView(origin, server, args.isSilent(), args, false);
         } else if ("--remove".equalsIgnoreCase(args.getArguments()[0])) {
-            executeRemove(origin, server, isSilent, args);
+            executeRemove(origin, server, args.isSilent(), args);
         } else if ("--regex".equalsIgnoreCase(args.getArguments()[0])) {
-            executeRegex(origin, server, isSilent, args);
+            executeRegex(origin, server, args.isSilent(), args);
         } else {
-            executeAdd(origin, server, isSilent, args);
+            executeAdd(origin, server, args.isSilent(), args);
         }
     }
 
-    protected void executeView(final FrameContainer origin, final Server server,
+    protected void executeView(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args, final boolean forceRegex) {
         final IgnoreList ignoreList = server.getIgnoreList();
 
         if (ignoreList.count() == 0) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "No ignore list entries for this network.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "No ignore list entries for this network.");
             return;
         }
 
@@ -87,7 +87,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
             entries = ignoreList.getSimpleList();
         } else {
             if (!forceRegex) {
-                sendLine(origin, isSilent, FORMAT_ERROR,
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "Unable to convert ignore list to simple format");
             }
             entries = ignoreList.getRegexList();
@@ -96,24 +96,24 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         int i = 0;
         for (String line : entries) {
             i++;
-            sendLine(origin, isSilent, FORMAT_OUTPUT, i + ". " + line);
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, i + ". " + line);
         }
     }
 
-    protected void executeAdd(final FrameContainer origin, final Server server,
+    protected void executeAdd(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         final IgnoreList ignoreList = server.getIgnoreList();
         final String target = args.getArgumentsAsString();
 
         ignoreList.addSimple(target);
         server.saveIgnoreList();
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRegex(final FrameContainer origin, final Server server,
+    protected void executeRegex(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
-            executeView(origin, server, isSilent, args, true);
+            executeView(origin, server, args.isSilent(), args, true);
             return;
         }
 
@@ -123,20 +123,20 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         try {
             Pattern.compile(target);
         } catch (PatternSyntaxException ex) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Unable to compile regex: "
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to compile regex: "
                     + ex.getDescription());
             return;
         }
 
         ignoreList.add(target);
         server.saveIgnoreList();
-        sendLine(origin, isSilent, FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRemove(final FrameContainer origin, final Server server,
+    protected void executeRemove(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
-            showUsage(origin, isSilent, "ignore", "--remove <host>");
+            showUsage(origin, args.isSilent(), "ignore", "--remove <host>");
             return;
         }
 
@@ -146,18 +146,18 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         if (ignoreList.canConvert() && ignoreList.getSimpleList().contains(host)) {
             ignoreList.remove(ignoreList.getSimpleList().indexOf(host));
             server.saveIgnoreList();
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Removed " + host + " from the ignore list.");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed " + host + " from the ignore list.");
             return;
         }
 
         if (ignoreList.getRegexList().contains(host)) {
             ignoreList.remove(ignoreList.getRegexList().indexOf(host));
             server.saveIgnoreList();
-            sendLine(origin, isSilent, FORMAT_OUTPUT, "Removed " + host + " from the ignore list.");
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed " + host + " from the ignore list.");
             return;
         }
 
-        sendLine(origin, isSilent, FORMAT_ERROR, "Ignore list doesn't contain '" + host + "'.");
+        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Ignore list doesn't contain '" + host + "'.");
     }
     
     /** {@inheritDoc} */
@@ -171,6 +171,12 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -28,9 +28,13 @@ 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.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.interfaces.ActionListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -46,8 +50,8 @@ import java.util.List;
  * @since 0.6.3m1
  * @author chris
  */
-public final class JoinChannelCommand extends ServerCommand implements
-        ActionListener, IntelligentCommand {
+public final class JoinChannelCommand extends Command implements
+        ActionListener, IntelligentCommand, CommandInfo {
 
     /** A map of channel name mentions. */
     private final MapList<FrameContainer<?>, String> mentions
@@ -65,10 +69,11 @@ public final class JoinChannelCommand extends ServerCommand implements
     
     /** {@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 == 0) {
-            showUsage(origin, isSilent, "join", "join <channel [key]>[,channel [key]...]");
+            showUsage(origin, args.isSilent(), "join", "join <channel [key]>[,channel [key]...]");
             return;
         }
 
@@ -85,7 +90,7 @@ public final class JoinChannelCommand extends ServerCommand implements
             }
         }
 
-        server.join(!isSilent, channels.toArray(new ChannelJoinRequest[0]));
+        server.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[0]));
     }
     
     
@@ -100,6 +105,12 @@ public final class JoinChannelCommand extends ServerCommand implements
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,11 +25,15 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -39,8 +43,8 @@ import com.dmdirc.ui.interfaces.InputWindow;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Message extends ServerCommand implements IntelligentCommand,
-        WrappableCommand {
+public final class Message extends Command implements IntelligentCommand,
+        WrappableCommand, CommandInfo {
     
     /**
      * Creates a new instance of Message.
@@ -53,20 +57,21 @@ public final class Message extends ServerCommand implements IntelligentCommand,
     
     /** {@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 < 2) {
-            showUsage(origin, isSilent, "msg", "<target> <message>");
+            showUsage(origin, args.isSilent(), "msg", "<target> <message>");
         } else {
             final String target = args.getArguments()[0];
             final String message = args.getArgumentsAsString(1);
-            sendLine(origin, isSilent, "selfMessage", target, message);
+            sendLine(origin, args.isSilent(), "selfMessage", target, message);
 
             // If this is a known server or channel, and this is not a silent
             // invokation, use sendLine, else send it raw to the parser.
-            if (!isSilent && server.hasChannel(target)) {
+            if (!args.isSilent() && server.hasChannel(target)) {
                 server.getChannel(target).sendLine(message);
-            } else if (!isSilent && server.hasQuery(target)) {
+            } else if (!args.isSilent() && server.hasQuery(target)) {
                 server.getQuery(target).sendLine(message);
             } else {
                 server.getParser().sendMessage(target, message);
@@ -86,6 +91,12 @@ public final class Message extends ServerCommand implements IntelligentCommand,
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,10 +25,14 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -37,7 +41,8 @@ import com.dmdirc.ui.input.TabCompletionType;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Nick extends ServerCommand implements IntelligentCommand {
+public final class Nick extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Nick.
@@ -50,10 +55,11 @@ public final class Nick extends ServerCommand implements IntelligentCommand {
     
     /** {@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 == 0) {
-            showUsage(origin, isSilent, "nick", "<new nickname>");
+            showUsage(origin, args.isSilent(), "nick", "<new nickname>");
             return;
         }
         
@@ -72,6 +78,12 @@ public final class Nick extends ServerCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,10 +25,14 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -37,7 +41,8 @@ import com.dmdirc.ui.input.TabCompletionType;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Notice extends ServerCommand implements IntelligentCommand {
+public final class Notice extends Command implements IntelligentCommand,
+        CommandInfo {
     
     /**
      * Creates a new instance of Notice.
@@ -50,14 +55,15 @@ public final class Notice extends ServerCommand implements IntelligentCommand {
     
     /** {@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 < 2) {
-            showUsage(origin, isSilent, "notice", "<target> <message>");
+            showUsage(origin, args.isSilent(), "notice", "<target> <message>");
         } else {
             server.getParser().sendNotice(args.getArguments()[0],
                     args.getArgumentsAsString(1));
-            sendLine(origin, isSilent, "selfNotice", args.getArguments()[0],
+            sendLine(origin, args.isSilent(), "selfNotice", args.getArguments()[0],
                     args.getArgumentsAsString(1));
         }
     }
@@ -74,6 +80,12 @@ public final class Notice extends ServerCommand implements IntelligentCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,10 +25,14 @@ package com.dmdirc.commandparser.commands.server;
 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.WrappableCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -38,8 +42,8 @@ import com.dmdirc.ui.messages.Styliser;
  * Allows the user to open a query dialog with another user.
  * @author chris
  */
-public final class OpenQuery extends ServerCommand implements
-        IntelligentCommand, WrappableCommand {
+public final class OpenQuery extends Command implements IntelligentCommand,
+        WrappableCommand, CommandInfo {
     
     /**
      * Creates a new instance of Query.
@@ -52,15 +56,16 @@ public final class OpenQuery extends ServerCommand implements
     
     /** {@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 == 0) {
-            showUsage(origin, isSilent, "query", "<target> <message>");
+            showUsage(origin, args.isSilent(), "query", "<target> <message>");
             return;
         }
             
         if (server.getParser().isValidChannelName(args.getArguments()[0])) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "You can't open a query "
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD + CommandManager.getCommandChar()
                     + (args.getArguments().length > 1 ? "msg" : "join") + " "
@@ -92,6 +97,12 @@ public final class OpenQuery extends ServerCommand implements
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,9 +25,13 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 /**
  * The raw command allows the user to send a raw line of text directly to the
@@ -35,7 +39,7 @@ import com.dmdirc.commandparser.commands.ServerCommand;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class Raw extends ServerCommand {
+public final class Raw extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of Raw.
@@ -48,12 +52,13 @@ public final class Raw 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();
         final String line = args.getArgumentsAsString();
         
         server.getParser().sendRawMessage(line);
-        sendLine(origin, isSilent, "rawCommand", line);
+        sendLine(origin, args.isSilent(), "rawCommand", line);
     }
     
     
@@ -68,6 +73,12 @@ public final class Raw extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,9 +25,13 @@ package com.dmdirc.commandparser.commands.server;
 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.CommandOptions;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 /**
  * Implements a raw server command (i.e., a command that is sent to the server
@@ -36,7 +40,7 @@ import com.dmdirc.commandparser.commands.ServerCommand;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public final class RawServerCommand extends ServerCommand {
+public final class RawServerCommand extends Command implements CommandInfo {
     
     /** The name of this raw command. */
     private final String myName;
@@ -56,8 +60,9 @@ public final class RawServerCommand 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();
         server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());
     }
     
@@ -73,6 +78,12 @@ public final class RawServerCommand extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -25,14 +25,18 @@ package com.dmdirc.commandparser.commands.server;
 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;
 
 /**
  * The reconnect command reconnects to the current server.
  * @author chris
  */
-public final class Reconnect extends ServerCommand {
+public final class Reconnect extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of Reconnect.
@@ -45,8 +49,9 @@ public final class Reconnect 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();
         String line;
         
         if (args.getArguments().length == 0) {
@@ -70,6 +75,12 @@ public final class Reconnect extends ServerCommand {
     public boolean showInHelp() {
         return true;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -26,9 +26,13 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 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.CommandOptions;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 /**
  * Allows the user to change user modes.
@@ -36,7 +40,7 @@ import com.dmdirc.commandparser.commands.ServerCommand;
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public class Umode extends ServerCommand {
+public class Umode extends Command implements CommandInfo {
     
     /**
      * Creates a new instance of Umode.
@@ -49,10 +53,11 @@ public class Umode 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 (server.getState() != ServerState.CONNECTED) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Not connected");
             return;
         }
 
@@ -73,6 +78,12 @@ public class Umode extends ServerCommand {
         return true;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return CommandType.TYPE_SERVER;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -24,21 +24,21 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
 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.ChannelCommand;
-import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.ui.interfaces.Window;
 
 /**
- * A command parser that is tailored for use in a channel environment. Handles
- * both channel and server commands.
+ * A command parser that is tailored for use in a channel environment.
+ * 
  * @author chris
  */
-public final class ChannelCommandParser extends CommandParser {
+public class ChannelCommandParser extends ChatCommandParser {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -54,9 +54,11 @@ public final class ChannelCommandParser extends CommandParser {
     
     /**
      * Creates a new instance of ChannelCommandParser.
+     *
+     * @param server The server this parser's query belongs to
      */
-    public ChannelCommandParser() {
-        super();
+    public ChannelCommandParser(final Server server) {
+        super(server);
     }
 
     /** {@inheritDoc} */
@@ -65,6 +67,8 @@ public final class ChannelCommandParser extends CommandParser {
         if (channel == null) {
             channel = (Channel) owner;
         }
+
+        super.setOwner(owner);
     }
     
     /** {@inheritDoc} */
@@ -77,28 +81,13 @@ public final class ChannelCommandParser extends CommandParser {
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
-            final boolean isSilent, final Command command, final CommandArguments args) {
-        if (command instanceof ChannelCommand) {
-            ((ChannelCommand) command).execute(origin, channel.getServer(), channel, isSilent, args);
-        } else if (command instanceof ChatCommand) {
-            ((ChatCommand) command).execute(origin, channel.getServer(), channel, isSilent, args);
-        } else if (command instanceof ServerCommand) {
-            ((ServerCommand) command).execute(origin, channel.getServer(), isSilent, args);
+            final Window window, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args) {
+        if (commandInfo.getType() == CommandType.TYPE_CHANNEL) {
+            command.execute(origin, args, new ChannelCommandContext(window, commandInfo, channel));
         } else {
-            ((GlobalCommand) command).execute(origin, isSilent, args);
+            super.executeCommand(origin, window, commandInfo, command, 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 FrameContainer<?> origin, final String line) {
-        channel.sendLine(line);
-    }
-    
 }

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2006-2010 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.parsers;
+
+import com.dmdirc.FrameContainer;
+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.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ * A command parser which implements common functionality for chat windows
+ * (queries and channels).
+ * 
+ * @since 0.6.4
+ * @author chris
+ */
+public class ChatCommandParser extends ServerCommandParser {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /** The container that owns this parser. */
+    private MessageTarget<?> owner;
+
+    /**
+     * Creates a new chat command parser that belongs to a child of the
+     * specified server.
+     *
+     * @param server The server which owns this parser's container
+     */
+    public ChatCommandParser(final Server server) {
+        super.setOwner(server);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setOwner(final FrameContainer<?> owner) {
+        if (this.owner == null) {
+            this.owner = (MessageTarget<?>) owner;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void executeCommand(final FrameContainer<?> origin,
+            final Window window, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args) {
+        if (commandInfo.getType() == CommandType.TYPE_CHAT) {
+            command.execute(origin, args, new ChatCommandContext(window, commandInfo, owner));
+        } else {
+            super.executeCommand(origin, window, commandInfo, command, args);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
+        owner.sendLine(line);
+    }
+
+}

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

@@ -28,6 +28,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandInfoPair;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
@@ -35,6 +36,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.RollingList;
 
 import java.io.Serializable;
@@ -61,7 +63,7 @@ public abstract class CommandParser implements Serializable {
     /**
      * Commands that are associated with this parser.
      */
-    private final Map<String, Command> commands;
+    private final Map<String, CommandInfoPair> commands;
 
     /**
      * A history of commands that have been entered into this parser.
@@ -70,7 +72,7 @@ public abstract class CommandParser implements Serializable {
 
     /** Creates a new instance of CommandParser. */
     public CommandParser() {
-        commands = new Hashtable<String, Command>();
+        commands = new Hashtable<String, CommandInfoPair>();
         history = new RollingList<PreviousCommand>(
                 IdentityManager.getGlobalConfig().getOptionInt("general",
                     "commandhistory"));
@@ -96,7 +98,7 @@ public abstract class CommandParser implements Serializable {
      * @param info The information the command should be registered with
      */
     public final void registerCommand(final Command command, final CommandInfo info) {
-        commands.put(info.getName().toLowerCase(), command);
+        commands.put(info.getName().toLowerCase(), new CommandInfoPair(info, command));
     }
 
     /**
@@ -115,31 +117,33 @@ public abstract class CommandParser implements Serializable {
      * @since 0.6.3m1
      * @return A map of commands known to this parser
      */
-    public Map<String, Command> getCommands() {
-        return new HashMap<String, Command>(commands);
+    public Map<String, CommandInfoPair> getCommands() {
+        return new HashMap<String, CommandInfoPair>(commands);
     }
 
     /**
      * Parses the specified string as a command.
      *
-     * @param origin The window in which the command was typed
+     * @param origin The container which received the command
+     * @param window The window in which the line was typed
      * @param line The line to be parsed
      * @param parseChannel Whether or not to try and parse the first argument
      * as a channel name
+     * @since 0.6.4
      */
     public final void parseCommand(final FrameContainer<?> origin,
-            final String line, final boolean parseChannel) {
+            final Window window, final String line, final boolean parseChannel) {
         final CommandArguments args = new CommandArguments(line);
 
         if (args.isCommand()) {
-            if (handleChannelCommand(origin, args, parseChannel)) {
+            if (handleChannelCommand(origin, window, args, parseChannel)) {
                 return;
             }
 
             if (commands.containsKey(args.getCommandName().toLowerCase())) {
+                final CommandInfoPair pair = commands.get(args.getCommandName().toLowerCase());
                 addHistory(args.getStrippedLine());
-                executeCommand(origin, args.isSilent(),
-                        commands.get(args.getCommandName().toLowerCase()), args);
+                executeCommand(origin, window, pair.getCommandInfo(), pair.getCommand(), args);
             } else {
                 handleInvalidCommand(origin, args);
             }
@@ -156,13 +160,14 @@ public abstract class CommandParser implements Serializable {
      * to handle the command, and will return true. If the command is not
      * handled, the method returns false.
      *
-     * @param origin The window the command was entered in
+     * @param origin The container which received the command
+     * @param window The window in which the command was typed
      * @param args The command and its arguments
      * @param parseChannel Whether or not to try parsing channel names
      * @return True iff the command was handled, false otherwise
      */
     protected boolean handleChannelCommand(final FrameContainer<?> origin,
-            final CommandArguments args, final boolean parseChannel) {
+            final Window window, final CommandArguments args, final boolean parseChannel) {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
         final String[] cargs = args.getArguments();
@@ -189,7 +194,7 @@ public abstract class CommandParser implements Serializable {
 
                 if (server.hasChannel(channel)) {
                     server.getChannel(channel).getCommandParser()
-                            .parseCommand(origin, CommandManager.getCommandChar()
+                            .parseCommand(origin, window, CommandManager.getCommandChar()
                             + args.getCommandName() + " " + args.getWordsAsString(2), false);
                 } else {
                     final Map.Entry<CommandInfo, Command> actCommand
@@ -247,12 +252,14 @@ public abstract class CommandParser implements Serializable {
     /**
      * Parses the specified string as a command.
      *
-     * @param origin The window in which the command was typed
+     * @param origin The container which received the command
+     * @param window The window in which the command was typed
      * @param line The line to be parsed
+     * @since 0.6.4
      */
     public final void parseCommand(final FrameContainer<?> origin,
-            final String line) {
-        parseCommand(origin, line, true);
+            final Window window, final String line) {
+        parseCommand(origin, window, line, true);
     }
 
     /**
@@ -268,14 +275,16 @@ public abstract class CommandParser implements Serializable {
     /**
      * 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 origin The container which received the command
+     * @param window The window in which the command was typed
+     * @param commandInfo The command information object matched by the command
      * @param command The command to be executed
      * @param args The arguments to the command
-     * @since 0.6.3m1
+     * @since 0.6.4
      */
     protected abstract void executeCommand(final FrameContainer<?> origin,
-            final boolean isSilent, final Command command, final CommandArguments args);
+            final Window window, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args);
 
     /**
      * Called when the user attempted to issue a command (i.e., used the command

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

@@ -24,18 +24,20 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.FrameContainer;
 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.GlobalCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.interfaces.Window;
 
 /**
  * The command parser used for global commands.
  * @author chris
  */
-public final class GlobalCommandParser extends CommandParser {
+public class GlobalCommandParser extends CommandParser {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -52,7 +54,7 @@ public final class GlobalCommandParser extends CommandParser {
     /**
      * Creates a new instance of the GlobalCommandParser.
      */
-    private GlobalCommandParser() {
+    public GlobalCommandParser() {
         super();
     }
 
@@ -83,8 +85,9 @@ public final class GlobalCommandParser extends CommandParser {
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
-            final boolean isSilent, final Command command, final CommandArguments args) {
-        ((GlobalCommand) command).execute(origin, isSilent, args);
+            final Window window, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args) {
+        command.execute(origin, args, new CommandContext(window, commandInfo));
     }
     
     /**

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

@@ -24,21 +24,21 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
+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.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.context.QueryCommandContext;
+import com.dmdirc.ui.interfaces.Window;
 
 /**
  * A command parser that is tailored for use in a query environment. Handles
  * both query and server commands.
  * @author chris
  */
-public final class QueryCommandParser extends CommandParser {
+public class QueryCommandParser extends ChatCommandParser {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -51,12 +51,14 @@ public final class QueryCommandParser extends CommandParser {
      * The query instance that this parser is attached to.
      */
     private Query query;
-    
+
     /**
      * Creates a new instance of QueryCommandParser.
+     *
+     * @param server The server this parser's query belongs to
      */
-    public QueryCommandParser() {
-        super();
+    public QueryCommandParser(final Server server) {
+        super(server);
     }
 
     /** {@inheritDoc} */
@@ -65,6 +67,8 @@ public final class QueryCommandParser extends CommandParser {
         if (query == null) {
             query = (Query) owner;
         }
+
+        super.setOwner(query);
     }
     
     /** Loads the relevant commands into the parser. */
@@ -77,27 +81,13 @@ public final class QueryCommandParser extends CommandParser {
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
-            final boolean isSilent, final Command command, final CommandArguments args) {
-        if (command instanceof QueryCommand) {
-            ((QueryCommand) command).execute(origin, query.getServer(), query, isSilent, args);
-        } else if (command instanceof ChatCommand) {
-            ((ChatCommand) command).execute(origin, query.getServer(), query, isSilent, args);
-        } else if (command instanceof ServerCommand) {
-            ((ServerCommand) command).execute(origin, query.getServer(), isSilent, args);
+            final Window window, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args) {
+        if (commandInfo.getType() == CommandType.TYPE_QUERY) {
+            command.execute(origin, args, new QueryCommandContext(window, commandInfo, query));
         } else {
-            ((GlobalCommand) command).execute(origin, isSilent, args);
+            super.executeCommand(origin, window, commandInfo, command, 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 FrameContainer<?> origin, final String line) {
-        query.sendLine(line);
-    }
-    
 }

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

@@ -26,17 +26,19 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 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.GlobalCommand;
-import com.dmdirc.commandparser.commands.ServerCommand;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
+import com.dmdirc.ui.interfaces.Window;
 
 /**
  * A command parser used in the context of a server.
+ * 
  * @author chris
  */
-public class ServerCommandParser extends CommandParser {
+public class ServerCommandParser extends GlobalCommandParser {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -63,6 +65,8 @@ public class ServerCommandParser extends CommandParser {
         if (server == null && owner instanceof Server) {
             server = (Server) owner;
         }
+
+        super.setOwner(owner);
     }
     
     /** Loads the relevant commands into the parser. */
@@ -74,20 +78,21 @@ public class ServerCommandParser extends CommandParser {
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
-            final boolean isSilent, final Command command, final CommandArguments args) {
-        if (command instanceof ServerCommand) {
+            final Window window, final CommandInfo commandInfo,
+            final Command command, final CommandArguments args) {
+        if (commandInfo.getType() == CommandType.TYPE_SERVER) {
             if (hasCommandOptions(command) && !getCommandOptions(command).allowOffline()
-                    && ((server.getState() != ServerState.CONNECTED
+                    && (server == null || (server.getState() != ServerState.CONNECTED
                     && server.getState() != ServerState.CONNECTING)
                     || server.getParser() == null)) {
-                if (!isSilent) {
+                if (!args.isSilent()) {
                     origin.addLine("commandError", "You must be connected to use this command");
                 }
             } else {
-                ((ServerCommand) command).execute(origin, server, isSilent, args);
+                command.execute(origin, args, new ServerCommandContext(window, commandInfo, server));
             }
         } else {
-            ((GlobalCommand) command).execute(origin, isSilent, args);
+            super.executeCommand(origin, window, commandInfo, command, args);
         }
     }
     

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

@@ -498,7 +498,8 @@ public abstract class InputHandler implements ConfigChangeListener {
 
             addToBuffer(thisBuffer.toString());
 
-            commandParser.parseCommand(parentWindow.getContainer(), thisBuffer.toString());
+            commandParser.parseCommand(parentWindow.getContainer(),
+                    parentWindow, thisBuffer.toString());
         }
         fireLineWrap(0);
         fireCommandPassed();

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

@@ -207,7 +207,7 @@ public class TabCompleter {
      * Retrieves intelligent results for a deferred command.
      * 
      * @param arg The argument number that is being requested
-     * @param previousArgs The full list of previous arguments
+     * @param context Intelligent tab completion context
      * @param offset The number of arguments our command used before deferring
      * to this method
      * @return Additional tab targets for the text, or null if none are available

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -22,9 +22,11 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -42,7 +44,9 @@ public class BanTest {
     @Test
     public void testUsage() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, null, false, new CommandArguments("/ban"));
+        final Channel channel = mock(Channel.class);
+        command.execute(tiw, new CommandArguments("/ban"), 
+                new ChannelCommandContext(null, command, channel));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
@@ -46,7 +47,9 @@ public class KickReasonTest {
     @Test
     public void testUsage() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, null, false, new CommandArguments("/kick"));
+        final Channel channel = mock(Channel.class);
+        command.execute(tiw, new CommandArguments("/kick"),
+                new ChannelCommandContext(null, command, channel));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -60,7 +63,8 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient(anyString())).thenReturn(null);
 
-        command.execute(tiw, null, channel, false, new CommandArguments("/kick user1"));
+        command.execute(tiw, new CommandArguments("/kick user1"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(tiw).addLine(eq("commandError"), matches(".*user1"));
     }
@@ -75,7 +79,8 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
 
-        command.execute(tiw, null, channel, false, new CommandArguments("/kick user1 reason here"));
+        command.execute(tiw, new CommandArguments("/kick user1 reason here"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(cci).kick("reason here");
     }
@@ -93,7 +98,8 @@ public class KickReasonTest {
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
         when(manager.getOption("general", "kickmessage")).thenReturn("reason here");
 
-        command.execute(tiw, null, channel, false, new CommandArguments("/kick user1"));
+        command.execute(tiw, new CommandArguments("/kick user1"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(cci).kick("reason here");
     }

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.parser.irc.IRCChannelInfo;
@@ -58,6 +59,7 @@ public class ModeTest {
         channel = mock(Channel.class);
         channelinfo = mock(IRCChannelInfo.class);
 
+        when(channel.getServer()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");
@@ -68,7 +70,8 @@ public class ModeTest {
     public void testWithoutArgs() {
         final FrameContainer<?> origin = mock(FrameContainer.class);
         
-        command.execute(origin, server, channel, false, new CommandArguments("/mode"));
+        command.execute(origin, new CommandArguments("/mode"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(origin).addLine("channelModeDiscovered", "my mode string!", channelinfo);
     }
@@ -77,7 +80,8 @@ public class ModeTest {
     public void testWithArgs() {
         final FrameContainer<?> origin = mock(FrameContainer.class);
 
-        command.execute(origin, server, channel, false, new CommandArguments("/mode +hello -bye"));
+        command.execute(origin, new CommandArguments("/mode +hello -bye"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }
@@ -86,8 +90,8 @@ public class ModeTest {
     public void testExternalWithArgs() {
         final FrameContainer<?> origin = mock(FrameContainer.class);
 
-        command.execute(origin, server, "#chan", false,
-                new CommandArguments("/mode +hello -bye"));
+        command.execute(origin, new CommandArguments("/mode +hello -bye"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -25,6 +25,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.context.ChannelCommandContext;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.parser.irc.IRCChannelInfo;
@@ -57,6 +58,7 @@ public class NamesTest {
         channel = mock(Channel.class);
         channelinfo = mock(IRCChannelInfo.class);
 
+        when(channel.getServer()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");
@@ -64,7 +66,8 @@ public class NamesTest {
 
     @Test
     public void testNormal() {
-        command.execute(null, server, channel, false, new CommandArguments("/names"));
+        command.execute(null, new CommandArguments("/names"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(parser).sendRawMessage("NAMES #chan");
     }

test/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
@@ -60,7 +61,8 @@ public class PartTest {
 
     @Test
     public void testWithoutArgs() {
-        command.execute(origin, null, channel, false, new CommandArguments("/part"));
+        command.execute(origin, new CommandArguments("/part"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(channel).part("config part message");
         verify(channel).close();
@@ -68,7 +70,8 @@ public class PartTest {
 
     @Test
     public void testWithArgs() {
-        command.execute(origin, null, channel, false, new CommandArguments("/part custom part"));
+        command.execute(origin, new CommandArguments("/part custom part"),
+                new ChannelCommandContext(null, command, channel));
 
         verify(channel).part("custom part");
         verify(channel).close();

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -21,9 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.IdentityManager;
+import org.junit.Before;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -31,17 +34,25 @@ import static org.mockito.Mockito.*;
 
 public class SetNickColourTest {
 
+    private Channel channel;
+
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
+
+    @Before
+    public void setUp() {
+        channel = mock(Channel.class);
+    }
     
     private final SetNickColour command = new SetNickColour();
 
     @Test
     public void testUsageNoArgs() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, null, false, new CommandArguments("/foo"));
+        command.execute(tiw, new CommandArguments("/foo"),
+                new ChannelCommandContext(null, command, channel));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -49,7 +60,8 @@ public class SetNickColourTest {
     @Test
     public void testUsageNicklist() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, null, false, new CommandArguments("/foo --nicklist"));
+        command.execute(tiw, new CommandArguments("/foo --nicklist"),
+                new ChannelCommandContext(null, command, channel));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }    
@@ -57,7 +69,8 @@ public class SetNickColourTest {
     @Test
     public void testUsageText() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, null, false, new CommandArguments("/foo --text"));
+        command.execute(tiw, new CommandArguments("/foo --text"),
+                new ChannelCommandContext(null, command, channel));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }       

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,36 +21,46 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.config.IdentityManager;
+import org.junit.Before;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
 
 public class MeTest {
+ 
+    private final Me command = new Me();
+    private MessageTarget mtt;
 
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
-    
-    private final Me command = new Me();
+
+    @Before
+    public void setUp() {
+        mtt = mock(MessageTarget.class);
+    }
 
     @Test
     public void testUsage() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, null, false, new CommandArguments("/foo"));
+        command.execute(tiw, new CommandArguments("/foo"),
+                new ChatCommandContext(null, command, mtt));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testSend() {
-        final MessageTarget<?> mtt = mock(MessageTarget.class);
-        command.execute(null, null, mtt, false, new CommandArguments("/foo hello meep moop"));
+        command.execute(null, new CommandArguments("/foo hello meep moop"),
+                new ChatCommandContext(null, command, mtt));
 
         verify(mtt).sendAction("hello meep moop");
     }

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -23,6 +23,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
@@ -31,18 +32,19 @@ import static org.mockito.Mockito.*;
 
 public class AliasCommandTest {
 
+    private final AliasCommand command = new AliasCommand();
+    
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
 
-    private final AliasCommand command = new AliasCommand();
-
     @Test
     public void testUsageNoArgs() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
 
-        command.execute(tiw, false, new CommandArguments("/foo"));
+        command.execute(tiw, new CommandArguments("/foo"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -51,7 +53,8 @@ public class AliasCommandTest {
     public void testUsageOneArg() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
         
-        command.execute(tiw, false, new CommandArguments("/foo --remove"));
+        command.execute(tiw, new CommandArguments("/foo --remove"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }    

test/com/dmdirc/commandparser/commands/global/DebugTest.java

@@ -23,6 +23,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -30,18 +31,19 @@ import static org.mockito.Mockito.*;
 
 public class DebugTest {
 
+    private final Debug command = new Debug();
+    
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
-    
-    private final Debug command = new Debug();
 
     @Test
     public void testUsage() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
 
-        command.execute(tiw, false, new CommandArguments("/foo"));
+        command.execute(tiw, new CommandArguments("/foo"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -50,7 +52,8 @@ public class DebugTest {
     public void testInvalidArg() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
 
-        command.execute(tiw, false, new CommandArguments("/foo flubadee"));
+        command.execute(tiw, new CommandArguments("/foo flubadee"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }    

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -23,6 +23,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
@@ -31,17 +32,18 @@ import static org.mockito.Mockito.*;
 
 public class IfpluginTest {
 
+    private final Ifplugin command = new Ifplugin();
+    
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
-    
-    private final Ifplugin command = new Ifplugin();
 
     @Test
     public void testUsageNoArgs() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, false, new CommandArguments("/foo"));
+        command.execute(tiw, new CommandArguments("/foo"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -49,7 +51,8 @@ public class IfpluginTest {
     @Test
     public void testUsageOneArg() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, false, new CommandArguments("/foo bar"));
+        command.execute(tiw, new CommandArguments("/foo bar"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }    

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -23,6 +23,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
@@ -41,7 +42,8 @@ public class NewServerTest {
     @Test
     public void testUsageNoArgs() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, false, new CommandArguments("/foo"));
+        command.execute(tiw, new CommandArguments("/foo"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -49,7 +51,8 @@ public class NewServerTest {
     @Test
     public void testInvalidPort() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, false, new CommandArguments("/foo foo:abc"));
+        command.execute(tiw, new CommandArguments("/foo foo:abc"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }
@@ -57,7 +60,8 @@ public class NewServerTest {
     @Test
     public void testOutOfRangePort1() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, false, new CommandArguments("/foo foo:0"));
+        command.execute(tiw, new CommandArguments("/foo foo:0"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }
@@ -65,7 +69,8 @@ public class NewServerTest {
     @Test
     public void testOutOfRangePort2() {
         final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, false, new CommandArguments("/foo foo:65537"));
+        command.execute(tiw, new CommandArguments("/foo foo:65537"),
+                new CommandContext(null, command));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -24,100 +24,97 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
 
 public class ChangeServerTest {
 
+    private final ChangeServer command = new ChangeServer();
+    private FrameContainer<?> tiw;
+    private Identity profile;
+    private Server server;
+    
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
 
-    private final ChangeServer command = new ChangeServer();
+    @Before
+    public void setUp() {
+        tiw = mock(FrameContainer.class);
+        profile = mock(Identity.class);
+        server = mock(Server.class);
+        when(server.getProfile()).thenReturn(profile);
+    }
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, false, new CommandArguments("/server"));
+        command.execute(tiw, new CommandArguments("/server"),
+                new ServerCommandContext(null, command, server));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testInvalidPort() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, false, new CommandArguments("/server foo:abc"));
+        command.execute(tiw, new CommandArguments("/server foo:abc"),
+                new ServerCommandContext(null, command, server));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }
     
     @Test
     public void testOutOfRangePort1() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, false, new CommandArguments("/server foo:0"));
+        command.execute(tiw, new CommandArguments("/server foo:0"),
+                new ServerCommandContext(null, command, server));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }
     
     @Test
     public void testOutOfRangePort2() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        command.execute(tiw, null, false, new CommandArguments("/server foo:65537"));
+        command.execute(tiw, new CommandArguments("/server foo:65537"),
+                new ServerCommandContext(null, command, server));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }
 
     @Test
     public void testExecuteBasic() throws URISyntaxException {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        final Identity profile = mock(Identity.class);
-        final Server server = mock(Server.class);
-        when(server.getProfile()).thenReturn(profile);
-
-        command.execute(tiw, server, false, new CommandArguments("/server foo:1234"));
+        command.execute(tiw, new CommandArguments("/server foo:1234"),
+                new ServerCommandContext(null, command, server));
 
         verify(server).connect(eq(new URI("irc://foo:1234")), same(profile));
     }
 
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        final Identity profile = mock(Identity.class);
-        final Server server = mock(Server.class);
-        when(server.getProfile()).thenReturn(profile);
-
-        command.execute(tiw, server, false, new CommandArguments("/server foo"));
+        command.execute(tiw, new CommandArguments("/server foo"),
+                new ServerCommandContext(null, command, server));
 
         verify(server).connect(eq(new URI("irc://foo:6667")), same(profile));
     }
 
     @Test
     public void testDeprecatedSSL() throws URISyntaxException {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        final Identity profile = mock(Identity.class);
-        final Server server = mock(Server.class);
-        when(server.getProfile()).thenReturn(profile);
-
-        command.execute(tiw, server, false, new CommandArguments("/server --ssl foo"));
+        command.execute(tiw, new CommandArguments("/server --ssl foo"),
+                new ServerCommandContext(null, command, server));
 
         verify(server).connect(eq(new URI("ircs://foo:6667")), same(profile));
     }
 
     @Test
     public void testExecuteComplex() throws URISyntaxException {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
-        final Identity profile = mock(Identity.class);
-        final Server server = mock(Server.class);
-        when(server.getProfile()).thenReturn(profile);
-
-        command.execute(tiw, server, false, new CommandArguments("/server foo:+1234 password"));
+        command.execute(tiw, new CommandArguments("/server foo:+1234 password"),
+                new ServerCommandContext(null, command, server));
 
         verify(server).connect(eq(new URI("ircs://password@foo:1234")), same(profile));
     }

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -45,7 +45,7 @@ public class CommandParserTest {
     @Test
     public void testBasicCommand() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/echo this is a test");
+        tcp.parseCommand(null, null, "/echo this is a test");
 
         assertNull(tcp.nonCommandLine);
         assertNull(tcp.invalidCommand);
@@ -57,7 +57,7 @@ public class CommandParserTest {
     @Test
     public void testBasicNoArgs() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/echo");
+        tcp.parseCommand(null, null, "/echo");
 
         assertNull(tcp.nonCommandLine);
         assertNull(tcp.invalidCommand);
@@ -69,7 +69,7 @@ public class CommandParserTest {
     @Test
     public void testSilentNoArgs() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/.echo");
+        tcp.parseCommand(null, null, "/.echo");
 
         assertNull(tcp.nonCommandLine);
         assertNull(tcp.invalidCommand);
@@ -81,7 +81,7 @@ public class CommandParserTest {
     @Test
     public void testSilentCommand() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/.echo this is a test");
+        tcp.parseCommand(null, null, "/.echo this is a test");
 
         assertNull(tcp.nonCommandLine);
         assertNull(tcp.invalidCommand);
@@ -93,7 +93,7 @@ public class CommandParserTest {
     @Test
     public void testNonExistantCommand() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/foobar moo bar");
+        tcp.parseCommand(null, null, "/foobar moo bar");
 
         assertNull(tcp.nonCommandLine);
         assertEquals("foobar", tcp.invalidCommand);
@@ -105,7 +105,7 @@ public class CommandParserTest {
     @Test
     public void testEmptyCommand() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/ moo bar");
+        tcp.parseCommand(null, null, "/ moo bar");
 
         assertNull(tcp.nonCommandLine);
         assertEquals("", tcp.invalidCommand);
@@ -117,7 +117,7 @@ public class CommandParserTest {
     @Test
     public void testEmptySilentCommand() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/. moo bar");
+        tcp.parseCommand(null, null, "/. moo bar");
 
         assertNull(tcp.nonCommandLine);
         assertEquals("", tcp.invalidCommand);
@@ -129,7 +129,7 @@ public class CommandParserTest {
     @Test
     public void testNonCommand() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "Foobar baz");
+        tcp.parseCommand(null, null, "Foobar baz");
 
         assertNotNull(tcp.nonCommandLine);
         assertEquals("Foobar baz", tcp.nonCommandLine);
@@ -141,12 +141,12 @@ public class CommandParserTest {
     @Test
     public void testCommandHistory() {
         final TestCommandParser tcp = new TestCommandParser();
-        tcp.parseCommand(null, "/echo this is a test");
+        tcp.parseCommand(null, null, "/echo this is a test");
 
         final long time1 = tcp.getCommandTime("echo this is a test");
         assertTrue(time1 > 0);
         
-        tcp.parseCommand(null, "/echo this is a test");
+        tcp.parseCommand(null, null, "/echo this is a test");
         final long time2 = tcp.getCommandTime("echo this is a test");
         assertTrue(time2 > 0);
         assertTrue(time2 >= time1);

test/com/dmdirc/harness/TestCommandParser.java

@@ -24,11 +24,13 @@ package com.dmdirc.harness;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.parsers.*;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.interfaces.Window;
 
 public class TestCommandParser extends CommandParser {
     private static final long serialVersionUID = 7073002401375438532L;
@@ -49,10 +51,10 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(FrameContainer<?> origin, boolean isSilent,
-                                  Command command, CommandArguments args) {
+    protected void executeCommand(FrameContainer<?> origin, Window window,
+            CommandInfo commandInfo, Command command, CommandArguments args) {
         executedCommand = command;
-        wasSilent = isSilent;
+        wasSilent = args.isSilent();
         commandArgs = args;
     }