Use TabCompleter factories in a few more places.

This removes some static references and simplifies the
constructors of some of our model classes quite a bit.

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

src/com/dmdirc/Channel.java

@@ -24,7 +24,6 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.interfaces.NicklistListener;
@@ -39,6 +38,7 @@ import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -105,6 +105,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param newChannelInfo The parser's channel object that corresponds to this channel
      * @param focus Whether or not to focus this channel
      * @param configMigrator The config migrator which provides the config for this channel.
+     * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      */
@@ -113,6 +114,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
             final ChannelInfo newChannelInfo,
             final boolean focus,
             final ConfigProviderMigrator configMigrator,
+            final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager) {
         super("channel-inactive", newChannelInfo.getName(),
@@ -138,11 +140,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         showModePrefix = getConfigManager().getOptionBool("channel", "showmodeprefix");
         showColours = getConfigManager().getOptionBool("ui", "shownickcoloursintext");
 
-        tabCompleter = new TabCompleter(getConfigManager(), server.getTabCompleter());
-        tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_CHANNEL));
-        tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_CHAT));
+        tabCompleter = tabCompleterFactory.getTabCompleter(server.getTabCompleter(),
+                getConfigManager(), CommandType.TYPE_CHANNEL, CommandType.TYPE_CHAT);
 
         windowManager.addWindow(server, this, focus);
 

src/com/dmdirc/GlobalWindow.java

@@ -22,20 +22,18 @@
 
 package com.dmdirc;
 
-import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.input.TabCompletionType;
+import com.dmdirc.ui.input.TabCompleterFactory;
 
 import java.util.Arrays;
 
@@ -55,6 +53,7 @@ public class GlobalWindow extends WritableFrameContainer {
 
     /** The tab completer we use. */
     @Getter
+    @SuppressWarnings("PMD.UnusedPrivateField")
     private final TabCompleter tabCompleter;
 
     /**
@@ -63,23 +62,21 @@ public class GlobalWindow extends WritableFrameContainer {
      * @param config The ConfigManager to retrieve settings from.
      * @param parser The command parser to use to parse input.
      * @param windowManager The window manager.
+     * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager The sink manager to use to despatch messages.
      */
     public GlobalWindow(
             final AggregateConfigProvider config,
             final CommandParser parser,
             final WindowManager windowManager,
+            final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager) {
         super("icon", "Global", "(Global)", config, parser, messageSinkManager, windowManager,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
 
-        tabCompleter = new TabCompleter(config);
-        tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_GLOBAL));
-        tabCompleter.addEntries(TabCompletionType.COMMAND,
-                AliasWrapper.getAliasWrapper().getAliases());
+        tabCompleter = tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL);
 
         windowManager.addWindow(this);
     }
