Add BasicCommandInfo and make core commands use it

Change-Id: I24e8daf8cc076d90328f7c38cf539420566bf14e
Fixes-Issue: CLIENT-262
Reviewed-on: http://gerrit.dmdirc.com/2009
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/commandparser/BaseCommandInfo.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2006-2011 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;
+
+/**
+ * A basic {@link CommandInfo} implementation whose parameters can be
+ * configured via the constructor.
+ */
+public class BaseCommandInfo implements CommandInfo {
+
+    /** The name of the command. */
+    private final String name;
+
+    /** The help text for this command. */
+    private final String helpText;
+
+    /** The type of the command. */
+    private final CommandType type;
+
+    /**
+     * Creates a new BaseCommandInfo with the specified information.
+     *
+     * @param name The name of the command
+     * @param helpText The help text for this command
+     * @param type The type of the command
+     */
+    public BaseCommandInfo(final String name, final String helpText,
+            final CommandType type) {
+        this.name = name;
+        this.helpText = helpText;
+        this.type = type;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean showInHelp() {
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHelp() {
+        return helpText;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CommandType getType() {
+        return type;
+    }
+
+}

src/com/dmdirc/commandparser/CommandInfo.java

@@ -38,7 +38,9 @@ public interface CommandInfo {
      * Returns whether or not this command should be shown in help messages.
      *
      * @return True iff the command should be shown, false otherwise
+     * @deprecated All commands should be shown in help messages
      */
+    @Deprecated
     boolean showInHelp();
 
     /**

src/com/dmdirc/commandparser/CommandManager.java

@@ -225,37 +225,37 @@ public class CommandManager {
      */
     public void initCommands() {
         // Chat commands
-        registerCommand(new Me());
+        registerCommand(new Me(), Me.INFO);
 
         // Channel commands
-        registerCommand(new Ban());
-        registerCommand(new ChannelSettings());
-        registerCommand(new Cycle());
-        registerCommand(new Invite());
-        registerCommand(new KickReason());
-        registerCommand(new Mode());
-        registerCommand(new Names());
-        registerCommand(new Part());
-        registerCommand(new SetNickColour());
-        registerCommand(new ShowTopic());
+        registerCommand(new Ban(), Ban.INFO);
+        registerCommand(new ChannelSettings(), ChannelSettings.INFO);
+        registerCommand(new Cycle(), Cycle.INFO);
+        registerCommand(new Invite(), Invite.INFO);
+        registerCommand(new KickReason(), KickReason.INFO);
+        registerCommand(new Mode(), Mode.INFO);
+        registerCommand(new Names(), Names.INFO);
+        registerCommand(new Part(), Part.INFO);
+        registerCommand(new SetNickColour(), SetNickColour.INFO);
+        registerCommand(new ShowTopic(), ShowTopic.INFO);
 
         // Server commands
-        registerCommand(new AllChannels());
-        registerCommand(new Away());
-        registerCommand(new Back());
-        registerCommand(new ChangeServer());
-        registerCommand(new Ctcp());
-        registerCommand(new Disconnect());
-        registerCommand(new Ignore());
-        registerCommand(new JoinChannelCommand());
-        registerCommand(new Message());
-        registerCommand(new Nick());
-        registerCommand(new Notice());
-        registerCommand(new OpenQuery());
-        registerCommand(new Raw());
-        registerCommand(new Reconnect());
-        registerCommand(new ServerSettings());
-        registerCommand(new Umode());
+        registerCommand(new AllChannels(), AllChannels.INFO);
+        registerCommand(new Away(), Away.INFO);
+        registerCommand(new Back(), Back.INFO);
+        registerCommand(new ChangeServer(), ChangeServer.INFO);
+        registerCommand(new Ctcp(), Ctcp.INFO);
+        registerCommand(new Disconnect(), Disconnect.INFO);
+        registerCommand(new Ignore(), Ignore.INFO);
+        registerCommand(new JoinChannelCommand(), JoinChannelCommand.INFO);
+        registerCommand(new Message(), Message.INFO);
+        registerCommand(new Nick(), Nick.INFO);
+        registerCommand(new Notice(), Notice.INFO);
+        registerCommand(new OpenQuery(), OpenQuery.INFO);
+        registerCommand(new Raw(), Raw.INFO);
+        registerCommand(new Reconnect(), Reconnect.INFO);
+        registerCommand(new ServerSettings(), ServerSettings.INFO);
+        registerCommand(new Umode(), Umode.INFO);
 
         registerCommand(new RawServerCommand("lusers"));
         registerCommand(new RawServerCommand("map"));
@@ -267,24 +267,24 @@ public class CommandManager {
         // Query commands
 
         // Global commands
-        registerCommand(new AliasCommand());
-        registerCommand(new AllServers());
-        registerCommand(new Clear());
-        registerCommand(new Echo());
-        registerCommand(new Exit());
-        registerCommand(new Help());
-        registerCommand(new Ifplugin());
-        registerCommand(new Input());
-        registerCommand(new NewServer());
-        registerCommand(new Notify());
-        registerCommand(new LoadPlugin());
-        registerCommand(new UnloadPlugin());
-        registerCommand(new OpenWindow());
-        registerCommand(new ReloadActions());
-        registerCommand(new ReloadIdentities());
-        registerCommand(new ReloadPlugin());
-        registerCommand(new SaveConfig());
-        registerCommand(new Set());
+        registerCommand(new AliasCommand(), AliasCommand.INFO);
+        registerCommand(new AllServers(), AllServers.INFO);
+        registerCommand(new Clear(), Clear.INFO);
+        registerCommand(new Echo(), Echo.INFO);
+        registerCommand(new Exit(), Exit.INFO);
+        registerCommand(new Help(), Help.INFO);
+        registerCommand(new Ifplugin(), Ifplugin.INFO);
+        registerCommand(new Input(), Input.INFO);
+        registerCommand(new NewServer(), NewServer.INFO);
+        registerCommand(new Notify(), Notify.INFO);
+        registerCommand(new LoadPlugin(), LoadPlugin.INFO);
+        registerCommand(new UnloadPlugin(), UnloadPlugin.INFO);
+        registerCommand(new OpenWindow(), OpenWindow.INFO);
+        registerCommand(new ReloadActions(), ReloadActions.INFO);
+        registerCommand(new ReloadIdentities(), ReloadIdentities.INFO);
+        registerCommand(new ReloadPlugin(), ReloadPlugin.INFO);
+        registerCommand(new SaveConfig(), SaveConfig.INFO);
+        registerCommand(new Set(), Set.INFO);
 
         // Set up a listener for config changes
         final ConfigChangeListener listener = new ConfigChangeListener() {

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,7 +39,12 @@ import com.dmdirc.ui.input.TabCompletionType;
 /**
  * The kick command bans a specified user or host from the channel.
  */
-public class Ban extends Command implements IntelligentCommand, CommandInfo {
+public class Ban extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("ban",
+            "ban <user|host> - bans the specified user or host from the channel",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -62,30 +68,6 @@ public class Ban extends Command implements IntelligentCommand, CommandInfo {
         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() {
-        return "ban <user|host> - bans the specified user or host from the channel.";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,7 +39,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  */
 @CommandOptions(allowOffline = false)
 public class ChannelSettings extends Command implements
-        IntelligentCommand, CommandInfo {
+        IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("channelsettings",
+            "channelsettings - opens the channel settings window",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -48,30 +54,6 @@ public class ChannelSettings extends Command implements
                 ((ChannelCommandContext) context).getChannel());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "channelsettings";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "channelsettings - opens the channel settings window";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,7 +37,12 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  * The cycle command allows users to rapidly part and rejoin a channel.
  */
 @CommandOptions(allowOffline = false)
-public class Cycle extends Command implements CommandInfo {
+public class Cycle extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("cycle",
+            "cycle [message] - parts and rejoins the channel",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -48,27 +54,4 @@ public class Cycle extends Command implements CommandInfo {
         channel.join();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "cycle";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    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/Invite.java

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -41,7 +42,12 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
  * @since 0.6.4
  */
 @CommandOptions(allowOffline = false)
-public class Invite extends Command implements ExternalCommand, CommandInfo {
+public class Invite extends Command implements ExternalCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("invite",
+            "invite <user> - invites user to a channel",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -70,28 +76,4 @@ public class Invite extends Command implements ExternalCommand, CommandInfo {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "invite";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "invite <user> - invites user to a channel";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -41,8 +42,12 @@ import com.dmdirc.ui.input.TabCompletionType;
  * This version allows the user to specify a reason.
  */
 @CommandOptions(allowOffline = false)
-public class KickReason extends Command implements IntelligentCommand,
-        CommandInfo {
+public class KickReason extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("kick",
+            "kick <user> [reason] - kicks the specified user from the channel",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -66,30 +71,6 @@ public class KickReason extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "kick";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "kick <user> [reason] - kicks the specified user from the channel";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -43,7 +44,12 @@ import com.dmdirc.ui.input.TabCompletionType;
  */
 @CommandOptions(allowOffline = false)
 public class Mode extends Command implements IntelligentCommand,
-        ExternalCommand, CommandInfo {
+        ExternalCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("mode",
+            "mode [changes] - displays or changes the current channel modes",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -71,30 +77,6 @@ public class Mode extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "mode";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "mode [changes] - displays or changes the current channel modes";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -41,7 +42,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  */
 @CommandOptions(allowOffline = false)
 public class Names extends Command implements IntelligentCommand,
-        ExternalCommand, CommandInfo {
+        ExternalCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("names",
+            "names - Requests a list of users that are in the channel",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -59,30 +65,6 @@ public class Names extends Command implements IntelligentCommand,
         server.getParser().sendRawMessage("NAMES " + channel);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "names";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "names - Requests a list of users that are in the channel";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,7 +37,12 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  * The part command parts the current channel with a specified part message.
  */
 @CommandOptions(allowOffline=false)
-public class Part extends Command implements CommandInfo {
+public class Part extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("part",
+            "part [reason] - parts the channel",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -48,27 +54,4 @@ public class Part extends Command implements CommandInfo {
         channel.close();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "part";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "part [reason] - parts the channel";
-    }
 }

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -42,8 +43,13 @@ import java.awt.Color;
 /**
  * Allows the user to set a nickname on the channel to use a custom colour.
  */
-public class SetNickColour extends Command implements IntelligentCommand,
-        CommandInfo {
+public class SetNickColour extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("setnickcolour",
+            "setnickcolour [--nicklist|--text] <nick> [colour] - "
+            + "set the specified person's display colour",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -107,31 +113,6 @@ public class SetNickColour extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "setnickcolour";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "setnickcolour [--nicklist|--text] <nick> [colour] - "
-                + "set the specified person's display colour";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -39,8 +40,12 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
  * The show topic command shows the user the current topic.
  */
 @CommandOptions(allowOffline=false)
-public class ShowTopic extends Command implements ExternalCommand,
-        CommandInfo {
+public class ShowTopic extends Command implements ExternalCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("topic",
+            "topic - displays the current topic\ntopic <newtopic> - sets the channel topic",
+            CommandType.TYPE_CHANNEL);
 
     /** {@inheritDoc} */
     @Override
@@ -75,28 +80,4 @@ public class ShowTopic extends Command implements ExternalCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "topic";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_CHANNEL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "topic - displays the current topic\ntopic <newtopic> - sets the channel topic";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.chat;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -37,7 +38,12 @@ import com.dmdirc.util.validators.ValidationResponse;
 /**
  * The me command sends a CTCP action to the current channel.
  */
-public class Me extends Command implements ValidatingCommand, CommandInfo {
+public class Me extends Command implements ValidatingCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("me",
+            "me <action> - sends the specified action",
+            CommandType.TYPE_CHAT);
 
     /** {@inheritDoc} */
     @Override
@@ -51,30 +57,6 @@ public class Me extends Command implements ValidatingCommand, CommandInfo {
         }
     }
 
-    /** {@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,

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

@@ -27,6 +27,7 @@ import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
@@ -40,8 +41,12 @@ import com.dmdirc.ui.input.TabCompleter;
 /**
  * The alias command allows users to create aliases on-the-fly.
  */
-public class AliasCommand extends Command implements
-        IntelligentCommand, CommandInfo {
+public class AliasCommand extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("alias",
+            "alias [--remove] <name> [command] - creates or removes the specified alias",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -110,30 +115,6 @@ public class AliasCommand extends Command implements
         return false;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "alias";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "alias [--remove] <name> [command] - creates or removes the specified alias";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -37,8 +38,12 @@ import com.dmdirc.ui.input.TabCompleter;
 /**
  * The AllServers command allows users to issue commands to all servers.
  */
-public class AllServers extends Command implements IntelligentCommand,
-        CommandInfo{
+public class AllServers extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("allservers",
+            "allservers <command> - executes the command as though it had"
+            + " been entered on all servers", CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -51,31 +56,6 @@ public class AllServers extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "allservers";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "allservers <command> - executes the command as though it had"
-                + " been entered on all servers";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -34,8 +35,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * The clear command clears the main text area of the current window.
  */
-public class Clear extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Clear extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("clear",
+            "clear - clears the current window's text area",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -44,30 +49,6 @@ public class Clear extends Command implements IntelligentCommand,
         origin.getDocument().clear();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "clear";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "clear - clears the current window's text area";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -44,8 +45,13 @@ import java.util.List;
 /**
  * The echo commands simply echos text to the current window.
  */
-public class Echo extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Echo extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("echo",
+            "echo [--ts <timestamp>] [--target <window>] <line> "
+            + "- echos the specified line to the window",
+            CommandType.TYPE_GLOBAL);
 
     /** The flag used to specify a timestamp for the echo command. */
     private final CommandFlag timeStampFlag = new CommandFlag("ts", true, 1, 0);
@@ -108,31 +114,6 @@ public class Echo extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "echo";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "echo [--ts <timestamp>] [--target <window>] <line> "
-                + "- echos the specified line to the window";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -35,7 +36,12 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  * When the client quits, it disconnects all servers (with the quit message
  * supplied) and saves the config file.
  */
-public class Exit extends Command implements CommandInfo {
+public class Exit extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("exit",
+            "exit [reason] - exits the client",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -45,28 +51,4 @@ public class Exit extends Command implements CommandInfo {
                 : origin.getConfigManager().getOption("general", "closemessage"));
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public String getName() {
-        return "exit";
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public String getHelp() {
-        return "exit [reason] - exits the client";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
@@ -45,7 +46,12 @@ import java.util.Map;
  * their arguments, and a description. It is context-aware, so channel commands
  * are only displayed when in a channel window, for example.
  */
-public class Help extends Command implements IntelligentCommand, CommandInfo {
+public class Help extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("help",
+            "help [command] - shows client command help",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -128,30 +134,6 @@ public class Help extends Command implements IntelligentCommand, CommandInfo {
         }
     }
 
-    /** {@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,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -40,8 +41,13 @@ import com.dmdirc.ui.input.TabCompleter;
  * The if plugin command allows the user to execute commands based on whether
  * or not a plugin is loaded.
  */
-public class Ifplugin extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Ifplugin extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("ifplugin",
+            "ifplugin <[!]plugin> <command> - executes a command if the "
+            + "specified plugin is/isn't loaded",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -75,31 +81,6 @@ public class Ifplugin extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "ifplugin";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "ifplugin <[!]plugin> <command> - executes a command if the "
-                + "specified plugin is/isn't loaded";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,7 +39,13 @@ import com.dmdirc.ui.interfaces.InputWindow;
  *
  * @since 0.6.4
  */
-public class Input extends Command implements IntelligentCommand, CommandInfo {
+public class Input extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("input",
+            "input [--clear] <text to insert into inputfield> - Adds text to"
+            + " the active window's input field",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -58,31 +65,6 @@ public class Input extends Command implements IntelligentCommand, CommandInfo {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "input";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "input [--clear] <text to insert into inputfield> - Adds text to"
-                + " the active window's input field";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,8 +37,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Allows the user to load a plugin.
  */
-public class LoadPlugin extends Command implements IntelligentCommand,
-        CommandInfo {
+public class LoadPlugin extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("loadplugin",
+            "loadplugin <plugin> - loads the specified class as a plugin",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -74,30 +79,6 @@ public class LoadPlugin extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "loadplugin";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "loadplugin <plugin> - loads the specified class as a plugin";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -45,8 +46,12 @@ import java.util.regex.Pattern;
 /**
  * The new server command allows users to open a new server window.
  */
-public class NewServer extends Command implements IntelligentCommand,
-        CommandInfo {
+public class NewServer extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("newserver",
+            "newserver <host[:[+]port]> [password] - connect to a new server",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -212,30 +217,6 @@ public class NewServer extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "newserver";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "newserver <host[:[+]port]> [password] - connect to a new server";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,8 +39,12 @@ import java.awt.Color;
  * The notify command allows the user to set the notification colour for a
  * window.
  */
-public class Notify extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Notify extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("notify",
+            "notify <colour> - sets the notification colour for this window",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -63,30 +68,6 @@ public class Notify extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "notify";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "notify <colour> - sets the notification colour for this window";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,7 +37,13 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Opens a new window.
  */
-public class OpenWindow extends Command implements IntelligentCommand, CommandInfo {
+public class OpenWindow extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("openwindow",
+            "openwindow [--server|--child] <name> [title] "
+            + "- opens a window with the specified name and title",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -87,31 +94,6 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "openwindow [--server|--child] <name> [title] "
-                + "- opens a window with the specified name and title";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "openwindow";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -35,8 +36,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Allows the user to reload actions.
  */
-public final class ReloadActions extends Command implements IntelligentCommand,
-        CommandInfo {
+public final class ReloadActions extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("reloadactions",
+            "reloadactions - reloads actions from disk",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -46,30 +51,6 @@ public final class ReloadActions extends Command implements IntelligentCommand,
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actions reloaded.");
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public String getName() {
-        return "reloadactions";
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public String getHelp() {
-        return "reloadactions - reloads actions from disk";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -35,8 +36,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Allows the user to reload identities.
  */
-public class ReloadIdentities extends Command implements IntelligentCommand,
-        CommandInfo {
+public class ReloadIdentities extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("reloadidentities",
+            "reloadidentities - reloads user identities (configuration files)",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -47,30 +52,6 @@ public class ReloadIdentities extends Command implements IntelligentCommand,
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Identities reloaded.");
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "reloadidentities";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "reloadidentities - reloads user identities (configuration files)";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,8 +37,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Allows the user to reload a plugin.
  */
-public class ReloadPlugin extends Command implements IntelligentCommand,
-        CommandInfo {
+public class ReloadPlugin extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("reloadplugin",
+            "reloadplugin <plugin> - Reloads the specified plugin",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -60,30 +65,6 @@ public class ReloadPlugin extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "reloadplugin";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "reloadplugin <plugin> - Reloads the specified plugin";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -35,8 +36,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Allows the user to save the config file.
  */
-public final class SaveConfig extends Command implements IntelligentCommand,
-        CommandInfo {
+public final class SaveConfig extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("saveconfig",
+            "saveconfig - force the client to save its configuration to disk",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -47,30 +52,6 @@ public final class SaveConfig extends Command implements IntelligentCommand,
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "saveconfig";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "saveconfig - force the client to save its configuration to disk";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
@@ -45,7 +46,14 @@ import java.util.List;
 /**
  * The set command allows the user to inspect and change global config settings.
  */
-public class Set extends Command implements IntelligentCommand, CommandInfo {
+public class Set extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("set",
+            "set [--server|--channel] [domain [option [newvalue]]] - inspect or change configuration settings"
+            + "\nset [--server|--channel] --append <domain> <option> <data> - appends data to the specified option"
+            + "\nset [--server|--channel] --unset <domain> <option> - unsets the specified option",
+            CommandType.TYPE_GLOBAL);
 
     /** The flag to indicate the set command should apply to a server's settings. */
     private final CommandFlag serverFlag = new CommandFlag("server");
@@ -273,32 +281,6 @@ public class Set extends Command implements IntelligentCommand, CommandInfo {
         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() {
-        return "set [--server|--channel] [domain [option [newvalue]]] - inspect or change configuration settings"
-                + "\nset [--server|--channel] --append <domain> <option> <data> - appends data to the specified option"
-                + "\nset [--server|--channel] --unset <domain> <option> - unsets the specified option";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,8 +37,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 /**
  * Allows the user to unload a plugin.
  */
-public class UnloadPlugin extends Command implements IntelligentCommand,
-        CommandInfo {
+public class UnloadPlugin extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("unloadplugin",
+            "unloadplugin <plugin> - Unloads the specified plugin",
+            CommandType.TYPE_GLOBAL);
 
     /** {@inheritDoc} */
     @Override
@@ -60,30 +65,6 @@ public class UnloadPlugin extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "unloadplugin";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "unloadplugin <plugin> - Unloads the specified plugin";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,8 +39,12 @@ import com.dmdirc.ui.input.TabCompleter;
  * The AllChannels command allows the user to issue a command to all channels
  * on a server.
  */
-public class AllChannels extends Command implements IntelligentCommand,
-        CommandInfo {
+public class AllChannels extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("allchannels",
+           "allchannels <command> - executes the command as though it had"
+            + " been entered on all channels", CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -54,31 +59,6 @@ public class AllChannels extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "allchannels";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "allchannels <command> - executes the command as though it had"
-                + " been entered on all channels";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -36,7 +37,11 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
  * The away command allows the user to set their away message.
  */
 @CommandOptions(allowOffline = false)
-public class Away extends Command implements CommandInfo {
+public class Away extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("away",
+           "away <reason> - marks you as away", CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -52,28 +57,4 @@ public class Away extends Command implements CommandInfo {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "away";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "away <reason> - marks you as away";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,7 +39,11 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * The back command allows the user to unset their away status.
  */
 @CommandOptions(allowOffline = false)
-public class Back extends Command implements IntelligentCommand, CommandInfo {
+public class Back extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("back",
+           "back - unsets your away status", CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -48,30 +53,6 @@ public class Back extends Command implements IntelligentCommand, CommandInfo {
         server.getParser().getLocalClient().setBack();
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public String getName() {
-        return "back";
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public String getHelp() {
-        return "back - unsets your away status";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -38,7 +39,12 @@ import java.net.URISyntaxException;
 /**
  * The /server command allows the user to connect to a new server.
  */
-public class ChangeServer extends Command implements CommandInfo {
+public class ChangeServer extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("server",
+            "server <host[:[+]port]> [password] - connect to a different server",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -68,28 +74,4 @@ public class ChangeServer extends Command implements CommandInfo {
         server.connect(address, server.getProfile());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "server";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "server <host[:[+]port]> [password] - connect to a different server";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -39,8 +40,12 @@ import com.dmdirc.ui.input.TabCompletionType;
  * Allows the user to send CTCP messages.
  */
 @CommandOptions(allowOffline = false)
-public class Ctcp extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Ctcp extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("ctcp",
+            "ctcp <target> <type> [arguments] - sends a CTCP message",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -57,30 +62,6 @@ public class Ctcp extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public String getName() {
-        return "ctcp";
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public String getHelp() {
-        return "ctcp <target> <type> [arguments] - sends a CTCP message";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -34,7 +35,12 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 /**
  * The disconnect command disconnects from the current server.
  */
-public class Disconnect extends Command implements CommandInfo {
+public class Disconnect extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("disconnect",
+            "disconnect [reason] - disconnect from this server",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -52,28 +58,4 @@ public class Disconnect extends Command implements CommandInfo {
         server.disconnect(line);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "disconnect";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "disconnect [reason] - disconnect from this server";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -42,8 +43,12 @@ import java.util.regex.PatternSyntaxException;
 /**
  * Allows the user to add/view/delete ignores.
  */
-public class Ignore extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Ignore extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("ignore",
+            "ignore [--remove|--regex] [host] - manages the network's ignore list",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -149,30 +154,6 @@ public class Ignore extends Command implements IntelligentCommand,
         sendLine(origin, args.isSilent(), FORMAT_ERROR, "Ignore list doesn't contain '" + host + "'.");
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "ignore";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "ignore [--remove|--regex] [host] - manages the network's ignore list";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -27,6 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -49,7 +50,12 @@ import java.util.List;
  * @since 0.6.3m1
  */
 public class JoinChannelCommand extends Command implements
-        ActionListener, IntelligentCommand, CommandInfo {
+        ActionListener, IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("join",
+            "join <channel [key]>[,channel [key]...] - joins the specified channel(s)",
+            CommandType.TYPE_SERVER);
 
     /** A map of channel name mentions. */
     private final MapList<FrameContainer, String> mentions
@@ -91,30 +97,6 @@ public class JoinChannelCommand extends Command implements
         server.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[0]));
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "join";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "join <channel [key]>[,channel [key]...] - joins the specified channel(s)";
-    }
-
     /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -43,7 +44,12 @@ import com.dmdirc.ui.interfaces.InputWindow;
  */
 @CommandOptions(allowOffline = false)
 public class Message extends Command implements IntelligentCommand,
-        WrappableCommand, CommandInfo {
+        WrappableCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("msg",
+            "msg <target> <message> - sends a private message",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -79,30 +85,6 @@ public class Message extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "msg";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "msg <target> <message> - sends a private message";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -39,8 +40,12 @@ import com.dmdirc.ui.input.TabCompletionType;
  * Allows the user to change nickname.
  */
 @CommandOptions(allowOffline = false)
-public class Nick extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Nick extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("nick",
+            "nick <new nickname> - attempts to change your nickname to the one specified",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -55,30 +60,6 @@ public class Nick extends Command implements IntelligentCommand,
         server.getParser().getLocalClient().setNickname(args.getArguments()[0]);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "nick";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "nick <new nickname> - attempts to change your nickname to the one specified";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -39,8 +40,12 @@ import com.dmdirc.ui.input.TabCompletionType;
  * Allows the user to send notices.
  */
 @CommandOptions(allowOffline = false)
-public class Notice extends Command implements IntelligentCommand,
-        CommandInfo {
+public class Notice extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("notice",
+            "notice <target> <message> - sends a notice",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -57,30 +62,6 @@ public class Notice extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "notice";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "notice <target> <message> - sends a notice";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
@@ -43,7 +44,12 @@ import com.dmdirc.ui.messages.Styliser;
  * Allows the user to open a query dialog with another user.
  */
 public class OpenQuery extends Command implements IntelligentCommand,
-        WrappableCommand, CommandInfo {
+        WrappableCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("query",
+            "query <user> [message] - opens a query with the specified user",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -77,30 +83,6 @@ public class OpenQuery extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "query";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "query <user> [message] - opens a query with the specified user";
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -37,7 +38,12 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
  * irc server.
  */
 @CommandOptions(allowOffline=false)
-public class Raw extends Command implements CommandInfo {
+public class Raw extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("raw",
+            "raw <text> - sends the specified text directly to the server",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -50,28 +56,4 @@ public class Raw extends Command implements CommandInfo {
         sendLine(origin, args.isSilent(), "rawCommand", line);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "raw";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "raw <text> - sends the specified text directly to the server";
-    }
-
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -34,7 +35,12 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 /**
  * The reconnect command reconnects to the current server.
  */
-public class Reconnect extends Command implements CommandInfo {
+public class Reconnect extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("reconnect",
+            "reconnect [reason] - reconnect to this server",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -52,29 +58,4 @@ public class Reconnect extends Command implements CommandInfo {
         server.reconnect(line);
     }
 
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "reconnect";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "reconnect [reason] - reconnect to this server";
-    }
-
 }

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

@@ -24,6 +24,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -40,8 +41,12 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * @since 0.6.4
  */
 @CommandOptions(allowOffline=false)
-public class ServerSettings extends Command implements IntelligentCommand,
-        CommandInfo {
+public class ServerSettings extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("serversettings",
+            "serversettings - opens the server settings window",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -51,30 +56,6 @@ public class ServerSettings extends Command implements IntelligentCommand,
                 ((ServerCommandContext) context).getServer());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "serversettings";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "serversettings - opens the server settings window";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,

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

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -37,7 +38,12 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
  * Allows the user to change user modes.
  */
 @CommandOptions(allowOffline=false)
-public class Umode extends Command implements CommandInfo {
+public class Umode extends Command {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("umode",
+            "umode [modes] - sets or displays your user modes",
+            CommandType.TYPE_SERVER);
 
     /** {@inheritDoc} */
     @Override
@@ -54,28 +60,4 @@ public class Umode extends Command implements CommandInfo {
                 + " " + args.getArgumentsAsString());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "umode";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_SERVER;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "umode [modes] - sets or displays your user modes";
-    }
-
 }

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

@@ -49,7 +49,7 @@ public class BanTest {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
         command.execute(tiw, new CommandArguments("/ban"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -69,7 +69,7 @@ public class BanTest {
         when(clientInfo.getHostname()).thenReturn("my.host.name");
 
         command.execute(container, new CommandArguments("/ban user"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");
         verify(channelInfo).flushModes();
@@ -85,7 +85,7 @@ public class BanTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
 
         command.execute(container, new CommandArguments("/ban *!*@my.host.name"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");
         verify(channelInfo).flushModes();

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

@@ -41,7 +41,7 @@ public class KickReasonTest {
     public static void setUpClass() throws Exception {
         IdentityManager.load();
     }
-    
+
     private final KickReason command = new KickReason();
 
     @Test
@@ -49,8 +49,8 @@ public class KickReasonTest {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
         command.execute(tiw, new CommandArguments("/kick"),
-                new ChannelCommandContext(null, command, channel));
-        
+                new ChannelCommandContext(null, KickReason.INFO, channel));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
 
@@ -64,7 +64,7 @@ public class KickReasonTest {
         when(channelInfo.getChannelClient(anyString())).thenReturn(null);
 
         command.execute(tiw, new CommandArguments("/kick user1"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(tiw).addLine(eq("commandError"), matches(".*user1"));
     }
@@ -80,7 +80,7 @@ public class KickReasonTest {
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
 
         command.execute(tiw, new CommandArguments("/kick user1 reason here"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(cci).kick("reason here");
     }
@@ -99,7 +99,7 @@ public class KickReasonTest {
         when(manager.getOption("general", "kickmessage")).thenReturn("reason here");
 
         command.execute(tiw, new CommandArguments("/kick user1"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(cci).kick("reason here");
     }

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

@@ -53,7 +53,7 @@ public class ModeTest {
     @Before
     public void setUp() throws InvalidIdentityFileException {
         IdentityManager.load();
-        
+
         parser = mock(IRCParser.class);
         server = mock(Server.class);
         channel = mock(Channel.class);
@@ -69,9 +69,9 @@ public class ModeTest {
     @Test
     public void testWithoutArgs() {
         final FrameContainer origin = mock(FrameContainer.class);
-        
+
         command.execute(origin, new CommandArguments("/mode"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(origin).addLine("channelModeDiscovered", "my mode string!", channelinfo);
     }
@@ -81,7 +81,7 @@ public class ModeTest {
         final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, new CommandArguments("/mode +hello -bye"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }
@@ -91,7 +91,7 @@ public class ModeTest {
         final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, new CommandArguments("/mode +hello -bye"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Mode.INFO, channel));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }

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

@@ -52,7 +52,7 @@ public class NamesTest {
     @Before
     public void setUp() throws InvalidIdentityFileException {
         IdentityManager.load();
-        
+
         parser = mock(IRCParser.class);
         server = mock(Server.class);
         channel = mock(Channel.class);
@@ -67,7 +67,7 @@ public class NamesTest {
     @Test
     public void testNormal() {
         command.execute(null, new CommandArguments("/names"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Names.INFO, channel));
 
         verify(parser).sendRawMessage("NAMES #chan");
     }

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

@@ -50,11 +50,11 @@ public class PartTest {
     @Before
     public void setUp() throws InvalidIdentityFileException {
         IdentityManager.load();
-        
+
         channel = mock(Channel.class);
         origin = mock(FrameContainer.class);
         manager = mock(ConfigManager.class);
-        
+
         when(origin.getConfigManager()).thenReturn(manager);
         when(manager.getOption("general", "partmessage")).thenReturn("config part message");
     }
@@ -62,7 +62,7 @@ public class PartTest {
     @Test
     public void testWithoutArgs() {
         command.execute(origin, new CommandArguments("/part"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Part.INFO, channel));
 
         verify(channel).part("config part message");
         verify(channel).close();
@@ -71,7 +71,7 @@ public class PartTest {
     @Test
     public void testWithArgs() {
         command.execute(origin, new CommandArguments("/part custom part"),
-                new ChannelCommandContext(null, command, channel));
+                new ChannelCommandContext(null, Part.INFO, channel));
 
         verify(channel).part("custom part");
         verify(channel).close();

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

@@ -45,34 +45,34 @@ public class SetNickColourTest {
     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, new CommandArguments("/foo"),
-                new ChannelCommandContext(null, command, channel));
-        
+                new ChannelCommandContext(null, SetNickColour.INFO, channel));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
-    
+
     @Test
     public void testUsageNicklist() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo --nicklist"),
-                new ChannelCommandContext(null, command, channel));
-        
+                new ChannelCommandContext(null, SetNickColour.INFO, channel));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
-    }    
-    
+    }
+
     @Test
     public void testUsageText() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo --text"),
-                new ChannelCommandContext(null, command, channel));
-        
+                new ChannelCommandContext(null, SetNickColour.INFO, channel));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
-    }       
+    }
 
 }

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

@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.mockito.Mockito.*;
 
 public class MeTest {
- 
+
     private final Me command = new Me();
     private MessageTarget mtt;
 
@@ -51,15 +51,15 @@ public class MeTest {
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
-                new ChatCommandContext(null, command, mtt));
-        
+                new ChatCommandContext(null, Me.INFO, mtt));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
-    
+
     @Test
     public void testSend() {
         command.execute(null, new CommandArguments("/foo hello meep moop"),
-                new ChatCommandContext(null, command, mtt));
+                new ChatCommandContext(null, Me.INFO, mtt));
 
         verify(mtt).sendAction("hello meep moop");
     }

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

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.*;
 public class AliasCommandTest {
 
     private final AliasCommand command = new AliasCommand();
-    
+
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
@@ -44,19 +44,19 @@ public class AliasCommandTest {
         final FrameContainer tiw = mock(FrameContainer.class);
 
         command.execute(tiw, new CommandArguments("/foo"),
-                new CommandContext(null, command));
-        
+                new CommandContext(null, AliasCommand.INFO));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
-    
+
     @Test
     public void testUsageOneArg() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        
+
         command.execute(tiw, new CommandArguments("/foo --remove"),
-                new CommandContext(null, command));
-        
+                new CommandContext(null, AliasCommand.INFO));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
-    }    
+    }
 
 }

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

@@ -43,7 +43,7 @@ public class IfpluginTest {
     public void testUsageNoArgs() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
-                new CommandContext(null, command));
+                new CommandContext(null, Ifplugin.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -52,7 +52,7 @@ public class IfpluginTest {
     public void testUsageOneArg() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo bar"),
-                new CommandContext(null, command));
+                new CommandContext(null, Ifplugin.INFO));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }

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

@@ -43,35 +43,35 @@ public class NewServerTest {
     public void testUsageNoArgs() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
-                new CommandContext(null, command));
-        
+                new CommandContext(null, NewServer.INFO));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
-    
+
     @Test
     public void testInvalidPort() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo foo:abc"),
-                new CommandContext(null, command));
-        
+                new CommandContext(null, NewServer.INFO));
+
         verify(tiw).addLine(eq("commandError"), anyString());
     }
-    
+
     @Test
     public void testOutOfRangePort1() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo foo:0"),
-                new CommandContext(null, command));
-        
+                new CommandContext(null, NewServer.INFO));
+
         verify(tiw).addLine(eq("commandError"), anyString());
     }
-    
+
     @Test
     public void testOutOfRangePort2() {
         final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo foo:65537"),
-                new CommandContext(null, command));
-        
+                new CommandContext(null, NewServer.INFO));
+
         verify(tiw).addLine(eq("commandError"), anyString());
     }
 

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

@@ -41,7 +41,7 @@ public class ChangeServerTest {
     private FrameContainer tiw;
     private Identity profile;
     private Server server;
-    
+
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
@@ -58,39 +58,39 @@ public class ChangeServerTest {
     @Test
     public void testUsageNoArgs() {
         command.execute(tiw, new CommandArguments("/server"),
-                new ServerCommandContext(null, command, server));
-        
+                new ServerCommandContext(null, ChangeServer.INFO, server));
+
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
-    
+
     @Test
     public void testInvalidPort() {
         command.execute(tiw, new CommandArguments("/server foo:abc"),
-                new ServerCommandContext(null, command, server));
-        
+                new ServerCommandContext(null, ChangeServer.INFO, server));
+
         verify(tiw).addLine(eq("commandError"), anyString());
     }
-    
+
     @Test
     public void testOutOfRangePort1() {
         command.execute(tiw, new CommandArguments("/server foo:0"),
-                new ServerCommandContext(null, command, server));
-        
+                new ServerCommandContext(null, ChangeServer.INFO, server));
+
         verify(tiw).addLine(eq("commandError"), anyString());
     }
-    
+
     @Test
     public void testOutOfRangePort2() {
         command.execute(tiw, new CommandArguments("/server foo:65537"),
-                new ServerCommandContext(null, command, server));
-        
+                new ServerCommandContext(null, ChangeServer.INFO, server));
+
         verify(tiw).addLine(eq("commandError"), anyString());
     }
 
     @Test
     public void testExecuteBasic() throws URISyntaxException {
         command.execute(tiw, new CommandArguments("/server foo:1234"),
-                new ServerCommandContext(null, command, server));
+                new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("irc://foo:1234")), same(profile));
     }
@@ -98,7 +98,7 @@ public class ChangeServerTest {
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
         command.execute(tiw, new CommandArguments("/server foo"),
-                new ServerCommandContext(null, command, server));
+                new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("irc://foo:6667")), same(profile));
     }
@@ -106,7 +106,7 @@ public class ChangeServerTest {
     @Test
     public void testDeprecatedSSL() throws URISyntaxException {
         command.execute(tiw, new CommandArguments("/server --ssl foo"),
-                new ServerCommandContext(null, command, server));
+                new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("ircs://foo:6667")), same(profile));
     }
@@ -114,7 +114,7 @@ public class ChangeServerTest {
     @Test
     public void testExecuteComplex() throws URISyntaxException {
         command.execute(tiw, new CommandArguments("/server foo:+1234 password"),
-                new ServerCommandContext(null, command, server));
+                new ServerCommandContext(null, ChangeServer.INFO, server));
 
         verify(server).connect(eq(new URI("ircs://password@foo:1234")), same(profile));
     }