Tidy up some TabCompleter usages.

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

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

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.ui.input.TabCompleterFactory;
 
 import java.util.Arrays;
 
@@ -53,16 +54,19 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param title The title of this window
      * @param nick My Current Nickname
      * @param targetNick Nickname of target
+     * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager The sink manager to use to despatch messages.
      */
     public ChatContainer(final DCCChat dcc,
             final AggregateConfigProvider configManager,
             final CommandController commandController,
             final String title, final String nick, final String targetNick,
+            final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager) {
         super(title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager, commandController),
                 messageSinkManager,
+                tabCompleterFactory,
                 Arrays.asList(
                     WindowComponent.TEXTAREA.getIdentifier(),
                     WindowComponent.INPUTFIELD.getIdentifier()));

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

@@ -45,6 +45,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 
 import java.io.File;
@@ -72,6 +73,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
     private final WindowManager windowManager;
     /** The sink manager to use to despatch messages. */
     private final MessageSinkManager messageSinkManager;
+    /** The factory to use for tab completers. */
+    private final TabCompleterFactory tabCompleterFactory;
 
     /**
      * Creates a new instance of DCCCommand.
@@ -81,6 +84,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param plugin The DCC Plugin that this command belongs to
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
+     * @param tabCompleterFactory The factory to use for tab completers.
      */
     @Inject
     public DCCCommand(
@@ -88,12 +92,14 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final MainFrame mainFrame,
             final DCCManager plugin,
             final MessageSinkManager messageSinkManager,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final TabCompleterFactory tabCompleterFactory) {
         super(controller);
         this.mainFrame = mainFrame;
         myPlugin = plugin;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
+        this.tabCompleterFactory = tabCompleterFactory;
     }
 
     /** {@inheritDoc} */
@@ -160,7 +166,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
         final DCCChat chat = new DCCChat();
         if (myPlugin.listen(chat)) {
             final ChatContainer window = new ChatContainer(chat, origin.getConfigManager(),
-                    getController(), "*Chat: " + target, myNickname, target, messageSinkManager);
+                    getController(), "*Chat: " + target, myNickname, target, tabCompleterFactory,
+                    messageSinkManager);
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());

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

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.input.TabCompleterFactory;
 
 import java.util.Collection;
 
@@ -36,6 +37,9 @@ import java.util.Collection;
  */
 public abstract class DCCFrameContainer extends WritableFrameContainer {
 
+    /** The factory to use to create tab completers. */
+    private final TabCompleterFactory tabCompleterFactory;
+
     /** The Window we're using. */
     private boolean windowClosing = false;
 
@@ -47,13 +51,17 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      * @param configManager Config manager
      * @param parser Command parser to use for this window
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param tabCompleterFactory The factory to use to create tab completers.
      * @param components The UI components that this frame requires
      */
-    public DCCFrameContainer(final String title, final String icon,
+    public DCCFrameContainer(
+            final String title, final String icon,
             final AggregateConfigProvider configManager, final CommandParser parser,
             final MessageSinkManager messageSinkManager,
+            final TabCompleterFactory tabCompleterFactory,
             final Collection<String> components) {
         super(icon, title, title, configManager, parser, messageSinkManager, components);
+        this.tabCompleterFactory = tabCompleterFactory;
     }
 
     /** {@inheritDoc} */
@@ -71,7 +79,7 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
     /** {@inheritDoc} */
     @Override
     public TabCompleter getTabCompleter() {
-        return new TabCompleter();
+        return tabCompleterFactory.getTabCompleter(getConfigManager());
     }
 
     /**
@@ -79,7 +87,7 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      *
      * @return True if windowClosing has been called.
      */
-    public final boolean isWindowClosing() {
+    public boolean isWindowClosing() {
         return windowClosing;
     }
 

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

@@ -51,6 +51,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.input.TabCompleterFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -88,6 +89,8 @@ public class DCCManager implements ActionListener {
     private final WindowManager windowManager;
     /** The command controller to use. */
     private final CommandController commandController;
+    /** The factory to use for tab completers. */
+    private final TabCompleterFactory tabCompleterFactory;
     /** The configuration domain to use. */
     @Getter
     private final String domain;
@@ -101,6 +104,7 @@ public class DCCManager implements ActionListener {
      * @param commandController Command controller to register commands
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window Management
+     * @param tabCompleterFactory The factory to use for tab completers.
      */
     @Inject
     public DCCManager(
@@ -109,12 +113,14 @@ public class DCCManager implements ActionListener {
             final IdentityController identityController,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final TabCompleterFactory tabCompleterFactory) {
         this.identityController = identityController;
         this.controller = controller;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         this.commandController = commandController;
+        this.tabCompleterFactory = tabCompleterFactory;
         this.domain = pluginInfo.getDomain();
         config = controller.getGlobalConfig();
         this.pluginInfo = pluginInfo;
@@ -409,7 +415,8 @@ public class DCCManager implements ActionListener {
             final String myNickname = ((Server) arguments[0]).getParser()
                     .getLocalClient().getNickname();
             final DCCFrameContainer f = new ChatContainer(chat, config, commandController,
-                    "Chat: " + nickname, myNickname, nickname, messageSinkManager);
+                    "Chat: " + nickname, myNickname, nickname, tabCompleterFactory,
+                    messageSinkManager);
             windowManager.addWindow(getContainer(), f);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasPanel.java

@@ -86,7 +86,8 @@ public class AliasPanel extends JPanel implements ActionListener {
         actionFactory = controller.getActionFactory();
 
         command = new ValidatingTextFieldInputField(controller,
-                new ValidatorChain<>(new CommandNameValidator(),
+                new ValidatorChain<>(
+                new CommandNameValidator(controller.getCommandController().getCommandChar()),
                 new FileNameValidator()));
         command.setEnabled(false);
         //new SwingInputHandler(command, GlobalCommandParser