Stop commands registering themselves in ctors

CLIENT-61

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

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.audio;
 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.context.CommandContext;
@@ -44,7 +43,6 @@ public final class AudioCommand extends Command implements CommandInfo {
      */
     public AudioCommand() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -52,6 +52,8 @@ public final class AudioPlugin extends Plugin {
     public void onLoad() {
         audioCommand = new AudioCommand();
         beepCommand = new BeepCommand();
+        CommandManager.registerCommand(audioCommand);
+        CommandManager.registerCommand(beepCommand);
     }
 
     /**

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.audio;
 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.context.CommandContext;
@@ -44,7 +43,6 @@ public final class BeepCommand extends Command implements CommandInfo {
      */
     public BeepCommand() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -33,7 +33,6 @@ import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.ui_swing.SwingController;
 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;
@@ -69,7 +68,6 @@ public final class DCCCommand extends Command implements IntelligentCommand,
     public DCCCommand(final DCCPlugin plugin) {
         super();
         myPlugin = plugin;
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -488,6 +488,8 @@ public final class DCCPlugin extends Plugin implements ActionListener {
         }
 
         command = new DCCCommand(this);
+        CommandManager.registerCommand(command);
+
         ActionManager.registerActionTypes(DCCActions.values());
         ActionManager.addListener(this, CoreActionType.SERVER_CTCP);
     }

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

@@ -23,14 +23,11 @@
 package com.dmdirc.addons.dcop;
 
 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;
-import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 import java.util.List;
 
@@ -45,8 +42,6 @@ public final class DcopCommand extends Command implements CommandInfo {
      */
     public DcopCommand() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -84,6 +84,7 @@ public final class DcopPlugin extends Plugin {
     @Override
     public void onLoad() {
         command = new DcopCommand();
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.dns;
 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.context.CommandContext;
@@ -41,8 +40,6 @@ public final class DNSCommand extends Command implements CommandInfo {
     /** Creates a new instance of DNSCommand. */
     public DNSCommand() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

@@ -48,6 +48,7 @@ public final class DNSPlugin extends Plugin {
     @Override
     public void onLoad() {
         command = new DNSCommand();
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.freedesktop_notifications;
 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.context.CommandContext;
@@ -48,7 +47,6 @@ public final class FDNotifyCommand extends Command implements CommandInfo {
     public FDNotifyCommand(final FreeDesktopNotificationsPlugin myPlugin) {
         super();
         this.myPlugin = myPlugin;
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -144,6 +144,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
         setCachedSettings();
 
         command = new FDNotifyCommand(this);
+        CommandManager.registerCommand(command);
 
         // Extract required Files
         final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("freedesktop_notifications");

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

@@ -23,15 +23,12 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -50,7 +47,6 @@ public final class LoggingCommand extends Command implements IntelligentCommand,
      */
     public LoggingCommand() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -146,6 +146,8 @@ public class LoggingPlugin extends Plugin implements ActionListener,
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
 
         command = new LoggingCommand();
+        CommandManager.registerCommand(command);
+
         ActionManager.addListener(this,
                 CoreActionType.CHANNEL_OPENED,
                 CoreActionType.CHANNEL_CLOSED,

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.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.IntelligentCommand;
@@ -59,8 +58,6 @@ public final class NowPlayingCommand extends Command implements
         super();
 
         this.parent = parent;
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

@@ -86,6 +86,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
         }
 
         command = new NowPlayingCommand(this);
+        CommandManager.registerCommand(command);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.osd;
 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;
@@ -56,8 +55,6 @@ public final class OsdCommand extends Command implements
 
         this.osdManager = osdManager;
         this.plugin = plugin;
-        
-        CommandManager.registerCommand(this);
     }
 
     /**

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -80,6 +80,7 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
     public void onLoad() {
         osdManager = new OsdManager(this);
         command = new OsdCommand(this, osdManager);
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -60,6 +60,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
     public void onLoad() {
         ActionManager.addListener(this, CoreActionType.SERVER_DISCONNECTED);
         command = new ParserDebugCommand(this);
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.parserdebug;
 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;
@@ -52,7 +51,6 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
     public ParserDebugCommand(final DebugPlugin plugin) {
         super();
         myPlugin = plugin;
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/redirect/RedirectPlugin.java

@@ -44,11 +44,13 @@ public final class RedirectPlugin extends Plugin {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void onLoad() {
         CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc}. */
+    @Override
     public void onUnload() {
         CommandManager.unregisterCommand(command);
     }

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.scriptplugin;
 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;
@@ -59,7 +58,6 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
     public ScriptCommand(final ScriptPlugin plugin) {
         super();
         myPlugin = plugin;
-        CommandManager.registerCommand(this);
     }
         
     /** {@inheritDoc} */

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

@@ -88,6 +88,7 @@ public final class ScriptPlugin extends Plugin implements ActionListener {
         // after this method finishes for us to register the rest.
         ActionManager.addListener(this, CoreActionType.PLUGIN_LOADED);
         command = new ScriptCommand(this);
+        CommandManager.registerCommand(command);
 
         // Make sure our scripts dir exists
         final File newDir = new File(scriptDir);

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.systray;
 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.context.CommandContext;
@@ -48,8 +47,6 @@ public final class PopupCommand extends Command implements CommandInfo {
         super();
         
         this.parent = newParent;
-        
-        CommandManager.registerCommand(this);
     }
 
     /**
@@ -94,10 +91,5 @@ public final class PopupCommand extends Command implements CommandInfo {
     public String getHelp() {
         return "popup <message> - shows the message as a system tray popup";
     }
-    
-    /** Unregisters this command from the CommandManager. */
-    public void unregister() {
-        CommandManager.unregisterCommand(this);
-    }
-    
+
 }

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

@@ -27,6 +27,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -134,6 +135,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
         try {
             SystemTray.getSystemTray().add(icon);
             command = new PopupCommand(this);
+            CommandManager.registerCommand(command);
         } catch (AWTException ex) {
             // Should probably unload ourself here?
         }
@@ -145,7 +147,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
     @Override
     public void onUnload() {
         SystemTray.getSystemTray().remove(icon);
-        command.unregister();
+        CommandManager.unregisterCommand(command);
 
         ActionManager.removeListener(this);
     }

src/com/dmdirc/addons/time/TimePlugin.java

@@ -71,6 +71,7 @@ public final class TimePlugin  extends Plugin {
         }, 1000 * offset, 1000 * 60);
         
         command = new TimerCommand();
+        CommandManager.registerCommand(command);
     }
     
     /** Handles a timer event that occurs every minute. */

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.time;
 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 final class TimerCommand extends Command implements IntelligentCommand,
      * Creates a new instance of TimerCommand.
      */
     public TimerCommand() {
-        CommandManager.registerCommand(this);
+        super();
     }
     
     /** {@inheritDoc} */