Fix fallout from CommandManager changes

Change-Id: Ib62d32dbfdadaf38930ceacf667ff533de047599
Depends-On: I48182a9cd7c8f49612025ba208ae90d3bb19ee2b
Reviewed-on: http://gerrit.dmdirc.com/1995
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/activewindow/ActiveWindowPlugin.java

@@ -41,12 +41,12 @@ public final class ActiveWindowPlugin extends BasePlugin {
         command = new ActiveCommand(((SwingController) PluginManager
                 .getPluginManager().getPluginInfoByName("ui_swing")
                 .getPlugin()).getMainFrame());
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 }

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

@@ -42,8 +42,8 @@ public final class AudioPlugin extends BasePlugin {
     public void onLoad() {
         audioCommand = new AudioCommand();
         beepCommand = new BeepCommand();
-        CommandManager.registerCommand(audioCommand);
-        CommandManager.registerCommand(beepCommand);
+        CommandManager.getCommandManager().registerCommand(audioCommand);
+        CommandManager.getCommandManager().registerCommand(beepCommand);
     }
 
     /**
@@ -51,8 +51,8 @@ public final class AudioPlugin extends BasePlugin {
      */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(beepCommand);
-        CommandManager.unregisterCommand(audioCommand);
+        CommandManager.getCommandManager().unregisterCommand(beepCommand);
+        CommandManager.getCommandManager().unregisterCommand(audioCommand);
     }
 
 }

src/com/dmdirc/addons/calc/CalcPlugin.java

@@ -40,13 +40,13 @@ public class CalcPlugin extends BasePlugin {
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        CommandManager.registerCommand(command, commandInfo);
+        CommandManager.getCommandManager().registerCommand(command, commandInfo);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(commandInfo);
+        CommandManager.getCommandManager().unregisterCommand(commandInfo);
     }
 
 }

src/com/dmdirc/addons/contactlist/ContactListPlugin.java