@@ -124,6 +121,8 @@ public class GlobalWindow extends WritableFrameContainer {
 
         /** The global configuration to read settings from. */
         private final AggregateConfigProvider globalConfig;
+        /** The factory to use to create tab completers. */
+        private final TabCompleterFactory tabCompleterFactory;
         /** The provider to use to retrieve a command controller. */
         private final Provider<CommandController> commandControllerProvider;
         /** The provider to use to retrieve a window manager. */
@@ -134,18 +133,21 @@ public class GlobalWindow extends WritableFrameContainer {
         /**
          * Creates a new instance of {@link GlobalWindowManager}.
          *
-         * @param identityController Controller to retrieve global configuration from.
+         * @param globalConfig Configuration provider to read settings from.
+         * @param tabCompleterFactory Factory to use to create tab completers.
          * @param commandControllerProvider The provider to use to retrieve a command controller.
          * @param windowManagerProvider The provider to use to retrieve a window manager.
          * @param messageSinkManagerProvider The provider to use to retrieve a sink manager.
          */
         @Inject
         public GlobalWindowManager(
-                final IdentityController identityController,
+                @GlobalConfig final AggregateConfigProvider globalConfig,
+                final TabCompleterFactory tabCompleterFactory,
                 final Provider<CommandController> commandControllerProvider,
                 final Provider<WindowManager> windowManagerProvider,
                 final Provider<MessageSinkManager> messageSinkManagerProvider) {
-            this.globalConfig = identityController.getGlobalConfiguration();
+            this.globalConfig = globalConfig;
+            this.tabCompleterFactory = tabCompleterFactory;
             this.commandControllerProvider = commandControllerProvider;
             this.windowManagerProvider = windowManagerProvider;
             this.messageSinkManagerProvider = messageSinkManagerProvider;
@@ -175,7 +177,8 @@ public class GlobalWindow extends WritableFrameContainer {
                     if (globalWindow == null) {
                         globalWindow = new GlobalWindow(globalConfig,
                                 new GlobalCommandParser(globalConfig, commandControllerProvider.get()),
-                                windowManagerProvider.get(), messageSinkManagerProvider.get());
+                                windowManagerProvider.get(), tabCompleterFactory,
+                                messageSinkManagerProvider.get());
                     }
                 } else {
                     if (globalWindow != null) {

src/com/dmdirc/Query.java

@@ -24,7 +24,6 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.logger.ErrorLevel;
@@ -43,7 +42,7 @@ import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.input.TabCompletionType;
+import com.dmdirc.ui.input.TabCompleterFactory;
 
 import java.awt.Toolkit;
 import java.util.Arrays;
@@ -74,11 +73,13 @@ public class Query extends MessageTarget implements PrivateActionListener,
      * @param newHost host of the remove client
      * @param newServer The server object that this Query belongs to
      * @param focus Should we focus the query on open?
+     * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      */
     public Query(final Server newServer, final String newHost,
-            final boolean focus, final MessageSinkManager messageSinkManager,
+            final boolean focus, final TabCompleterFactory tabCompleterFactory,
+            final MessageSinkManager messageSinkManager,
             final WindowManager windowManager) {
         super("query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
@@ -97,11 +98,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
         ActionManager.getActionManager().triggerEvent(
                 CoreActionType.QUERY_OPENED, null, this);
 
-        tabCompleter = new TabCompleter(getConfigManager(), server.getTabCompleter());
-        tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_QUERY));
-        tabCompleter.addEntries(TabCompletionType.COMMAND,
-                CommandManager.getCommandManager().getCommandNames(CommandType.TYPE_CHAT));
+        tabCompleter = tabCompleterFactory.getTabCompleter(server.getTabCompleter(),
+                getConfigManager(), CommandType.TYPE_QUERY, CommandType.TYPE_CHAT);
 
         if (!server.getState().isDisconnected()) {
             reregister();

src/com/dmdirc/Server.java

@@ -157,6 +157,9 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     /** The tabcompleter used for this server. */
     private final TabCompleter tabCompleter;
 
+    /** The factory to give to children to create tabcompleters. */
+    private final TabCompleterFactory tabCompleterFactory;
+
     /** Our reason for being away, if any. */
     private String awayMessage;
 
@@ -249,6 +252,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         this.configMigrator = configMigrator;
+        this.tabCompleterFactory = tabCompleterFactory;
 
         setConnectionDetails(uri, profile);
 
@@ -563,7 +567,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         final String lnick = converter.toLowerCase(nick);
 
         if (!queries.containsKey(lnick)) {
-            final Query newQuery = new Query(this, host, focus, messageSinkManager, windowManager);
+            final Query newQuery = new Query(this, host, focus, tabCompleterFactory,
+                    messageSinkManager, windowManager);
 
             tabCompleter.addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);
@@ -658,7 +663,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             final ConfigProviderMigrator channelConfig = identityFactory.createMigratableConfig(
                     getProtocol(), getIrcd(), getNetwork(), getAddress(), chan.getName());
             final Channel newChan = new Channel(this, chan, focus, channelConfig,
-                    messageSinkManager, windowManager);
+                    tabCompleterFactory, messageSinkManager, windowManager);
 
             tabCompleter.addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.put(converter.toLowerCase(chan.getName()), newChan);