Commands no longer have arities

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

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

@@ -80,20 +80,6 @@ public final class AudioCommand extends GlobalCommand {
 	 */
 	public boolean showInHelp() { return true; }
 	
-	/**
-	 * Indicates whether this command is polyadic or not.
-	 *
-	 * @return True iff this command is polyadic, false otherwise
-	 */
-	public boolean isPolyadic() { return true; }
-	
-	/**
-	 * Returns the arity of this command.
-	 *
-	 * @return This command's arity
-	 */
-	public int getArity() { return 0; }
-	
 	/**
 	 * Returns a string representing the help message for this command.
 	 *

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

@@ -53,6 +53,11 @@ public final class DcopCommand extends ServerCommand {
      */
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
+        if (args.length != 3) {
+            showUsage(origin, isSilent, "dcop", "<app> <object> <function>");
+            return;
+        }
+        
         final List<String> res = DcopPlugin.getDcopResult("dcop " + implodeArgs(args));
         for (String line : res) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, line);
@@ -70,16 +75,6 @@ public final class DcopCommand extends ServerCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 3;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "dcop <app> <object> <function> - retrieves information from a DCOP aplication";

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

@@ -44,6 +44,11 @@ public final class DNSCommand extends GlobalCommand {
     /** {@inheritDoc} */
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "dns", "<IP|hostname>");
+            return;
+        }
+        
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Resolving: " + args[0]);
         new Timer("DNS Command Timer").schedule(new TimerTask() {
             public void run() {
@@ -66,16 +71,6 @@ public final class DNSCommand extends GlobalCommand {
         return true;
     }
     
-    /** {@inheritDoc} */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc} */
-    public int getArity() {
-        return 1;
-    }
-    
     /** {@inheritDoc} */
     public String getHelp() {
         return "dns <IP|hostname> - Performs DNS lookup of the specified ip/hostname/nickname";

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

@@ -132,20 +132,6 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 	 */
 	public boolean showInHelp() { return true; }
 	
-	/**
-	 * Indicates whether this command is polyadic or not.
-	 *
-	 * @return True iff this command is polyadic, false otherwise
-	 */
-	public boolean isPolyadic() { return true; }
-	
-	/**
-	 * Returns the arity of this command.
-	 *
-	 * @return This command's arity
-	 */
-	public int getArity() { return 0; }
-	
 	/**
 	 * Returns a string representing the help message for this command.
 	 *

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

@@ -148,16 +148,6 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "nowplaying [--sources|--source <source>] - tells the channel the song you're currently playing";

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

@@ -42,32 +42,26 @@ public final class OsdCommand extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         new OsdWindow(implodeArgs(args), false);
     }
     
     /** {@inheritDoc}. */
+    @Override
     public String getName() {
         return "osd";
     }
     
     /** {@inheritDoc}. */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
     /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    @Override
     public String getHelp() {
         return "osd <message> - show the specified message in an OSD window";
     }

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

@@ -55,16 +55,6 @@ public class RedirectCommand extends ChatCommand {
         return true;
     }
     
-    /** {@inheritDoc} */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc} */
     public String getHelp() {
         return "redirect <command> - sends the output of the command to a channel or query window";

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

@@ -50,32 +50,26 @@ public final class PopupCommand extends ServerCommand {
     }
 
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String ... args) {
         parent.notify("DMDirc", implodeArgs(args));
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "popup";
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
 
     /** {@inheritDoc} */
-    public boolean isPolyadic() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    public int getArity() {
-        return 0;
-    }
-
-    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "popup <message> - shows the message as a system tray popup";
     }

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

@@ -82,16 +82,6 @@ public final class TimerCommand extends GlobalCommand {
         return true;
     }
     
-    /** {@inheritDoc} */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc} */
     public String getHelp() {
         return "timer <repetitions> <interval> <command> - schedules a command to be executed after a certain time";

src/com/dmdirc/commandparser/CommandInfo.java

@@ -27,21 +27,7 @@ package com.dmdirc.commandparser;
  * @author chris
  */
 public abstract class CommandInfo {
-    
-    /**
-     * Returns the signature of this command. For polyadic commands, the signature
-     * is simply the name. For other commands, the signature is a concatenation of
-     * the name, a literal "/", and the arity.
-     * @return The signature of this command
-     */
-    public final String getSignature() {
-        if (isPolyadic()) {
-            return getName();
-        } else {
-            return getName() + "/" + getArity();
-        }
-    }
-        
+          
     /**
      * Returns this command's name.
      * @return The name of this command
@@ -54,18 +40,6 @@ public abstract class CommandInfo {
      */
     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

src/com/dmdirc/commandparser/CommandManager.java

@@ -253,7 +253,6 @@ public final class CommandManager {
     public static void initCommands() {
         // Chat commands
         new Me();
-        new MeEmpty();
         
         // Channel commands
         new Ban();
@@ -331,11 +330,11 @@ public final class CommandManager {
      * @param parser The parser to load commands into
      */
     public static void loadChannelCommands(final CommandParser parser) {
-        for (Command com : getCommands(CommandType.TYPE_CHANNEL, null, null)) {
+        for (Command com : getCommands(CommandType.TYPE_CHANNEL, null)) {
             parser.registerCommand(com);
         }
         
-        for (Command com : getCommands(CommandType.TYPE_CHAT, null, null)) {
+        for (Command com : getCommands(CommandType.TYPE_CHAT, null)) {
             parser.registerCommand(com);
         }
         
@@ -348,7 +347,7 @@ public final class CommandManager {
      * @param parser The parser to load commands into
      */
     public static void loadServerCommands(final CommandParser parser) {
-        for (Command command : getCommands(CommandType.TYPE_SERVER, null, null)) {
+        for (Command command : getCommands(CommandType.TYPE_SERVER, null)) {
             parser.registerCommand(command);
         }
         
@@ -361,7 +360,7 @@ public final class CommandManager {
      * @param parser The parser to load commands into
      */
     public static void loadGlobalCommands(final CommandParser parser) {
-        for (Command com : getCommands(CommandType.TYPE_GLOBAL, null, null)) {
+        for (Command com : getCommands(CommandType.TYPE_GLOBAL, null)) {
             parser.registerCommand(com);
         }
         
@@ -374,11 +373,11 @@ public final class CommandManager {
      * @param parser The parser to load commands into
      */
     public static void loadQueryCommands(final CommandParser parser) {
-        for (Command com : getCommands(CommandType.TYPE_QUERY, null, null)) {
+        for (Command com : getCommands(CommandType.TYPE_QUERY, null)) {
             parser.registerCommand(com);
         }
         
-        for (Command com : getCommands(CommandType.TYPE_CHAT, null, null)) {
+        for (Command com : getCommands(CommandType.TYPE_CHAT, null)) {
             parser.registerCommand(com);
         }
         
@@ -393,12 +392,11 @@ public final class CommandManager {
      * @return A command with a matching signature, or null if none were found
      */
     public static Command getCommand(final String name) {
-        return getCommand(null, name, null);
+        return getCommand(null, name);
     }
     
-    public static Command getCommand(final CommandType type, final String name,
-            final String signature) {
-        final List<Command> res = getCommands(type, name, signature);
+    public static Command getCommand(final CommandType type, final String name) {
+        final List<Command> res = getCommands(type, name);
         
         return res.isEmpty() ? null : res.get(0);
     }    
@@ -410,14 +408,14 @@ public final class CommandManager {
      * @return True iff the command is a channel command, false otherwise
      */
     public static boolean isChannelCommand(final String command) {
-        return getCommand(CommandType.TYPE_CHANNEL, command, null) != null
-                || getCommand(CommandType.TYPE_CHAT, command, null) != null;
+        return getCommand(CommandType.TYPE_CHANNEL, command) != null
+                || getCommand(CommandType.TYPE_CHAT, command) != null;
     }
        
     public static List<String> getCommandNames(final CommandType type) {
         final List<String> res = new ArrayList<String>();
         
-        for (Command command : getCommands(type, null, null)) {
+        for (Command command : getCommands(type)) {
             res.add(getCommandChar() + command.getName());
         }
         
@@ -425,17 +423,16 @@ public final class CommandManager {
     }
     
     public static List<Command> getCommands(final CommandType type) {    
-        return getCommands(type, null, null);
+        return getCommands(type, null);
     }
     
     private static List<Command> getCommands(final CommandType type,
-            final String name, final String signature) {
+            final String name) {
         final List<Command> res = new ArrayList<Command>();
         
         for (Map.Entry<CommandInfo, Command> entry : commands.entrySet()) {
             if ((type == null || type.equals(entry.getKey().getType()))
-                    && (name == null || name.equals(entry.getKey().getName()))
-                    && (signature == null || signature.equals(entry.getKey().getSignature()))) {
+                    && (name == null || name.equals(entry.getKey().getName()))) {
                 res.add(entry.getValue());
             }
         }

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

@@ -97,7 +97,7 @@ public abstract class Command extends CommandInfo implements Comparable<Command>
     /** {@inheritDoc} */
     @Override
     public final int compareTo(final Command o) {
-        return getSignature().compareTo(o.getSignature());
+        return getName().compareTo(o.getName());
     }
 
     /** {@inheritDoc} */

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

@@ -53,6 +53,10 @@ public final class Ban extends ChannelCommand {
      */
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "ban", "<user|host>");
+            return;
+        }
         
         String host = args[0];
         final ChannelClientInfo user = channel.getChannelInfo().getUser(args[0]);
@@ -74,16 +78,6 @@ public final class Ban extends ChannelCommand {
         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/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -65,16 +65,6 @@ public final class ChannelSettings extends ChannelCommand {
         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/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -65,16 +65,6 @@ public final class Cycle extends ChannelCommand {
         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/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -43,14 +43,8 @@ public final class KickReason extends ChannelCommand {
         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 channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         if (args.length == 0) {
@@ -67,27 +61,20 @@ public final class KickReason extends ChannelCommand {
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "kick";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "kick <user> [reason] - kicks the specified user from the channel";
     }

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

@@ -42,14 +42,8 @@ public final class Mode extends ChannelCommand {
         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 channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
@@ -61,27 +55,20 @@ public final class Mode extends ChannelCommand {
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "mode";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "mode [changes] - displays or changes the current channel modes";
     }

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

@@ -41,14 +41,8 @@ public final class Part extends ChannelCommand {
         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 channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         channel.part(args.length > 0 ? implodeArgs(args)
@@ -56,28 +50,21 @@ public final class Part extends ChannelCommand {
         channel.closeWindow();
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "part";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
-        return "part <reason> - parts the channel with the specified reason";
+        return "part [reason] - parts the channel";
     }
 }

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

@@ -118,16 +118,6 @@ public final class SetNickColour extends ChannelCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "setnickcolour [--nicklist|--text] <nick> [colour] - set the specified person's display colour";

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

@@ -69,18 +69,6 @@ public final class SetTopic extends ChannelCommand {
         return true;
     }
     
-    /** {@inheritDoc} */
-    @Override
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -42,14 +42,8 @@ public final class ShowTopic extends ChannelCommand {
         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 channel The channel object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
@@ -62,29 +56,22 @@ public final class ShowTopic extends ChannelCommand {
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "topic";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
-        return "topic - displays the current topic";
+        return "topic - displays the current topic\ntopic <newtopic> - sets the channel topic";
     }
     
 }

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

@@ -42,32 +42,30 @@ public final class Me extends ChatCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final MessageTarget target, final boolean isSilent, final String... args) {
-        target.sendAction(implodeArgs(args));
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "me", "<action>");
+        } else {
+            target.sendAction(implodeArgs(args));
+        }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "me";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "me <action> - sends the specified action";
     }

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

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.commandparser.commands.chat;
-
-import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.commands.ChatCommand;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-/**
- * The me/0 command simply tells the user that the correct usage of /me requires
- * they pass an action to perform.
- * @author chris
- */
-public final class MeEmpty extends ChatCommand {
-    
-    /** Creates a new instance of MeEmpty. */
-    public MeEmpty() {
-        super();
-        
-        CommandManager.registerCommand(this);
-    }
-    
-    /** {@inheritDoc} */
-    public void execute(final InputWindow origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final String... args) {
-        showUsage(origin, isSilent, "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/com/dmdirc/commandparser/commands/global/Active.java

@@ -65,16 +65,6 @@ public final class Active extends GlobalCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "active <command> - executes the command as though it had been typed in the active window";

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

@@ -42,6 +42,7 @@ public final class AllServers extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         final String command = implodeArgs(args);
@@ -54,27 +55,20 @@ public final class AllServers extends GlobalCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "allservers";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "allservers <command> - executes the command as though it had been entered on all servers";
     }

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

@@ -28,6 +28,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The clear command clears the main text area of the current window.
+ * 
  * @author chris
  */
 public final class Clear extends GlobalCommand {
@@ -41,39 +42,28 @@ public final class Clear extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent, 
             final String... args) {
         origin.clear();
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "clear";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "clear - clears the current window's text area";
     }

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

@@ -300,18 +300,6 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
         return false;
     }
     
-    /** {@inheritDoc} */
-    @Override
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -45,16 +45,8 @@ public final class Echo extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
 
-    /**
-     * Executes this command.
-     * 
-     * @param origin
-     *            The frame in which this command was issued
-     * @param isSilent
-     *            Whether this command is silenced or not
-     * @param args
-     *            The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (args.length > 0 && args[0].equalsIgnoreCase("--active")) {
@@ -88,27 +80,20 @@ public final class Echo extends GlobalCommand {
         }
     }
 
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "echo";
     }
 
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
 
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "echo [--active|--target <window>] <line> "
                 + "- echos the specified line to the window";

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

@@ -45,6 +45,7 @@ public final class Exit extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {                
         Main.quit(args.length > 0 ? implodeArgs(args)
@@ -53,26 +54,19 @@ public final class Exit extends GlobalCommand {
     
     
     /** {@inheritDoc}. */
+    @Override
     public String getName() {
         return "exit";
     }
     
     /** {@inheritDoc}. */
+    @Override
     public boolean showInHelp() {
         return true;
     }
-    
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
+        
     /** {@inheritDoc}. */
+    @Override
     public String getHelp() {
         return "exit [reason] - exits the client";
     }

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

@@ -110,16 +110,6 @@ public final class Help extends ServerCommand {
         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/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -26,7 +26,6 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -52,6 +51,7 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (args.length <= 1) {
@@ -73,46 +73,43 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
         
         if (result != negative) {
             if (origin == null) {
-                GlobalCommandParser.getGlobalCommandParser().parseCommand(null, implodeArgs(1, args));
+                GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
+                        implodeArgs(1, args));
             } else {
                 origin.getCommandParser().parseCommand(origin, implodeArgs(1, args));
             }
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "ifplugin";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
-        return "ifplugin <[!]plugin> <command> - executes a command if the specified plugin is/isn't loaded";
+        return "ifplugin <[!]plugin> <command> - executes a command if the " +
+                "specified plugin is/isn't loaded";
     }
 
     /** {@inheritDoc} */
+    @Override
     public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {
             res.setIncludeNormal(false);
 
-            for (PluginInfo possPlugin : PluginManager.getPluginManager().getPossiblePluginInfos()) {
+            for (PluginInfo possPlugin
+                    : PluginManager.getPluginManager().getPossiblePluginInfos()) {
                 res.add(possPlugin.getName());
                 res.add("!" + possPlugin.getName());
             }            

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

@@ -51,6 +51,11 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
     /** {@inheritDoc} */
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "loadplugin", "<plugin>");
+            return;
+        }
+        
         if (PluginManager.getPluginManager().addPlugin(args[0])) {
             PluginManager.getPluginManager().getPluginInfo(args[0]).loadPlugin();
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
@@ -70,19 +75,9 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
         return true;
     }
     
-    /** {@inheritDoc} */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc} */
-    public int getArity() {
-        return 1;
-    }
-    
     /** {@inheritDoc} */
     public String getHelp() {
-        return "loadplugin <class> - loads the specified class as a plugin";
+        return "loadplugin <plugin> - loads the specified class as a plugin";
     }
     
     /** {@inheritDoc} */

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

@@ -97,16 +97,6 @@ public final class NewServer extends GlobalCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "newserver [--ssl] <host[:port]> [password] - connect to a new server";

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

@@ -46,15 +46,15 @@ public final class Notify extends GlobalCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * 
-     * @param origin The frame in which this command was issued
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "notify", "<colour>");
+            return;
+        }
+        
         final Color colour = ColourManager.parseColour(args[0], null);
         
         if (colour == null) {
@@ -67,27 +67,20 @@ public final class Notify extends GlobalCommand {
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "notify";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return false;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 1;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "notify <colour> - sets the notification colour for this window";
     }

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

@@ -91,12 +91,6 @@ public class OpenWindow extends GlobalCommand {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public int getArity() {
-        return 0;
-    }
-
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -110,12 +104,6 @@ public class OpenWindow extends GlobalCommand {
         return "openwindow";
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public boolean isPolyadic() {
-        return true;
-    }
-
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {

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

@@ -60,16 +60,6 @@ public final class ReloadActions extends GlobalCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "reloadactions - reloads actions from disk";

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

@@ -61,18 +61,6 @@ public class ReloadIdentities extends GlobalCommand {
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public boolean isPolyadic() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public int getArity() {
-        return 0;
-    }
-
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -25,15 +25,16 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.util.List;
 
 /**
  * Allows the user to reload a plugin.
+ * 
  * @author chris
  */
 public final class ReloadPlugin extends GlobalCommand implements IntelligentCommand {
@@ -48,8 +49,14 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "reloadplugin", "<plugin>");
+            return;
+        }
+        
         PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName(args[0]);
         if (plugin == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Reloading failed - Plugin not loaded");
@@ -63,32 +70,26 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
         }
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "reloadplugin";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 1;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
-        return "Reloadplugin <class> - Reloads the specified plugin";
+        return "Reloadplugin <plugin> - Reloads the specified plugin";
     }
 
     /** {@inheritDoc} */
+    @Override
     public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         

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

@@ -62,16 +62,6 @@ public final class SaveConfig extends GlobalCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "saveconfig - force the client to save its configuration to disk";

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

@@ -203,18 +203,6 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
         return true;
     }
     
-    /** {@inheritDoc} */
-    @Override
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc} */
     @Override
     public String getHelp() {

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

@@ -41,13 +41,8 @@ public final class AllChannels extends ServerCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         final String command = implodeArgs(args);
@@ -60,29 +55,23 @@ public final class AllChannels extends ServerCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "allchannels";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
-        return "allchannels <command> - executes the command as though it had been entered on all channels";
+        return "allchannels <command> - executes the command as though it had" +
+                "been entered on all channels";
     }
     
 }

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

@@ -42,13 +42,8 @@ public final class Away extends ServerCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         final String line = implodeArgs(args);
@@ -57,27 +52,20 @@ public final class Away extends ServerCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "away";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "away <reason> - marks you as away";
     }

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

@@ -67,16 +67,6 @@ public final class Back extends ServerCommand {
         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/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -43,6 +43,7 @@ public final class ChangeServer extends ServerCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length == 0) {
@@ -84,28 +85,20 @@ public final class ChangeServer extends ServerCommand {
         server.connect(host, port, pass, ssl, server.getProfile());
     }
     
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "server";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "server [--ssl] <host[:port]> [password] - connect to a different server";
     }

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

@@ -75,16 +75,6 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
         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/com/dmdirc/commandparser/commands/server/Disconnect.java

@@ -73,16 +73,6 @@ public final class Disconnect extends ServerCommand {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
     /** {@inheritDoc}. */
     public String getHelp() {
         return "disconnect [reason] - disconnect from this server";

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

@@ -52,6 +52,7 @@ public final class Ignore extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         
@@ -133,27 +134,20 @@ public final class Ignore extends ServerCommand {
         
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "ignore";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "ignore <add|remove|view> [host] - manages the network's ignore list";
     }

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

@@ -42,13 +42,8 @@ public final class Message extends ServerCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length < 2) {
@@ -61,27 +56,20 @@ public final class Message extends ServerCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "msg";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "msg <target> <message> - sends a private message";
     }

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

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.commandparser.commands.server;
-
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-/**
- * The MOTD command allows the user to retrieve the MOTD for the server.
- * @author chris
- */
-public final class Motd extends ServerCommand {
-    
-    /**
-     * Creates a new instance of Motd.
-     */
-    public Motd() {
-        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 isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
-    public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, 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/com/dmdirc/commandparser/commands/server/Nick.java

@@ -51,6 +51,11 @@ public final class Nick extends ServerCommand {
      */
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
+        if (args.length == 0) {
+            showUsage(origin, isSilent, "nick", "<new nickname>");
+            return;
+        }
+        
         server.getParser().setNickname(args[0]);
     }
     
@@ -65,16 +70,6 @@ public final class Nick extends ServerCommand {
         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/com/dmdirc/commandparser/commands/server/Notice.java

@@ -42,13 +42,8 @@ public final class Notice extends ServerCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length < 2) {
@@ -61,27 +56,20 @@ public final class Notice extends ServerCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "notice";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "notice <target> <message> - sends a notice";
     }

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

@@ -44,6 +44,7 @@ public final class Query extends ServerCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length == 0) {
@@ -63,27 +64,20 @@ public final class Query extends ServerCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "query";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "query <user> [message] - opens a query with the specified user";
     }

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

@@ -69,16 +69,6 @@ public final class Raw extends ServerCommand {
         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/com/dmdirc/commandparser/commands/server/RawServerCommand.java

@@ -51,33 +51,27 @@ public final class RawServerCommand extends ServerCommand {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         server.getParser().sendLine(myName.toUpperCase() + " " + implodeArgs(args));
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return myName;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return myName + " [arguments] - sends a " + myName + " command to the server";
     }

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

@@ -42,13 +42,8 @@ public final class Reconnect extends ServerCommand {
         CommandManager.registerCommand(this);
     }
     
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         String line;
@@ -63,27 +58,20 @@ public final class Reconnect extends ServerCommand {
     }
     
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getName() {
         return "reconnect";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    @Override
     public String getHelp() {
         return "reconnect [reason] - reconnect to this server";
     }

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

@@ -78,7 +78,7 @@ public abstract class CommandParser implements Serializable {
      * @param command Command to be registered
      */
     public final void registerCommand(final Command command) {
-        commands.put(command.getSignature().toLowerCase(), command);
+        commands.put(command.getName().toLowerCase(), command);
     }
     
     /**
@@ -87,7 +87,7 @@ public abstract class CommandParser implements Serializable {
      * @param command Command to be unregistered
      */
     public final void unregisterCommand(final Command command) {
-        commands.remove(command.getSignature().toLowerCase());
+        commands.remove(command.getName().toLowerCase());
     }
     
     /**
@@ -145,18 +145,12 @@ public abstract class CommandParser implements Serializable {
             
             System.arraycopy(args, 1, comargs, 0, args.length - 1);
             
-            final String signature = command + "/" + (comargs.length);
+            final String signature = command;
             
-            // Check the specific signature first, so that polyadic commands can
-            // have error handlers if there are too few arguments (e.g., msg/0 and
-            // msg/1 would return errors, so msg only gets called with 2+ args).
             if (commands.containsKey(signature.toLowerCase())) {
                 addHistory(command, comargs);
                 executeCommand(origin, silent, commands.get(signature.toLowerCase()), comargs);
-            } else if (commands.containsKey(command.toLowerCase())) {
-                addHistory(command, comargs);
-                executeCommand(origin, silent, commands.get(command.toLowerCase()), comargs);
-            } else {
+           } else {
                 handleInvalidCommand(origin, command, comargs);
             }
         } else {
@@ -256,7 +250,7 @@ public abstract class CommandParser implements Serializable {
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, buff,
                     origin.getContainer(), command, args);
             
-            origin.addLine(buff, command + "/" + args.length);
+            origin.addLine(buff, command);
         }
     }