@@ -37,12 +37,12 @@ public final class ContactListPlugin extends BasePlugin {
     @Override
     public void onLoad() {
         command = new ContactListCommand();
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 }

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

@@ -62,7 +62,7 @@ public final class DCCCommandParser extends GlobalCommandParser {
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
-        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
+        CommandManager.getCommandManager().loadCommands(this, CommandType.TYPE_GLOBAL);
     }
 
     /**

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

@@ -641,7 +641,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
         }
 
         command = new DCCCommand(this);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
 
         ActionManager.getActionManager().registerTypes(DCCActions.values());
         ActionManager.getActionManager().registerListener(this,
@@ -653,7 +653,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      */
     @Override
     public synchronized void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
         ActionManager.getActionManager().unregisterListener(this);
         if (container != null) {
             container.close();

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

@@ -78,13 +78,13 @@ public final class DcopPlugin extends BasePlugin {
     @Override
     public void onLoad() {
         command = new DcopCommand();
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
 }

src/com/dmdirc/addons/debug/Debug.java

@@ -68,7 +68,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
                         "Unknown debug action.");
             } else {
                 final CommandArguments newArgs = new CommandArguments(
-                        Arrays.asList((CommandManager.getCommandChar()
+                        Arrays.asList((CommandManager.getCommandManager().getCommandChar()
                         + command.getName() + " "
                         + args.getArgumentsAsString(1)).split(" ")));
                 command.execute(origin, newArgs, context);

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

@@ -65,7 +65,7 @@ public class DebugPlugin extends BasePlugin {
     @Override
     @SuppressWarnings("unchecked")
     public void onLoad() {
-        CommandManager.registerCommand(debugCommand);
+        CommandManager.getCommandManager().registerCommand(debugCommand);
         for (Class<DebugCommand> type : CLASSES) {
             try {
                 addCommand(type.getConstructor(Debug.class)
@@ -84,7 +84,7 @@ public class DebugPlugin extends BasePlugin {
     @Override
     public void onUnload() {
         commands.clear();
-        CommandManager.unregisterCommand(debugCommand);
+        CommandManager.getCommandManager().unregisterCommand(debugCommand);
     }
 
     /**

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

@@ -43,13 +43,13 @@ public final class DNSPlugin extends BasePlugin {
     @Override
     public void onLoad() {
         command = new DNSCommand();
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
     /**

src/com/dmdirc/addons/exec/ExecPlugin.java

@@ -39,13 +39,13 @@ public class ExecPlugin extends BasePlugin {
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        CommandManager.registerCommand(command, commandInfo);
+        CommandManager.getCommandManager().registerCommand(command, commandInfo);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(commandInfo);
+        CommandManager.getCommandManager().unregisterCommand(commandInfo);
     }
 
 }

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

@@ -138,7 +138,7 @@ public final class FreeDesktopNotificationsPlugin extends BasePlugin
         setCachedSettings();
 
         command = new FDNotifyCommand(this);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
 
         // Extract required Files
         final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("freedesktop_notifications");
@@ -167,7 +167,7 @@ public final class FreeDesktopNotificationsPlugin extends BasePlugin
      */
     @Override
     public synchronized void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
         IdentityManager.getGlobalConfig().removeListener(this);
     }
 

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

@@ -146,7 +146,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
 
         command = new LoggingCommand();
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
 
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CHANNEL_OPENED,
@@ -213,7 +213,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
             idleFileTimer.purge();
         }
 
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
         ActionManager.getActionManager().unregisterListener(this);
 
         synchronized (openFiles) {

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -66,7 +66,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
             }
         }
         command = new NotificationCommand(this);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
@@ -74,7 +74,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
     public void onUnload() {
         methods.clear();
         ActionManager.getActionManager().unregisterListener(this);
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
     /** {@inheritDoc} */

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

@@ -75,7 +75,7 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
         }
 
         command = new NowPlayingCommand(this);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
@@ -86,7 +86,7 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
 
         ActionManager.getActionManager().unregisterListener(this);
 
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
     /** {@inheritDoc} */

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

@@ -80,13 +80,13 @@ public final class OsdPlugin extends BasePlugin implements CategoryChangeListene
     @Override
     public void onLoad() {
         command = new OsdCommand(osdManager);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
     /** {@inheritDoc} */

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

@@ -55,13 +55,13 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
         ActionManager.getActionManager().unregisterListener(this,
                 CoreActionType.SERVER_DISCONNECTED);
         command = new ParserDebugCommand(this);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
         final ArrayList<DebugWindow> windowList = new ArrayList<DebugWindow>();
         for (Parser parser : registeredParsers.keySet()) {
             try {

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

@@ -29,8 +29,6 @@ import com.dmdirc.plugins.BasePlugin;
 /**
  * The redirect plugin allows the suer to redirect the output of commands that
  * would normally echo their results locally to a channel or chat window instead.
- *
- * @author chris
  */
 public final class RedirectPlugin extends BasePlugin {
 
@@ -46,13 +44,13 @@ public final class RedirectPlugin extends BasePlugin {
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** {@inheritDoc}. */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
 }

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

@@ -89,7 +89,7 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.PLUGIN_LOADED);
         command = new ScriptCommand(this);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
 
         // Make sure our scripts dir exists
         final File newDir = new File(scriptDir);
@@ -115,7 +115,7 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
     @Override
     public void onUnload() {
         ActionManager.getActionManager().unregisterListener(this);
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
 
         final File savedVariables = new File(scriptDir+"storedVariables");
         FileOutputStream fos = null;

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

@@ -147,7 +147,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
         try {
             SystemTray.getSystemTray().add(icon);
             command = new PopupCommand(this);
-            CommandManager.registerCommand(command);
+            CommandManager.getCommandManager().registerCommand(command);
             mainFrame = ((SwingController) PluginManager.getPluginManager()
                     .getPluginInfoByName("ui_swing").getPlugin())
                     .getMainFrame();
@@ -165,7 +165,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
     @Override
     public void onUnload() {
         SystemTray.getSystemTray().remove(icon);
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
 
         ActionManager.getActionManager().unregisterListener(this);
     }

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

@@ -68,7 +68,7 @@ public final class TimePlugin  extends BasePlugin {
 
         manager = new TimerManager();
         command = new TimerCommand(manager);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
     }
 
     /** Handles a timer event that occurs every minute. */
@@ -97,7 +97,7 @@ public final class TimePlugin  extends BasePlugin {
             timer = null;
         }
         manager = null;
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
     }
 
     /**

src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java

@@ -58,7 +58,7 @@ public class UrlCatcherPlugin extends BasePlugin implements ActionListener,
     public void onLoad() {
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_LINE_ADDED);
-        CommandManager.registerCommand(command);
+        CommandManager.getCommandManager().registerCommand(command);
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
         updateConfig();
     }
@@ -67,7 +67,7 @@ public class UrlCatcherPlugin extends BasePlugin implements ActionListener,
     @Override
     public void onUnload() {
         ActionManager.getActionManager().unregisterListener(this);
-        CommandManager.unregisterCommand(command);
+        CommandManager.getCommandManager().unregisterCommand(command);
         IdentityManager.getGlobalConfig().removeListener(this);
     }
 

src/com/dmdirc/addons/windowflashing/WindowFlashing.java

@@ -88,7 +88,7 @@ public class WindowFlashing extends BasePlugin implements ConfigChangeListener {
     @Override
     public void onLoad() {
         flashCommand = new FlashWindow(this);
-        CommandManager.registerCommand(flashCommand);
+        CommandManager.getCommandManager().registerCommand(flashCommand);
         mainFrame = ((SwingController) PluginManager
                 .getPluginManager().getPluginInfoByName("ui_swing")
                 .getPlugin()).getMainFrame();
@@ -100,7 +100,7 @@ public class WindowFlashing extends BasePlugin implements ConfigChangeListener {
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        CommandManager.unregisterCommand(flashCommand);
+        CommandManager.getCommandManager().unregisterCommand(flashCommand);
         flashCommand = null;
         mainFrame = null;
         user32 = null;

test/com/dmdirc/addons/debug/DebugTest.java

@@ -41,7 +41,7 @@ public class DebugTest {
         // Command has a dependency on CommandManager (to get the command char)
         // And CommandManager has a dependency on IdentityManager for the same
         IdentityManager.load();
-        CommandManager.initCommands();
+        CommandManager.getCommandManager().initCommands();
     }
 
     /** Checks the debug command with no arguments shows usage. */

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -22,18 +22,13 @@
 
 package com.dmdirc.addons.redirect;
 
-import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.ui.interfaces.InputWindow;
-import java.util.ArrayList;
-import java.util.Arrays;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -44,7 +39,7 @@ public class RedirectCommandTest {
     @BeforeClass
     public static void setupClass() throws InvalidIdentityFileException {
         IdentityManager.load();
-        CommandManager.initCommands();
+        CommandManager.getCommandManager().initCommands();
     }
 
     @Ignore