Make CommandManager a singleton

CLIENT-84

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

src/com/dmdirc/Channel.java

@@ -120,9 +120,9 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
 
         tabCompleter = new TabCompleter(server.getTabCompleter());
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_CHANNEL));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_CHANNEL));
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_CHAT));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_CHAT));
 
         WindowManager.getWindowManager().addWindow(server, this, focus);
 

src/com/dmdirc/GlobalWindow.java

@@ -57,7 +57,7 @@ public class GlobalWindow extends WritableFrameContainer {
 
         tabCompleter = new TabCompleter();
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_GLOBAL));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_GLOBAL));
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 AliasWrapper.getAliasWrapper().getAliases());
 

src/com/dmdirc/Main.java

@@ -124,7 +124,7 @@ public final class Main {
 
         clp.applySettings();
 
-        CommandManager.initCommands();
+        CommandManager.getCommandManager().initCommands();
 
         for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
             ensureExists(pm, service);

src/com/dmdirc/Query.java

@@ -65,7 +65,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
     /** The tab completer for the query window. */
     private final TabCompleter tabCompleter;
 
-
     /**
      * Creates a new instance of Query.
      *
@@ -103,9 +102,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         tabCompleter = new TabCompleter(server.getTabCompleter());
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_QUERY));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_QUERY));
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_CHAT));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_CHAT));
 
         if (!server.getState().isDisconnected()) {
             reregister();

src/com/dmdirc/Server.java

@@ -203,9 +203,9 @@ public class Server extends WritableFrameContainer
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 AliasWrapper.getAliasWrapper().getAliases());
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_SERVER));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_SERVER));
         tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandNames(CommandType.TYPE_GLOBAL));
+                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_GLOBAL));
 
         updateIcon();
 

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -132,7 +132,8 @@ public final class AliasWrapper extends ActionGroup {
     public static String getCommandName(final Action action) {
         for (ActionCondition condition : action.getConditions()) {
             if (condition.getArg() == 1) {
-                return CommandManager.getCommandChar() + condition.getTarget();
+                return CommandManager.getCommandManager().getCommandChar()
+                        + condition.getTarget();
             }
         }
 

src/com/dmdirc/commandparser/CommandArguments.java

@@ -208,7 +208,7 @@ public class CommandArguments {
      * @return True if the input was a command, false otherwise
      */
     public boolean isCommand() {
-        return !line.isEmpty() && line.charAt(0) == CommandManager.getCommandChar();
+        return !line.isEmpty() && line.charAt(0) == CommandManager.getCommandManager().getCommandChar();
     }
 
     /**
@@ -218,7 +218,7 @@ public class CommandArguments {
      */
     public boolean isSilent() {
         return isCommand() && line.length() >= 2
-                && line.charAt(1) == CommandManager.getSilenceChar();
+                && line.charAt(1) == CommandManager.getCommandManager().getSilenceChar();
     }
 
     /**

src/com/dmdirc/commandparser/CommandManager.java

@@ -46,37 +46,33 @@ import java.util.Map;
  * The command manager creates and manages a single instance of all commands,
  * and provides methods to load each group of commands into a parser instance.
  */
-public final class CommandManager {
+public class CommandManager {
+
+    /** A singleton instance of the command manager. */
+    private static final CommandManager INSTANCE = new CommandManager();
 
     /** A list of commands that have been instantiated. */
-    private static final Map<CommandInfo, Command> COMMANDS
+    private final Map<CommandInfo, Command> commands
             = new HashMap<CommandInfo, Command>();
 
     /** A list of command parsers that have been instantiated. */
-    private static final MapList<CommandType, CommandParser> PARSERS
+    private final MapList<CommandType, CommandParser> parsers
             = new MapList<CommandType, CommandParser>();
 
     /** The command char we're using. */
-    private static char commandChar = IdentityManager.getGlobalConfig()
+    private char commandChar = IdentityManager.getGlobalConfig()
             .getOptionChar("general", "commandchar");
 
     /** The silence char we're using. */
-    private static char silenceChar = IdentityManager.getGlobalConfig()
+    private char silenceChar = IdentityManager.getGlobalConfig()
             .getOptionChar("general", "silencechar");
 
-    /**
-     * Prevents creation of a new command manager.
-     */
-    private CommandManager() {
-        // Do nothing
-    }
-
     /**
      * Returns the current command character.
      *
      * @return the current command char
      */
-    public static char getCommandChar() {
+    public char getCommandChar() {
         return commandChar;
     }
 
@@ -85,7 +81,7 @@ public final class CommandManager {
      *
      * @return the current silence char
      */
-    public static char getSilenceChar() {
+    public char getSilenceChar() {
         return silenceChar;
     }
 
@@ -96,7 +92,7 @@ public final class CommandManager {
      * @param info The information about the command
      * @since 0.6.3m1
      */
-    public static void registerCommand(final Command command, final CommandInfo info) {
+    public void registerCommand(final Command command, final CommandInfo info) {
         registerCommand(info, command, true);
     }
 
@@ -109,7 +105,7 @@ public final class CommandManager {
      * {@link CommandInfo} to be registered.
      * @since 0.6.3m1
      */
-    public static <T extends Command & CommandInfo> void registerCommand(final T command) {
+    public <T extends Command & CommandInfo> void registerCommand(final T command) {
         registerCommand(command, command);
     }
 
@@ -119,8 +115,8 @@ public final class CommandManager {
      * @param info The information object for the command that should be unregistered
      * @since 0.6.3m1
      */
-    public static void unregisterCommand(final CommandInfo info) {
-        registerCommand(info, COMMANDS.get(info), false);
+    public void unregisterCommand(final CommandInfo info) {
+        registerCommand(info, commands.get(info), false);
     }
 
     /**
@@ -132,16 +128,16 @@ public final class CommandManager {
      * should be unregistered.
      * @since 0.6.3m1
      */
-    private static void registerCommand(final CommandInfo info, final Command command,
+    private void registerCommand(final CommandInfo info, final Command command,
             final boolean register) {
-        if (PARSERS.containsKey(info.getType())) {
-            registerCommand(info, command, PARSERS.get(info.getType()), register);
+        if (parsers.containsKey(info.getType())) {
+            registerCommand(info, command, parsers.get(info.getType()), register);
         }
 
         if (register) {
-            COMMANDS.put(info, command);
+            commands.put(info, command);
         } else {
-            COMMANDS.remove(info);
+            commands.remove(info);
         }
 
         registerCommandName(info, register);
@@ -156,7 +152,7 @@ public final class CommandManager {
      * @param register Whether to register or unregister the commands
      * @since 0.6.3m1
      */
-    private static void registerCommand(final CommandInfo info, final Command command,
+    private void registerCommand(final CommandInfo info, final Command command,
             final List<? extends CommandParser> myParsers, final boolean register) {
         for (CommandParser parser : myParsers) {
             if (register) {
@@ -176,7 +172,7 @@ public final class CommandManager {
      * should be unregistered.
      * @since 0.6.3m1
      */
-    private static void registerCommandName(final CommandInfo command,
+    private void registerCommandName(final CommandInfo command,
             final boolean register) {
         // Do tab completion
         final String commandName = getCommandChar() + command.getName();
@@ -215,7 +211,7 @@ public final class CommandManager {
      * @param register True if the command should be registered, false if it
      * should be unregistered.
      */
-    private static void registerCommandName(final TabCompleter completer,
+    private void registerCommandName(final TabCompleter completer,
             final String name, final boolean register) {
         if (register) {
             completer.addEntry(TabCompletionType.COMMAND, name);
@@ -227,7 +223,7 @@ public final class CommandManager {
     /**
      * Instansiates the default commands.
      */
-    public static void initCommands() {
+    public void initCommands() {
         // Chat commands
         registerCommand(new Me());
 
@@ -313,7 +309,7 @@ public final class CommandManager {
      * @param parser The {@link CommandParser} to load commands in to
      * @param supertypes The types of commands that should be loaded
      */
-    public static void loadCommands(final CommandParser parser,
+    public void loadCommands(final CommandParser parser,
             final CommandType ... supertypes) {
         for (CommandType supertype : supertypes) {
             for (CommandType type : supertype.getComponentTypes()) {
@@ -321,7 +317,7 @@ public final class CommandManager {
                     parser.registerCommand(pair.getValue(), pair.getKey());
                 }
 
-                PARSERS.add(type, parser);
+                parsers.add(type, parser);
             }
         }
     }
@@ -333,7 +329,7 @@ public final class CommandManager {
      * @param name The name to look for
      * @return A command with a matching signature, or null if none were found
      */
-    public static Map.Entry<CommandInfo, Command> getCommand(final String name) {
+    public Map.Entry<CommandInfo, Command> getCommand(final String name) {
         return getCommand(null, name);
     }
 
@@ -344,7 +340,7 @@ public final class CommandManager {
      * @param name The name to look for
      * @return A command with a matching signature, or null if none were found
      */
-    public static Map.Entry<CommandInfo, Command> getCommand(final CommandType type,
+    public Map.Entry<CommandInfo, Command> getCommand(final CommandType type,
             final String name) {
         final Map<CommandInfo, Command> res = getCommands(type, name);
 
@@ -357,7 +353,7 @@ public final class CommandManager {
      * @param command The name of the command to test
      * @return True iff the command is a channel command, false otherwise
      */
-    public static boolean isChannelCommand(final String command) {
+    public boolean isChannelCommand(final String command) {
         return getCommand(CommandType.TYPE_CHANNEL, command) != null
                 || getCommand(CommandType.TYPE_CHAT, command) != null;
     }
@@ -368,7 +364,7 @@ public final class CommandManager {
      * @param type The type of command to list
      * @return A list of command names
      */
-    public static List<String> getCommandNames(final CommandType type) {
+    public List<String> getCommandNames(final CommandType type) {
         final List<String> res = new ArrayList<String>();
 
         for (CommandInfo command : getCommands(type).keySet()) {
@@ -386,7 +382,7 @@ public final class CommandManager {
      * @return A map of commands
      * @since 0.6.3m1
      */
-    public static Map<CommandInfo, Command> getCommands(final CommandType type) {
+    public Map<CommandInfo, Command> getCommands(final CommandType type) {
         return getCommands(type, null);
     }
 
@@ -399,11 +395,11 @@ public final class CommandManager {
      * @return A map of {@link CommandInfo}s and their associated {@link Command}.
      * @since 0.6.3m1
      */
-    private static Map<CommandInfo, Command> getCommands(final CommandType type,
+    private Map<CommandInfo, Command> getCommands(final CommandType type,
             final String name) {
         final Map<CommandInfo, Command> res = new HashMap<CommandInfo, Command>();
 
-        for (Map.Entry<CommandInfo, Command> entry : COMMANDS.entrySet()) {
+        for (Map.Entry<CommandInfo, Command> entry : commands.entrySet()) {
             if ((type == null || type.equals(entry.getKey().getType()))
                     && (name == null || name.equals(entry.getKey().getName()))) {
                 res.put(entry.getKey(), entry.getValue());
@@ -413,4 +409,13 @@ public final class CommandManager {
         return res;
     }
 
+    /**
+     * Retrieves a singleton instance of the CommandManager.
+     *
+     * @return A singleton instance of the CommandManager.
+     */
+    public static CommandManager getCommandManager() {
+        return INSTANCE;
+    }
+
 }

src/com/dmdirc/commandparser/PopupMenuItem.java

@@ -141,7 +141,7 @@ public class PopupMenuItem {
                     builder.append("\n");
                 }
 
-                builder.append(CommandManager.getCommandChar());
+                builder.append(CommandManager.getCommandManager().getCommandChar());
                 builder.append(String.format(actualCommand, args));
                 offset = 0;
             }
@@ -156,7 +156,7 @@ public class PopupMenuItem {
                 builder.append("\n");
             }
 
-            builder.append(CommandManager.getCommandChar());
+            builder.append(CommandManager.getCommandManager().getCommandChar());
             builder.append(String.format(actualCommand, args));
         }
 

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

@@ -63,7 +63,8 @@ public abstract class Command {
      */
     protected final void showUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
-        sendLine(target, isSilent, "commandUsage", CommandManager.getCommandChar(),
+        sendLine(target, isSilent, "commandUsage",
+                CommandManager.getCommandManager().getCommandChar(),
                 name, args);
     }
 

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

@@ -54,7 +54,8 @@ public class AliasCommand extends Command implements
 
         if (args.getArguments()[0].equalsIgnoreCase("--remove")) {
             final String name
-                    = args.getArguments()[1].charAt(0) == CommandManager.getCommandChar()
+                    = args.getArguments()[1].charAt(0)
+                    == CommandManager.getCommandManager().getCommandChar()
                     ? args.getArguments()[1].substring(1) : args.getArguments()[1];
 
             if (doRemove(name)) {
@@ -68,7 +69,8 @@ public class AliasCommand extends Command implements
             return;
         }
 
-        final String name = args.getArguments()[0].charAt(0) == CommandManager.getCommandChar()
+        final String name = args.getArguments()[0].charAt(0)
+                == CommandManager.getCommandManager().getCommandChar()
                 ? args.getArguments()[0].substring(1) : args.getArguments()[0];
 
         for (Action alias : AliasWrapper.getAliasWrapper()) {

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

@@ -105,10 +105,11 @@ public class Help extends Command implements IntelligentCommand, CommandInfo {
             final String name) {
         Map.Entry<CommandInfo, Command> command = null;
 
-        if (name.length() > 0 && name.charAt(0) == CommandManager.getCommandChar()) {
-            command = CommandManager.getCommand(name.substring(1));
+        if (name.length() > 0 && name.charAt(0)
+                == CommandManager.getCommandManager().getCommandChar()) {
+            command = CommandManager.getCommandManager().getCommand(name.substring(1));
         } else {
-            command = CommandManager.getCommand(name);
+            command = CommandManager.getCommandManager().getCommand(name);
         }
 
         if (command == null) {

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

@@ -155,7 +155,7 @@ public class Set extends Command implements IntelligentCommand, CommandInfo {
         final StringBuffer output = new StringBuffer(67);
 
         output.append("Valid domains (use ");
-        output.append(CommandManager.getCommandChar());
+        output.append(CommandManager.getCommandManager().getCommandChar());
         output.append("set <domain> to see options within a domain): ");
 
         for (String domain : manager.getDomains()) {

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

@@ -58,7 +58,8 @@ public class OpenQuery extends Command implements IntelligentCommand,
         if (server.getParser().isValidChannelName(args.getArguments()[0])) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
-                    + Styliser.CODE_BOLD + CommandManager.getCommandChar()
+                    + Styliser.CODE_BOLD
+                    + CommandManager.getCommandManager().getCommandChar()
                     + (args.getArguments().length > 1 ? "msg" : "join") + " "
                     + args.getArgumentsAsString()
                     + Styliser.CODE_BOLD + Styliser.CODE_FIXED + "?");

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.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.context.ChannelCommandContext;
@@ -72,7 +71,7 @@ public class ChannelCommandParser extends ChatCommandParser {
     /** {@inheritDoc} */
     @Override
     protected void loadCommands() {
-        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
+        commandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
                 CommandType.TYPE_SERVER, CommandType.TYPE_CHANNEL);
     }
 

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -67,6 +67,9 @@ public abstract class CommandParser implements Serializable {
      */
     private final RollingList<PreviousCommand> history;
 
+    /** Command manager to use. */
+    protected final CommandManager commandManager = CommandManager.getCommandManager();
+
     /** Creates a new instance of CommandParser. */
     protected CommandParser() {
         commands = new HashMap<String, CommandInfoPair>();
@@ -171,7 +174,7 @@ public abstract class CommandParser implements Serializable {
 
         if (cargs.length == 0 || !parseChannel || origin == null
                 || origin.getServer() == null
-                || !CommandManager.isChannelCommand(command)) {
+                || !commandManager.isChannelCommand(command)) {
             return false;
         }
 
@@ -191,11 +194,11 @@ public abstract class CommandParser implements Serializable {
 
                 if (server.hasChannel(channel)) {
                     server.getChannel(channel).getCommandParser()
-                            .parseCommand(origin, window, CommandManager.getCommandChar()
+                            .parseCommand(origin, window, commandManager.getCommandChar()
                             + args.getCommandName() + " " + args.getWordsAsString(2), false);
                 } else {
                     final Map.Entry<CommandInfo, Command> actCommand
-                            = CommandManager.getCommand(CommandType.TYPE_CHANNEL, command);
+                            = commandManager.getCommand(CommandType.TYPE_CHANNEL, command);
 
                     if (actCommand != null && actCommand.getValue() instanceof ExternalCommand) {
                         ((ExternalCommand) actCommand.getValue()).execute(

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.parsers;
 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;
@@ -71,7 +70,7 @@ public class GlobalCommandParser extends CommandParser {
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
-        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
+        commandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -27,7 +27,6 @@ import com.dmdirc.Query;
 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.QueryCommandContext;
@@ -36,7 +35,6 @@ import com.dmdirc.ui.interfaces.Window;
 /**
  * A command parser that is tailored for use in a query environment. Handles
  * both query and server commands.
- * @author chris
  */
 public class QueryCommandParser extends ChatCommandParser {
 
@@ -74,7 +72,7 @@ public class QueryCommandParser extends ChatCommandParser {
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
-        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
+        commandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
                 CommandType.TYPE_SERVER, CommandType.TYPE_QUERY);
     }
 

src/com/dmdirc/commandparser/parsers/ServerCommandParser.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.context.ServerCommandContext;
@@ -35,8 +34,6 @@ import com.dmdirc.ui.interfaces.Window;
 
 /**
  * A command parser used in the context of a server.
- *
- * @author chris
  */
 public class ServerCommandParser extends GlobalCommandParser {
 
@@ -65,7 +62,7 @@ public class ServerCommandParser extends GlobalCommandParser {
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
-        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL, CommandType.TYPE_SERVER);
+        commandManager.loadCommands(this, CommandType.TYPE_GLOBAL, CommandType.TYPE_SERVER);
     }
 
     /** {@inheritDoc} */

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

@@ -42,8 +42,8 @@ public class CommandNameValidator extends ValidatorChain<String> {
     public CommandNameValidator() {
         super(new RegexStringValidator("^[^\\s]*$", "Cannot contain spaces"),
                 new RegexStringValidator("^[^"
-                + Pattern.quote(String.valueOf(CommandManager.getCommandChar()))
-                + "].*$", "Cannot start with a " + CommandManager.getCommandChar()));
+                + Pattern.quote(String.valueOf(CommandManager.getCommandManager().getCommandChar()))
+                + "].*$", "Cannot start with a " + CommandManager.getCommandManager().getCommandChar()));
     }
 
 }

src/com/dmdirc/ui/input/InputHandler.java

@@ -221,7 +221,7 @@ public abstract class InputHandler implements ConfigChangeListener {
 
         if (args.isCommand()) {
             final Map.Entry<CommandInfo, Command> command
-                    = CommandManager.getCommand(args.getCommandName());
+                    = CommandManager.getCommandManager().getCommand(args.getCommandName());
 
             if (command != null && command.getValue() instanceof ValidatingCommand) {
                 final ValidationResponse vr = ((ValidatingCommand) command.getValue())
@@ -432,7 +432,7 @@ public abstract class InputHandler implements ConfigChangeListener {
         LOGGER.log(Level.FINER, "Offsets: start: {0}, end: {1}",
                 new Object[]{start, end});
 
-        if (start > 0 && text.charAt(0) == CommandManager.getCommandChar()) {
+        if (start > 0 && text.charAt(0) == CommandManager.getCommandManager().getCommandChar()) {
             doCommandTabCompletion(text, start, end, shiftPressed);
         } else {
             doNormalTabCompletion(text, start, end, shiftPressed,  null);

src/com/dmdirc/ui/input/TabCompleter.java

@@ -140,11 +140,11 @@ public class TabCompleter {
         entries.add(type, entry);
 
         if (type == TabCompletionType.COMMAND && entry.length() > 1
-                && entry.charAt(0) == CommandManager.getCommandChar()
-                && entry.charAt(1) != CommandManager.getSilenceChar()) {
+                && entry.charAt(0) == CommandManager.getCommandManager().getCommandChar()
+                && entry.charAt(1) != CommandManager.getCommandManager().getSilenceChar()) {
             // If we're adding a command name that doesn't include the silence
             // character, also add a version with the silence char
-            addEntry(type, entry.substring(0, 1) + CommandManager.getSilenceChar()
+            addEntry(type, entry.substring(0, 1) + CommandManager.getCommandManager().getSilenceChar()
                     + entry.substring(1));
         }
     }
@@ -241,7 +241,7 @@ public class TabCompleter {
         }
 
         final Map.Entry<CommandInfo, Command> command
-                = CommandManager.getCommand(args.getCommandName());
+                = CommandManager.getCommandManager().getCommand(args.getCommandName());
 
         AdditionalTabTargets targets = null;
 

test/com/dmdirc/commandparser/CommandArgumentsTest.java

@@ -83,17 +83,17 @@ public class CommandArgumentsTest {
 
     @Test
     public void testIsCommand() {
-        assertTrue(new CommandArguments(CommandManager.getCommandChar() + "").isCommand());
-        assertTrue(new CommandArguments(CommandManager.getCommandChar() + "foo bar").isCommand());
-        assertFalse(new CommandArguments(" " + CommandManager.getCommandChar()).isCommand());
+        assertTrue(new CommandArguments(CommandManager.getCommandManager().getCommandChar() + "").isCommand());
+        assertTrue(new CommandArguments(CommandManager.getCommandManager().getCommandChar() + "foo bar").isCommand());
+        assertFalse(new CommandArguments(" " + CommandManager.getCommandManager().getCommandChar()).isCommand());
         assertFalse(new CommandArguments("").isCommand());
         assertFalse(new CommandArguments("foo").isCommand());
     }
 
     @Test
     public void testIsSilent() {
-        final char c = CommandManager.getCommandChar();
-        final char s = CommandManager.getSilenceChar();
+        final char c = CommandManager.getCommandManager().getCommandChar();
+        final char s = CommandManager.getCommandManager().getSilenceChar();
 
         assertTrue(new CommandArguments(c + "" + s).isSilent());
         assertFalse(new CommandArguments("f" + s).isSilent());

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -60,10 +60,10 @@ public class HelpTest {
         final List<Object[]> res = new LinkedList<Object[]>();
 
         IdentityManager.load();
-        CommandManager.initCommands();
+        CommandManager.getCommandManager().initCommands();
 
         for (CommandType type : CommandType.values()) {
-            for (CommandInfo command : CommandManager.getCommands(type).keySet()) {
+            for (CommandInfo command : CommandManager.getCommandManager().getCommands(type).keySet()) {
                 if (command.showInHelp()) {
                     res.add(new Object[]{command});
                 }

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -35,7 +35,7 @@ public class CommandParserTest {
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
-        CommandManager.initCommands();
+        CommandManager.getCommandManager().initCommands();
     }
 
     @Test

test/com/dmdirc/harness/TestCommandParser.java

@@ -46,7 +46,7 @@ public class TestCommandParser extends CommandParser {
 
     @Override
     protected void loadCommands() {
-        CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
+        CommandManager.getCommandManager().loadCommands(this, CommandType.TYPE_GLOBAL);
     }
 
     @Override