Restructuring of commandmanager and commands to allow plugins to register commands

git-svn-id: http://svn.dmdirc.com/trunk@829 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/commandparser/Command.java

@@ -27,32 +27,7 @@ package uk.org.ownage.dmdirc.commandparser;
  * @author chris
  */
 public abstract class Command {
-    
-    /**
-     * The name of this command (i.e., the string used by the user to execute it).
-     */
-    protected String name;
-    /**
-     * The arity of this command.
-     */
-    protected int arity;
-    /**
-     * Whether this command is polyadic or not.
-     */
-    protected boolean polyadic;
-    /**
-     * Whether this command should be shown in help output.
-     */
-    protected boolean show = true;
-    /**
-     * A textual description of this command's arguments.
-     */
-    protected String arguments = "<unknown>";
-    /**
-     * A description of this command.
-     */
-    protected String description = "unknown";
-        
+            
     /**
      * Returns the signature of this command. For polyadic commands, the signature
      * is simply the name. For other commands, the signature is a concatenation of
@@ -60,28 +35,42 @@ public abstract class Command {
      * @return The signature of this command
      */
     public final String getSignature() {
-        if (polyadic) {
-            return name;
+        if (isPolyadic()) {
+            return getName();
         } else {
-            return name + "/" + arity;
+            return getName() + "/" + getArity();
         }
     }
+        
+    /**
+     * Returns this command's name.
+     * @return The name of this command
+     */
+    public abstract String getName();
     
     /**
      * Returns whether or not this command should be shown in help messages.
      * @return True iff the command should be shown, false otherwise
      */
-    public final boolean showInHelp() {
-        return show;
-    }
+    public abstract boolean showInHelp();
+    
+    /**
+     * Indicates whether this command is polyadic or not.
+     * @return True iff this command is polyadic, false otherwise
+     */
+    public abstract boolean isPolyadic();
+    
+    /**
+     * Returns the arity of this command
+     * @return This command's arity
+     */
+    public abstract int getArity();
     
     /**
      * Returns a string representing the help message for this command.
      * @return the help message for this command
      */
-    public final String getHelp() {
-        return name + " " + arguments + " - " + description;
-    }
+    public abstract String getHelp();
     
     /**
      * Implodes the given list of arguments.
@@ -108,14 +97,6 @@ public abstract class Command {
      */
     protected final String implodeArgs(final String... args) {
         return implodeArgs(0, args);
-    }
-    
-    /**
-     * Returns this command's name.
-     * @return The name of this command
-     */
-    public final String getName() {
-        return name;
-    }
+    } 
     
 }

src/uk/org/ownage/dmdirc/commandparser/CommandManager.java

@@ -29,6 +29,8 @@ import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.commandparser.commands.channel.*;
 import uk.org.ownage.dmdirc.commandparser.commands.query.*;
 import uk.org.ownage.dmdirc.commandparser.commands.server.*;
