Tidy up some TabCompleter usages.

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

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

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.collections.MapList;
 
@@ -53,40 +53,42 @@ public class TabCompleter {
     @Nullable
     private final TabCompleter parent;
 
-    /**
-     * The config manager to use for reading settings.
-     */
+    /** The config manager to use for reading settings. */
     private final AggregateConfigProvider configManager;
 
-    /**
-     * The entries in this completer.
-     */
-    private final MapList<TabCompletionType, String> entries = new MapList<>();
+    /** The controller to use to retrieve command information. */
+    private final CommandController commandController;
 
-    /** Creates a new instance of TabCompleter. */
-    @Deprecated
-    public TabCompleter() {
-        this(IdentityManager.getIdentityManager().getGlobalConfiguration());
-    }
+    /** The entries in this completer. */
+    private final MapList<TabCompletionType, String> entries = new MapList<>();
 
     /**
      * Creates a new instance of {@link TabCompleter}.
      *
+     * @param commandController The controller to use for command information.
      * @param configManager The manager to read config settings from.
      */
-    public TabCompleter(final AggregateConfigProvider configManager) {
+    public TabCompleter(
+            final CommandController commandController,
+            final AggregateConfigProvider configManager) {
         this.parent = null;
+        this.commandController = commandController;
         this.configManager = configManager;
     }
 
     /**
      * Creates a new instance of {@link TabCompleter}.
      *
+     * @param commandController The controller to use for command information.
      * @param configManager The manager to read config settings from.
      * @param parent The parent tab completer to inherit completions from.
      */
-    public TabCompleter(final AggregateConfigProvider configManager, final TabCompleter parent) {
+    public TabCompleter(
+            final CommandController commandController,
+            final AggregateConfigProvider configManager,
+            final TabCompleter parent) {
         this.parent = parent;
+        this.commandController = commandController;
         this.configManager = configManager;
     }
 
@@ -156,11 +158,11 @@ public class TabCompleter {
         entries.add(type, entry);
 
         if (type == TabCompletionType.COMMAND && entry.length() > 1
-                && entry.charAt(0) == CommandManager.getCommandManager().getCommandChar()
-                && entry.charAt(1) != CommandManager.getCommandManager().getSilenceChar()) {
+                && entry.charAt(0) == commandController.getCommandChar()
+                && entry.charAt(1) != commandController.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.getCommandManager().getSilenceChar()
+            addEntry(type, entry.substring(0, 1) + commandController.getSilenceChar()
                     + entry.substring(1));
         }
     }

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

@@ -73,7 +73,7 @@ public class TabCompleterFactory {
     public TabCompleter getTabCompleter(
             final AggregateConfigProvider configProvider,
             final CommandType ... commandTypes) {
-        final TabCompleter tabCompleter = new TabCompleter(configProvider);
+        final TabCompleter tabCompleter = new TabCompleter(commandController.get(), configProvider);
         addCommands(tabCompleter, commandTypes);
         tabCompleter.addEntries(TabCompletionType.COMMAND, aliasWrapper.get().getAliases());
         return tabCompleter;
@@ -92,7 +92,8 @@ public class TabCompleterFactory {
             final TabCompleter parent,
             final AggregateConfigProvider configProvider,
             final CommandType ... commandTypes) {
-        final TabCompleter tabCompleter = new TabCompleter(configProvider, parent);
+        final TabCompleter tabCompleter = new TabCompleter(commandController.get(),
+                configProvider, parent);
         addCommands(tabCompleter, commandTypes);
         return tabCompleter;
     }

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -26,12 +26,15 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
 
 import java.util.Collections;
 
+import static org.mockito.Mockito.*;
+
 public class TestWritableFrameContainer extends WritableFrameContainer {
 
     private final int lineLength;
@@ -73,6 +76,6 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
 
     @Override
     public TabCompleter getTabCompleter() {
-        return new TabCompleter(getConfigManager());
+        return new TabCompleter(mock(CommandController.class), getConfigManager());
     }
 }