Commands no longer register themselves in their ctors

Fixes CLIENT-61

Change-Id: I35c09e83804216c75f10290815cdeacd35bc57fd
Reviewed-on: http://gerrit.dmdirc.com/1531
Automatic-Compile: Greg Holmes <greg@dmdirc.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/commandparser/CommandManager.java

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

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

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -46,8 +45,6 @@ public final class Ban extends Command implements IntelligentCommand, CommandInf
     /** Creates a new instance of Ban. */
     public Ban() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -45,8 +44,6 @@ public final class ChannelSettings extends Command implements
     /** Creates a new instance of ChannelSettings. */
     public ChannelSettings() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -44,8 +43,6 @@ public final class Cycle extends Command implements CommandInfo {
     /** Creates a new instance of Cycle. */
     public Cycle() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -48,8 +47,6 @@ public final class Invite extends Command implements ExternalCommand, CommandInf
     /** Creates a new instance of Invite. */
     public Invite() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -49,8 +48,6 @@ public final class KickReason extends Command implements IntelligentCommand,
     /** Creates a new instance of KickReason. */
     public KickReason() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -50,8 +49,6 @@ public final class Mode extends Command implements IntelligentCommand,
     /** Creates a new instance of Mode. */
     public Mode() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -51,8 +50,6 @@ public class Names extends Command implements IntelligentCommand,
      */
     public Names() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -43,8 +42,6 @@ public final class Part extends Command implements CommandInfo {
     /** Creates a new instance of Part. */
     public Part() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -51,8 +50,6 @@ public final class SetNickColour extends Command implements IntelligentCommand,
     /** Creates a new instance of SetNickColour. */
     public SetNickColour() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -47,8 +46,6 @@ public final class ShowTopic extends Command implements ExternalCommand,
     /** Creates a new instance of ShowTopic. */
     public ShowTopic() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
@@ -44,8 +43,6 @@ public final class Me extends Command implements ValidatingCommand, CommandInfo
     /** Creates a new instance of Me. */
     public Me() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -47,8 +46,6 @@ public final class Active extends Command implements IntelligentCommand,
      */
     public Active() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -50,8 +50,6 @@ public final class AliasCommand extends Command implements
      */
     public AliasCommand() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -45,8 +44,6 @@ public final class AllServers extends Command implements IntelligentCommand,
     /** Creates a new instance of AllServers. */
     public AllServers() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -45,8 +44,6 @@ public final class Clear extends Command implements IntelligentCommand,
      */
     public Clear() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -65,7 +64,6 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
      */
     public Debug() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -52,8 +51,6 @@ public final class Echo extends Command implements IntelligentCommand,
      */
     public Echo() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -44,8 +43,6 @@ public final class Exit extends Command implements CommandInfo {
      */
     public Exit() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -53,8 +53,6 @@ public final class Help extends Command implements IntelligentCommand, CommandIn
      */
     public Help() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -51,8 +50,6 @@ public final class Ifplugin extends Command implements IntelligentCommand,
      */
     public Ifplugin() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -47,8 +46,6 @@ public class Input extends Command implements IntelligentCommand, CommandInfo {
      */
     public Input() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -46,8 +45,6 @@ public final class LoadPlugin extends Command implements IntelligentCommand,
      */
     public LoadPlugin() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -56,8 +55,6 @@ public final class NewServer extends Command implements IntelligentCommand,
      */
     public NewServer() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -49,8 +48,6 @@ public final class Notify extends Command implements IntelligentCommand,
      */
     public Notify() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -45,7 +44,7 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
      * Creates a new instance of OpenWindow.
      */
     public OpenWindow() {
-        CommandManager.registerCommand(this);
+        super();
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -46,8 +45,6 @@ public final class ReloadActions extends Command implements IntelligentCommand,
      */
     public ReloadActions() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -45,7 +44,7 @@ public class ReloadIdentities extends Command implements IntelligentCommand,
      * Creates a new instance of ReloadIdentities.
      */
     public ReloadIdentities() {
-        CommandManager.registerCommand(this);
+        super();
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -47,8 +46,6 @@ public final class ReloadPlugin extends Command implements IntelligentCommand,
      */
     public ReloadPlugin() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -46,8 +45,6 @@ public final class SaveConfig extends Command implements IntelligentCommand,
      */
     public SaveConfig() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -49,8 +49,6 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      */
     public Set() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -47,8 +46,6 @@ public final class UnloadPlugin extends Command implements IntelligentCommand,
      */
     public UnloadPlugin() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -46,8 +45,6 @@ public final class AllChannels extends Command implements IntelligentCommand,
     /** Creates a new instance of AllChannels. */
     public AllChannels() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -45,8 +44,6 @@ public final class Away extends Command implements CommandInfo {
      */
     public Away() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -47,8 +46,6 @@ public final class Back extends Command implements IntelligentCommand, CommandIn
      */
     public Back() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -48,8 +47,6 @@ public final class ChangeServer extends Command implements CommandInfo {
      */
     public ChangeServer() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -49,8 +48,6 @@ public final class Ctcp extends Command implements IntelligentCommand,
      */
     public Ctcp() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -43,8 +42,6 @@ public final class Disconnect extends Command implements CommandInfo {
      */
     public Disconnect() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -52,8 +51,6 @@ public final class Ignore extends Command implements IntelligentCommand,
      */
     public Ignore() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -29,7 +29,6 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -63,7 +62,6 @@ public class JoinChannelCommand extends Command implements
     public JoinChannelCommand() {
         super();
 
-        CommandManager.registerCommand(this);
         ActionManager.addListener(this, CoreActionType.CLIENT_LINE_ADDED);
     }
 

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -52,8 +51,6 @@ public final class Message extends Command implements IntelligentCommand,
      */
     public Message() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -49,8 +48,6 @@ public final class Nick extends Command implements IntelligentCommand,
      */
     public Nick() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -49,8 +48,6 @@ public final class Notice extends Command implements IntelligentCommand,
      */
     public Notice() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -50,8 +50,6 @@ public final class OpenQuery extends Command implements IntelligentCommand,
      */
     public OpenQuery() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -46,8 +45,6 @@ public final class Raw extends Command implements CommandInfo {
      */
     public Raw() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -54,8 +53,6 @@ public final class RawServerCommand extends Command implements CommandInfo {
         super();
 
         myName = command;
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -43,8 +42,6 @@ public final class Reconnect extends Command implements CommandInfo {
      */
     public Reconnect() {
         super();
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -26,7 +26,6 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -37,17 +36,17 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Opens the server settings window for the server.
+ *
  * @author Simon
  * @since 0.6.4
  */
 @CommandOptions(allowOffline=false)
-public class ServerSettings extends Command implements
-        IntelligentCommand, CommandInfo {
+public class ServerSettings extends Command implements IntelligentCommand,
+        CommandInfo {
 
     /** Creates a new instance of ServerSettings. */
     public ServerSettings() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
@@ -47,8 +46,6 @@ public class Umode extends Command implements CommandInfo {
      */
     public Umode() {
         super();
-        
-        CommandManager.registerCommand(this);
     }    
 
     /** {@inheritDoc} */