+import uk.org.ownage.dmdirc.logger.ErrorLevel;
+import uk.org.ownage.dmdirc.logger.Logger;
 
 /**
  * The command manager creates and manages a single instance of all commands,
@@ -57,49 +59,74 @@ public final class CommandManager {
         //do nothing
     }
     
+    /**
+     * Registers a command with the command manager.
+     * @param scope The scope of the command
+     * @param command The command to be registered
+     */
+    public static void registerCommand(final Command command) {
+        if (command instanceof ChannelCommand) {
+            channelCommands.add(command);
+        } else if (command instanceof ServerCommand) {
+            serverCommands.add(command);
+        } else if (command instanceof QueryCommand) {
+            queryCommands.add(command);
+        } else {
+            Logger.error(ErrorLevel.ERROR, "Attempted to register an invalid command", new RuntimeException());
+        }
+    }
+    
     /**
      * Initialises the command manager's various command lists.
      */
     private static void initLists() {
         channelCommands = new ArrayList<Command>();
-        
-        channelCommands.add(new Cycle());
-        channelCommands.add(new Me());
-        channelCommands.add(new MeEmpty());
-        channelCommands.add(new Part());
-        channelCommands.add(new PartDefault());
-        channelCommands.add(new Kick());
-        channelCommands.add(new KickEmpty());
-        channelCommands.add(new KickReason());
-        channelCommands.add(new Ban());
-        channelCommands.add(new Benchmark());
-        channelCommands.add(new ChannelSettings());
-        channelCommands.add(new ShowTopic());
-        channelCommands.add(new SetTopic());
-        
         serverCommands = new ArrayList<Command>();
+        queryCommands = new ArrayList<Command>();
         
-        serverCommands.add(new Help());
-        serverCommands.add(new Join());
-        serverCommands.add(new Nick());
-        serverCommands.add(new ReloadFormatter());
-        serverCommands.add(new SaveFormatter());
-        serverCommands.add(new LoadFormatter());
-        serverCommands.add(new Quit());
-        serverCommands.add(new QuitDefault());
-        serverCommands.add(new Raw());
-        serverCommands.add(new Clear());
-        serverCommands.add(new Ctcp());
-        serverCommands.add(new Motd());
-        serverCommands.add(new Away());
-        serverCommands.add(new ConfigInfo());
-        serverCommands.add(new Back());
-        serverCommands.add(new Whois());
+        initCommands();
+    }
+    
+    /**
+     * Instansiates the default commands.
+     */
+    private static void initCommands() {
+        // Channel commands
+        new Ban();
+        new Benchmark();
+        new ChannelSettings();
+        new Cycle();
+        new Kick();
+        new KickEmpty();
+        new KickReason();
+        new Me();
+        new MeEmpty();
+        new Part();
+        new PartDefault();
+        new SetTopic();
+        new ShowTopic();
         
-        queryCommands = new ArrayList<Command>();
+        // Server commands
+        new Away();
+        new Back();
+        new Clear();
+        new ConfigInfo();
+        new Ctcp();
+        new Help();
+        new Join();
+        new LoadFormatter();
+        new Motd();
+        new Nick();
+        new Quit();
+        new QuitDefault();
+        new Raw();
+        new ReloadFormatter();
+        new SaveFormatter();
+        new Whois();
         
-        queryCommands.add(new QueryMe());
-        queryCommands.add(new QueryMeEmpty());
+        // Query commands
+        new QueryMe();
+        new QueryMeEmpty();
     }
     
     /**

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Ban.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
 
@@ -36,12 +37,9 @@ public final class Ban extends ChannelCommand {
     
     /** Creates a new instance of Ban. */
     public Ban() {
-        description = "bans the specified user or host from the channel";
-        arguments = "<user|host>";
-        polyadic = false;
-        arity = 1;
-        name = "ban";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,9 +49,9 @@ public final class Ban extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
-
+        
         String host = args[0];
         final ChannelClientInfo user = channel.getChannelInfo().getUser(args[0]);
         if (user != null && user.getClient().getHost().length() > 0) {
@@ -64,4 +62,29 @@ public final class Ban extends ChannelCommand {
         server.getParser().sendLine("MODE " + channel + " +b " + host);
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "ban";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "ban <user|host> - bans the specified user or host from the channel.";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Benchmark.java

@@ -25,23 +25,21 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
  * The benchmark command allows us to fake a stream of channel messages for
- * benchmarking purposes. 
+ * benchmarking purposes.
  * @author chris
  */
 public final class Benchmark extends ChannelCommand {
     
     /** Creates a new instance of Benchmark. */
     public Benchmark() {
-        description = "simulates a stream of channel messages";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "benchmark";
-        show = false;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,7 +49,7 @@ public final class Benchmark extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         final String[] strings = {
             "this is a test",
@@ -64,17 +62,42 @@ public final class Benchmark extends ChannelCommand {
         
         for (int i = 0; i < 100; i++) {
             for (int j = 0; j < strings.length; j++) {
-                channel.onChannelMessage(server.getParser(), 
-                        channel.getChannelInfo(), null, strings[j], 
+                channel.onChannelMessage(server.getParser(),
+                        channel.getChannelInfo(), null, strings[j],
                         "benchmarker!dmdirc@dmdirc.com");
             }
             
             for (int j = 0; j < strings.length; j++) {
-                channel.onChannelMessage(server.getParser(), 
-                        channel.getChannelInfo(), 
+                channel.onChannelMessage(server.getParser(),
+                        channel.getChannelInfo(),
                         channel.getChannelInfo().getUser(server.getParser().getMyself()),
                         strings[j], "benchmarker!dmdirc@dmdirc.com");
-            }            
+            }
         }
     }
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "benchmark";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return null;
+    }
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
 
@@ -36,12 +37,9 @@ public final class ChannelSettings extends ChannelCommand {
     
     /** Creates a new instance of ChannelSettings. */
     public ChannelSettings() {
-        description = "opens the channel settings window";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "channelsettings";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,9 +49,33 @@ public final class ChannelSettings extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         new ChannelSettingsDialog(channel).setVisible(true);
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "channelsettings";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "channelsettings - opens the channel settings window";
+    }
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Cycle.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -35,14 +36,11 @@ public final class Cycle extends ChannelCommand {
     
     /** Creates a new instance of Cycle. */
     public Cycle() {
-        description = "parts and rejoins the current channel";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "cycle";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
-
+    
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
@@ -50,10 +48,35 @@ public final class Cycle extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         channel.part(origin.getConfigManager().getOption("general", "cyclemessage"));
         channel.join();
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "cycle";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "cycle - parts and rejoins the channel";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Kick.java

@@ -36,12 +36,9 @@ public final class Kick extends ChannelCommand {
     
     /** Creates a new instance of Kick. */
     public Kick() {
-        description = "kicks the specified user from the channel";
-        arguments = "<user>";
-        polyadic = false;
-        arity = 1;
-        name = "kick";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,7 +48,7 @@ public final class Kick extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         final String[] newArgs = new String[2];
         newArgs[0] = args[0]; // Nickname
@@ -60,4 +57,29 @@ public final class Kick extends ChannelCommand {
         CommandManager.getChannelCommand("kick").execute(origin, server, channel, newArgs);
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "kick";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "kick <user> - kicks the specified user from the channel";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/KickEmpty.java

@@ -26,6 +26,7 @@ import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -36,12 +37,9 @@ public final class KickEmpty extends ChannelCommand {
     
     /** Creates a new instance of KickEmpty. */
     public KickEmpty() {
-        description = "informs the user of the kick command";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "kick";
-        show = false;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,9 +49,34 @@ public final class KickEmpty extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         origin.addLine("Usage: " + Config.getOption("general", "commandchar") + "kick <user> [reason]");
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "kick";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return null;
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/KickReason.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
 
@@ -37,12 +38,9 @@ public final class KickReason extends ChannelCommand {
     
     /** Creates a new instance of KickReason. */
     public KickReason() {
-        description = "kicks the specified user from the channel";
-        arguments = "<user> <reason>";
-        polyadic = true;
-        arity = 0;
-        name = "kick";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -52,7 +50,7 @@ public final class KickReason extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         
         final ChannelClientInfo victim = channel.getChannelInfo().getUser(args[0]);
@@ -64,4 +62,29 @@ public final class KickReason extends ChannelCommand {
         }
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "kick";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "kick <user> <reason> - kicks the specified user from the channel";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Me.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -35,12 +36,9 @@ public final class Me extends ChannelCommand {
     
     /** Creates a new instance of Me. */
     public Me() {
-        description = "sends an action to the current channel";
-        arguments = "<action>";
-        polyadic = true;
-        arity = 0;
-        name = "me";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -50,9 +48,34 @@ public final class Me extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         channel.sendAction(implodeArgs(args));
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "me";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "me <action> - sends the specified action to the channel";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/MeEmpty.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -36,12 +37,9 @@ public final class MeEmpty extends ChannelCommand {
     
     /** Creates a new instance of MeEmpty. */
     public MeEmpty() {
-        description = "informs the user of the correct usage of the me command";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "me";
-        show = false;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,9 +49,34 @@ public final class MeEmpty extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         origin.addLine("Usage: " + origin.getConfigManager().getOption("general", "commandchar") + "me <action>");
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "me";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return null;
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Part.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -35,12 +36,9 @@ public final class Part extends ChannelCommand {
     
     /** Creates a new instance of Part. */
     public Part() {
-        description = "parts the channel with the specified reason";
-        arguments = "<reason>";
-        polyadic = true;
-        arity = 0;
-        name = "part";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -50,9 +48,34 @@ public final class Part extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         channel.part(implodeArgs(args));
         channel.close();
     }
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "part";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "part <reason> - parts the channel with the specified reason";
+    }
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/PartDefault.java

@@ -38,12 +38,9 @@ public final class PartDefault extends ChannelCommand {
     
     /** Creates a new instance of PartDefault. */
     public PartDefault() {
-        description = "parts the channel with the default reason";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "part";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -53,11 +50,36 @@ public final class PartDefault extends ChannelCommand {
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Channel channel, final String... args) {
         final ChannelCommand com = CommandManager.getChannelCommand("part");
         com.execute(origin, server, channel, origin.getConfigManager().getOption("general", "partmessage"));
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "part";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "part - parts the channel with the default message";
+    }
+    
 }
 

src/uk/org/ownage/dmdirc/commandparser/commands/channel/SetTopic.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.parser.ChannelInfo;
 
@@ -36,12 +37,9 @@ public final class SetTopic extends ChannelCommand {
     
     /** Creates a new instance of SetTopic. */
     public SetTopic() {
-        description = "sets the channel topic";
-        arguments = "<topic>";
-        polyadic = true;
-        arity = 0;
-        name = "topic";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -59,4 +57,29 @@ public final class SetTopic extends ChannelCommand {
         server.getParser().sendLine("TOPIC " + cChannel.getName() + " :" + newTopic);
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "topic";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "topic <new topic> - sets the channel topic to the one specified";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.channel;
 import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.parser.ChannelInfo;
 
@@ -36,12 +37,9 @@ public final class ShowTopic extends ChannelCommand {
     
     /** Creates a new instance of ShowTopic. */
     public ShowTopic() {
-        description = "displays the current topic";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "topic";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -56,11 +54,36 @@ public final class ShowTopic extends ChannelCommand {
         final ChannelInfo cChannel = channel.getChannelInfo();
         
         if (cChannel.getTopic().length() > 0) {
-        origin.addLine("channelJoinTopic", cChannel.getTopic(),
-                cChannel.getTopicUser(), 1000 * cChannel.getTopicTime(), cChannel);
+            origin.addLine("channelJoinTopic", cChannel.getTopic(),
+                    cChannel.getTopicUser(), 1000 * cChannel.getTopicTime(), cChannel);
         } else {
             origin.addLine("channelNoTopic", cChannel);
         }
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "topic";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "topic - displays the current topic";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/query/QueryMe.java

@@ -24,6 +24,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.query;
 
 import uk.org.ownage.dmdirc.Query;
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.QueryCommand;
 
@@ -35,14 +36,11 @@ public final class QueryMe extends QueryCommand {
     
     /** Creates a new instance of QueryMe. */
     public QueryMe() {
-        description = "sends an action to the query receipient";
-        arguments = "<action>";
-        polyadic = true;
-        arity = 0;
-        name = "me";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
-
+    
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
@@ -50,9 +48,34 @@ public final class QueryMe extends QueryCommand {
      * @param query The query object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Query query, final String... args) {
         query.sendAction(implodeArgs(args));
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "me";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "me <action> - sends the specified action to the target";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/query/QueryMeEmpty.java

@@ -24,6 +24,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.query;
 
 import uk.org.ownage.dmdirc.Query;
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.QueryCommand;
 
@@ -36,12 +37,9 @@ public final class QueryMeEmpty extends QueryCommand {
     
     /** Creates a new instance of QueryMeEmpty. */
     public QueryMeEmpty() {
-        description = "informs the user of the correct usage of the me command";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "me";
-        show = false;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,9 +49,34 @@ public final class QueryMeEmpty extends QueryCommand {
      * @param query The query object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final Query query, final String... args) {
         origin.addLine("Usage: " + origin.getConfigManager().getOption("general", "commandchar") + "me <action>");
     }
     
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "me";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return null;
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Away.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -36,12 +37,9 @@ public final class Away extends ServerCommand {
      * Creates a new instance of Away.
      */
     public Away() {
-        description = "Sets your away status";
-        arguments = "<away reason>";
-        polyadic = true;
-        arity = 0;
-        name = "away";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -49,12 +47,38 @@ public final class Away extends ServerCommand {
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         final String line = implodeArgs(args);
         
         server.getParser().sendLine("AWAY :" + line);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "away";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "away <reason> - marks you as away";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Back.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -36,12 +37,9 @@ public final class Back extends ServerCommand {
      * Creates a new instance of Back.
      */
     public Back() {
-        description = "Unsets your away status";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "back";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -49,12 +47,38 @@ public final class Back extends ServerCommand {
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         //final String line = implodeArgs(args);
         
         server.getParser().sendLine("AWAY");
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "back";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "back - unsets your away status";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Clear.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -36,12 +37,9 @@ public class Clear extends ServerCommand {
      * Creates a new instance of Clear.
      */
     public Clear() {
-        description = "Clear the buffer of the current window.";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "clear";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,8 +49,34 @@ public class Clear extends ServerCommand {
      * @param args The user supplied arguments
      */
     public final void execute(final CommandWindow origin, final Server server,
-            final String... args) {        
+            final String... args) {
         origin.clear();
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "clear";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "clear - clears the current window's text area";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/ConfigInfo.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.identities.ConfigSource;
@@ -37,12 +38,9 @@ public class ConfigInfo extends ServerCommand {
      * Creates a new instance of ConfigInfo.
      */
     public ConfigInfo() {
-        description = "Displays information about the origin's config manager.";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "configinfo";
-        show = false;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -52,10 +50,36 @@ public class ConfigInfo extends ServerCommand {
      * @param args The user supplied arguments
      */
     public final void execute(final CommandWindow origin, final Server server,
-            final String... args) {        
+            final String... args) {
         for (ConfigSource source : origin.getConfigManager().getSources()) {
             origin.addLine(source.getTarget() + " - " + source);
         }
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "configinfo";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return null;
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Ctcp.java

@@ -24,6 +24,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -37,12 +38,9 @@ public final class Ctcp extends ServerCommand {
      * Creates a new instance of Ctcp.
      */
     public Ctcp() {
-        description = "Sends a CTCP message";
-        arguments = "<target> <type> [arguments]";
-        polyadic = true;
-        arity = 0;
-        name = "ctcp";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -64,4 +62,30 @@ public final class Ctcp extends ServerCommand {
         }
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "ctcp";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "ctcp <target> <type> [arguments] - sends a CTCP message";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Help.java

@@ -42,12 +42,9 @@ public final class Help extends ServerCommand {
      * Creates a new instance of Help.
      */
     public Help() {
-        description = "Displays usage information for all implemented commands";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "help";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -55,8 +52,8 @@ public final class Help extends ServerCommand {
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         origin.addLine("-- Server commands ----------------------------------");
         for (Command com : CommandManager.getServerCommands()) {
@@ -83,4 +80,30 @@ public final class Help extends ServerCommand {
         origin.addLine("-----------------------------------------------------");
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "help";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "help - shows all available client commands";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Join.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -37,23 +38,46 @@ public final class Join extends ServerCommand {
      * Creates a new instance of Join.
      */
     public Join() {
-        description = "Joins the specified channel. Multiple channels may be seperated by commas.";
-        arguments = "<channel(s)>";
-        polyadic = false;
-        arity = 1;
-        name = "join";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
-
+    
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         server.getParser().joinChannel(args[0]);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "join";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "join <channel> - joins the specified channel";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/LoadFormatter.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
@@ -37,12 +38,9 @@ public final class LoadFormatter extends ServerCommand {
      * Creates a new instance of LoadFormatter.
      */
     public LoadFormatter() {
-        description = "Loads a message formatter from a file";
-        arguments = "<file name>";
-        polyadic = false;
-        arity = 1;
-        name = "loadformatter";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,7 +49,7 @@ public final class LoadFormatter extends ServerCommand {
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         if (Formatter.loadFile(args[0])) {
             origin.addLine("Formatter loaded.");
@@ -60,4 +58,30 @@ public final class LoadFormatter extends ServerCommand {
         }
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "loadformatter";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "loadformatter <file> - loads the specified file into the message formatter";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Motd.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -36,12 +37,9 @@ public final class Motd extends ServerCommand {
      * Creates a new instance of Motd.
      */
     public Motd() {
-        description = "Retrieves the server's MOTD";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "motd";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -49,12 +47,38 @@ public final class Motd extends ServerCommand {
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         //final String line = implodeArgs(args);
         
         server.getParser().sendLine("MOTD");
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "motd";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "motd - retrieves the server's message of the day";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Nick.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -36,23 +37,46 @@ public final class Nick extends ServerCommand {
      * Creates a new instance of Nick.
      */
     public Nick() {
-        description = "Changes your nickname";
-        arguments = "<new nickname>";
-        polyadic = false;
-        arity = 1;
-        name = "nick";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
-
+    
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         server.getParser().setNickname(args[0]);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "nick";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "nick <new nickname> - attempts to change your nickname to the one specified";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Quit.java

@@ -25,6 +25,7 @@ package uk.org.ownage.dmdirc.commandparser.commands.server;
 import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.ServerManager;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -40,12 +41,9 @@ public final class Quit extends ServerCommand {
      * Creates a new instance of Quit.
      */
     public Quit() {
-        description = "Quits DMDirc, sending the specified quit message to all servers";
-        arguments = "<quit message>";
-        polyadic = true;
-        arity = 0;
-        name = "quit";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -53,12 +51,38 @@ public final class Quit extends ServerCommand {
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         ServerManager.getServerManager().disconnectAll(implodeArgs(args));
         Config.save();
         System.exit(0);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "quit";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "quit <reason> - quits the server with the specified reason";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/QuitDefault.java

@@ -39,12 +39,9 @@ public final class QuitDefault extends ServerCommand {
      * Creates a new instance of QuitDefault.
      */
     public QuitDefault() {
-        description = "Quits DMDirc, sending a default quit message to all servers";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "quit";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -53,10 +50,36 @@ public final class QuitDefault extends ServerCommand {
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         final String def = origin.getConfigManager().getOption("general", "quitmessage");
         CommandManager.getServerCommand("quit").execute(origin, server, def);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "quit";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "quit - quits the server with the default quit message";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Raw.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -37,12 +38,9 @@ public final class Raw extends ServerCommand {
      * Creates a new instance of Raw.
      */
     public Raw() {
-        description = "Sends a line of text directly to the IRC server";
-        arguments = "<raw command>";
-        polyadic = true;
-        arity = 0;
-        name = "raw";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -50,8 +48,8 @@ public final class Raw extends ServerCommand {
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         final String line = implodeArgs(args);
         
@@ -59,4 +57,30 @@ public final class Raw extends ServerCommand {
         origin.addLine("rawCommand", line);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "raw";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "raw <text> - sends the specified text directly to the server";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/ReloadFormatter.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
@@ -37,24 +38,47 @@ public final class ReloadFormatter extends ServerCommand {
      * Creates a new instance of ReloadFormatter.
      */
     public ReloadFormatter() {
-        description = "Reloads the message formatter";
-        arguments = "";
-        polyadic = false;
-        arity = 0;
-        name = "reloadformatter";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
-
+    
     /**
      * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
-     */    
-    public void execute(final CommandWindow origin, final Server server, 
+     */
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         Formatter.reload();
         origin.addLine("Formatter reloaded.");
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "reloadformatter";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 0;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "reloadformatter - reloads the message formatter";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/SaveFormatter.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
@@ -37,12 +38,9 @@ public final class SaveFormatter extends ServerCommand {
      * Creates a new instance of SaveFormatter.
      */
     public SaveFormatter() {
-        description = "Saves the message formatter to a file";
-        arguments = "<file name>";
-        polyadic = false;
-        arity = 1;
-        name = "saveformatter";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -51,7 +49,7 @@ public final class SaveFormatter extends ServerCommand {
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server, 
+    public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         if (Formatter.saveAs(args[0])) {
             origin.addLine("Formatter saved.");
@@ -60,4 +58,30 @@ public final class SaveFormatter extends ServerCommand {
         }
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "saveformatter";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "saveformatter <file> - saves the message formatter to a file";
+    }
+    
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Whois.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Server;
+import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -36,12 +37,9 @@ public final class Whois extends ServerCommand {
      * Creates a new instance of Whois.
      */
     public Whois() {
-        description = "Requests information on another user";
-        arguments = "<user>";
-        polyadic = false;
-        arity = 1;
-        name = "whois";
-        show = true;
+        super();
+        
+        CommandManager.registerCommand(this);
     }
     
     /**
@@ -55,4 +53,30 @@ public final class Whois extends ServerCommand {
         server.getParser().sendLine("WHOIS :" + args[0]);
     }
     
+    
+    /** {@inheritDoc}. */
+    public String getName() {
+        return "whois";
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean showInHelp() {
+        return true;
+    }
+    
+    /** {@inheritDoc}. */
+    public boolean isPolyadic() {
+        return false;
+    }
+    
+    /** {@inheritDoc}. */
+    public int getArity() {
+        return 1;
+    }
+    
+    /** {@inheritDoc}. */
+    public String getHelp() {
+        return "whois <user> - requests information about another user";
+    }
+    
 }

src/uk/org/ownage/dmdirc/identities/defaults/defaultprofile

@@ -1,6 +1,6 @@
 # Default profile
 
-identity.name = Default profile
+identity.name = DMDirc profile
 
 profile.nickname = DMDircUser
 profile.realname = DMDirc user