Some more static removal/tidying/etc.

Change-Id: I90c3e916bd9510dcd0596e00139b0b48babd5347
Reviewed-on: http://gerrit.dmdirc.com/2865
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/commandparser/CommandManager.java

@@ -291,7 +291,9 @@ public class CommandManager implements CommandController {
      * Initialise the singleton instance of the CommandManager.
      *
      * @param commandManager The new singleton command manager instance.
+     * @deprecated Don't use statically.
      */
+    @Deprecated
     public static void setCommandManager(final CommandManager commandManager) {
         instance = commandManager;
     }
@@ -300,7 +302,9 @@ public class CommandManager implements CommandController {
      * Retrieves a singleton instance of the CommandManager.
      *
      * @return A singleton instance of the CommandManager.
+     * @deprecated Don't use statically.
      */
+    @Deprecated
     public static synchronized CommandManager getCommandManager() {
         return instance;
     }

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

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.messages.Styliser;
@@ -49,17 +48,6 @@ public abstract class Command {
     @Getter(AccessLevel.PROTECTED)
     private final CommandController controller;
 
-    /**
-     * Creates a new instance of Command using the default CommandManager
-     * provided by {@link CommandManager#getCommandManager()}.
-     *
-     * @deprecated All commands should provide a command controller.
-     */
-    @Deprecated
-    public Command() {
-        this(CommandManager.getCommandManager());
-    }
-
     /**
      * Sends a line, if appropriate, to the specified target.
      * @param target The command window to send the line to

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

@@ -27,7 +27,6 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 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;
@@ -91,9 +90,8 @@ public class Ifplugin extends Command implements IntelligentCommand {
 
         if (result != negative) {
             if (origin == null) {
-                new GlobalCommandParser(origin.getConfigManager(),
-                        CommandManager.getCommandManager()).parseCommand(
-                        null, args.getArgumentsAsString(1));
+                new GlobalCommandParser(origin.getConfigManager(), getController())
+                        .parseCommand(null, args.getArgumentsAsString(1));
             } else {
                 ((WritableFrameContainer) origin).getCommandParser()
                         .parseCommand(origin, args.getArgumentsAsString(1));

src/com/dmdirc/commandparser/validators/CommandNameValidator.java

@@ -38,7 +38,10 @@ public class CommandNameValidator extends ValidatorChain<String> {
     /**
      * Instantiates a new command name validator, using the command char
      * provided by the default Command Manager.
+     *
+     * @deprecated Provide a command char.
      */
+    @Deprecated
     public CommandNameValidator() {
         this(CommandManager.getCommandManager().getCommandChar());
     }

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -73,6 +73,6 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
 
     @Override
     public TabCompleter getTabCompleter() {
-        return new TabCompleter();
+        return new TabCompleter(getConfigManager());
     }
 }