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

 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;
      */
     public AudioCommand() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

     public void onLoad() {
         audioCommand = new AudioCommand();
         beepCommand = new BeepCommand();
+        CommandManager.registerCommand(audioCommand);
+        CommandManager.registerCommand(beepCommand);
     }
 
     /**

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

 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;
      */
     public BeepCommand() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

 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;
     public DCCCommand(final DCCPlugin plugin) {
         super();
         myPlugin = plugin;
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

         }
 
         command = new DCCCommand(this);
+        CommandManager.registerCommand(command);
+
         ActionManager.registerActionTypes(DCCActions.values());
         ActionManager.addListener(this, CoreActionType.SERVER_CTCP);
     }

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

 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;
 
      */
     public DcopCommand() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

     @Override
     public void onLoad() {
         command = new DcopCommand();
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

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

 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;
     /** Creates a new instance of DNSCommand. */
     public DNSCommand() {
         super();
-        
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

     @Override
     public void onLoad() {
         command = new DNSCommand();
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

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

 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;
     public FDNotifyCommand(final FreeDesktopNotificationsPlugin myPlugin) {
         super();
         this.myPlugin = myPlugin;
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

         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

 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;
      */
     public LoggingCommand() {
         super();
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

         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

 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;
         super();
 
         this.parent = parent;
-
-        CommandManager.registerCommand(this);
     }
 
     /** {@inheritDoc} */

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

         }
 
         command = new NowPlayingCommand(this);
+        CommandManager.registerCommand(command);
     }
 
     /** {@inheritDoc} */

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

 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;
 
         this.osdManager = osdManager;
         this.plugin = plugin;
-        
-        CommandManager.registerCommand(this);
     }
 
     /**

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

     public void onLoad() {
         osdManager = new OsdManager(this);
         command = new OsdCommand(this, osdManager);
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

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

     public void onLoad() {
         ActionManager.addListener(this, CoreActionType.SERVER_DISCONNECTED);
         command = new ParserDebugCommand(this);
+        CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc} */

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

 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;
     public ParserDebugCommand(final DebugPlugin plugin) {
         super();
         myPlugin = plugin;
-        CommandManager.registerCommand(this);
     }
     
     /** {@inheritDoc} */

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

     }
     
     /** {@inheritDoc} */
+    @Override
     public void onLoad() {
         CommandManager.registerCommand(command);
     }
     
     /** {@inheritDoc}. */
+    @Override
     public void onUnload() {
         CommandManager.unregisterCommand(command);
     }

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

 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;
     public ScriptCommand(final ScriptPlugin plugin) {
         super();
         myPlugin = plugin;
-        CommandManager.registerCommand(this);
     }
         
     /** {@inheritDoc} */

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

         // 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

 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;
         super();
         
         this.parent = newParent;
-        
-        CommandManager.registerCommand(this);
     }
 
     /**
     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

 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;
         try {
             SystemTray.getSystemTray().add(icon);
             command = new PopupCommand(this);
+            CommandManager.registerCommand(command);
         } catch (AWTException ex) {
             // Should probably unload ourself here?
         }
     @Override
     public void onUnload() {
         SystemTray.getSystemTray().remove(icon);
-        command.unregister();
+        CommandManager.unregisterCommand(command);
 
         ActionManager.removeListener(this);
     }

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

         }, 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

 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;
      * Creates a new instance of TimerCommand.
      */
     public TimerCommand() {
-        CommandManager.registerCommand(this);
+        super();
     }
     
     /** {@inheritDoc} */