Use TabCompleterUtils instance.

activewindow/src/com/dmdirc/addons/activewindow/ActiveCommand.java

             + "executed in the active window", CommandType.TYPE_GLOBAL);
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
+    /** Tab-completer utilities. */
+    private final TabCompleterUtils tabUtils;
 
     /**
      * Creates a new active command.
      * @param activeFrameManager The active window manager
      */
     @Inject
-    public ActiveCommand(final CommandController controller,
-            final ActiveFrameManager activeFrameManager) {
+    public ActiveCommand(
+            final CommandController controller,
+            final ActiveFrameManager activeFrameManager,
+            final TabCompleterUtils tabUtils) {
         super(controller);
 
         this.activeFrameManager = activeFrameManager;
+        this.tabUtils = tabUtils;
     }
 
     @Override
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
-        return TabCompleterUtils.getIntelligentResults(arg, context, 0);
+        return tabUtils.getIntelligentResults(arg, context, 0);
     }
 
 }

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

             CommandType.TYPE_CHAT);
     /** Now playing manager to get and handle sources. */
     private final NowPlayingManager manager;
+    /** Tab-completer utilities. */
+    private final TabCompleterUtils tabCompleterUtils;
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** This plugin's settings domain. */
     public NowPlayingCommand(
             final CommandController controller,
             final NowPlayingManager manager,
+            final TabCompleterUtils tabCompleterUtils,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(NowPlayingPlugin.class) final String domain) {
         super(controller);
         this.manager = manager;
+        this.tabCompleterUtils = tabCompleterUtils;
         this.globalConfig = globalConfig;
         this.domain = domain;
     }
                 "$bitrate", "$format", "$length", "$state", "$time");
 
         if (arg == 0) {
-            final AdditionalTabTargets res = TabCompleterUtils.
+            final AdditionalTabTargets res = tabCompleterUtils.
                     getIntelligentResults(arg, context, 0);
             res.add("--sources");
             res.add("--source");
             }
             return res;
         } else if (arg > 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
-            final AdditionalTabTargets res = TabCompleterUtils
+            final AdditionalTabTargets res = tabCompleterUtils
                     .getIntelligentResults(arg, context, 2);
             res.addAll(subsList);
             return res;
         } else {
-            final AdditionalTabTargets res = TabCompleterUtils
+            final AdditionalTabTargets res = tabCompleterUtils
                     .getIntelligentResults(arg, context,
                             context.getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
             res.addAll(subsList);

redirect/src/com/dmdirc/addons/redirect/RedirectCommand.java

     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
     private final ColourManagerFactory colourManagerFactory;
+    /** Tab-completer utilities. */
+    private final TabCompleterUtils tabCompleterUtils;
 
     /**
      * Creates a new instance of this command.
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.colourManagerFactory = colourManagerFactory;
+        this.tabCompleterUtils = tabCompleterUtils;
     }
 
     @Override
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
-        return TabCompleterUtils.getIntelligentResults(arg, context, 0);
+        return tabCompleterUtils.getIntelligentResults(arg, context, 0);
     }
 
 }

redirect/test/com/dmdirc/addons/redirect/RedirectCommandTest.java

 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
     @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
     @Mock private ColourManagerFactory colourManagerFactory;
+    @Mock private TabCompleterUtils tabCompleterUtils;
 
     @Before
     public void setup() {
             @Override
             public Void answer(final InvocationOnMock invocation) throws Throwable {
                 new Echo(commandController, windowManager).execute(
-                        ((FrameContainer) invocation.getArguments()[0]),
+                        (FrameContainer) invocation.getArguments()[0],
                         new CommandArguments(commandController, "/echo test"),
                         null);
                 return null;
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager,
-                urlBuilder, eventBus, colourManagerFactory);
+                urlBuilder, eventBus, colourManagerFactory, tabCompleterUtils);
 
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBar.java

 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
             final Channel channel,
             final ChannelFrame window,
             final IconManager iconManager,
+            final TabCompleterUtils tabCompleterUtils,
             final DMDircMBassador eventBus) {
         this.channel = channel;
         this.domain = domain;
 
         final SwingInputHandler handler = new SwingInputHandler(
                 pluginManager, topicText, commandController, channel.getCommandParser(),
-                channel, channel.getEventBus());
+                channel, tabCompleterUtils, channel.getEventBus());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBarFactory.java

 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
     private final Clipboard clipboard;
     private final CommandController commandController;
     private final DMDircMBassador eventBus;
+    private final TabCompleterUtils tabCompleterUtils;
 
     @Inject
     public TopicBarFactory(
             final PluginManager pluginManager,
             final Clipboard clipboard,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final TabCompleterUtils tabCompleterUtils) {
         this.parentWindow = parentWindow;
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.clipboard = clipboard;
         this.commandController = commandController;
         this.eventBus = eventBus;
+        this.tabCompleterUtils = tabCompleterUtils;
     }
 
     public TopicBar getTopicBar(
         return new TopicBar(parentWindow.get(), globalConfig, domain,
                 colourManagerFactory.getColourManager(channel.getConfigManager()),
                 pluginManager, clipboard, commandController, channel, window, iconManager,
-                eventBus);
+                tabCompleterUtils, eventBus);
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.InputHandler;
+import com.dmdirc.ui.input.TabCompleterUtils;
 
 import java.awt.BorderLayout;
 import java.awt.Point;
         commandController = deps.commandController;
         eventBus = deps.eventBus;
 
-        initComponents(inputFieldProvider);
+        initComponents(inputFieldProvider, deps.tabCompleterUtils);
 
         if (!UIUtilities.isGTKUI()) {
             //GTK users appear to dislike choice, ignore them if they want some.
      *
      * @param inputFieldProvider The provider to use to create a new input field.
      */
-    private void initComponents(final Provider<SwingInputField> inputFieldProvider) {
+    private void initComponents(final Provider<SwingInputField> inputFieldProvider,
+            final TabCompleterUtils tabCompleterUtils) {
         inputField = inputFieldProvider.get();
         inputHandler = new SwingInputHandler(pluginManager, inputField, commandController,
-                getContainer().getCommandParser(), getContainer(), eventBus);
+                getContainer().getCommandParser(), getContainer(), tabCompleterUtils, eventBus);
         inputHandler.addValidationListener(inputField);
         inputHandler.setTabCompleter(frameParent.getTabCompleter());
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
         final CommandController commandController;
         final ColourManagerFactory colourManagerFactory;
         final SwingEventBus swingEventBus;
+        final TabCompleterUtils tabCompleterUtils;
 
         @Inject
         public TextFrameDependencies(
                 final Clipboard clipboard,
                 final CommandController commandController,
                 final ColourManagerFactory colourManagerFactory,
-                final SwingEventBus swingEventBus) {
+                final SwingEventBus swingEventBus,
+                final TabCompleterUtils tabCompleterUtils) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainWindow = mainWindow;
             this.commandController = commandController;
             this.colourManagerFactory = colourManagerFactory;
             this.swingEventBus = swingEventBus;
+            this.tabCompleterUtils = tabCompleterUtils;
         }
 
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
+import com.dmdirc.ui.input.TabCompleterUtils;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
             final CommandController commandController,
             final CommandParser commandParser,
             final FrameContainer parentWindow,
+            final TabCompleterUtils tabCompleterUtils,
             final DMDircMBassador eventBus) {
-        super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
+        super(serviceManager, target, commandController, commandParser, parentWindow,
+                tabCompleterUtils, eventBus);
         this.eventBus = eventBus;
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
             final Clipboard clipboard,
             final CommandController commandController,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.userConfig = checkNotNull(userConfig);
                 channel.getChannelInfo().getName());
         channelWindow = (InputWindow) windowFactory.getSwingWindow(channel);
 
-        initComponents();
+        initComponents(tabCompleterUtils);
         initListeners();
     }
 
     /** Initialises the main UI components. */
-    private void initComponents() {
+    private void initComponents(final TabCompleterUtils tabCompleterUtils) {
         tabbedPane = new JTabbedPane();
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         getContentPane().add(getLeftButton(), "split 3, right");
         getContentPane().add(getRightButton(), "right");
 
-        initTopicTab();
+        initTopicTab(tabCompleterUtils);
 
         initIrcTab();
 
     }
 
     /** Initialises the Topic tab. */
-    private void initTopicTab() {
+    private void initTopicTab(final TabCompleterUtils tabCompleterUtils) {
         topicModesPane = new TopicPane(channel, channel.getIconManager(),
                 commandController, serviceManager,
-                this, channelWindow, clipboard, eventBus, colourManagerFactory);
+                this, channelWindow, clipboard, eventBus, colourManagerFactory, tabCompleterUtils);
         tabbedPane.addTab("Topic", topicModesPane);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Color;
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
             final CommandController commandController, final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         this.clipboard = clipboard;
         this.channel = channel;
         this.parent = parent;
         this.eventBus = eventBus;
 
         initComponents(iconManager, channel.getConfigManager(), serviceManager, commandController,
-                colourManagerFactory);
+                colourManagerFactory, tabCompleterUtils);
         addListeners();
         layoutComponents();
 
             final AggregateConfigProvider config,
             final ServiceManager serviceManager,
             final CommandController commandController,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         topicLengthLabel = new JLabel();
         topicText = new TextAreaInputField(iconManager, colourManagerFactory, config, 100, 4);
         topicWho = new TextLabel();
         topicText.setColumns(30);
         final SwingInputHandler handler = new SwingInputHandler(serviceManager, topicText,
                 commandController, channel.getCommandParser(), channelWindow.getContainer(),
-                channel.getEventBus());
+                tabCompleterUtils, channel.getEventBus());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.datatransfer.Clipboard;
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.channel = channel;
         this.parent = parent;
         setVisible(false);
 
         removeAll();
-        initTopicsPanel(iconManager, serviceManager, commandController, eventBus, colourManagerFactory);
+        initTopicsPanel(iconManager, serviceManager, commandController, eventBus,
+                colourManagerFactory, tabCompleterUtils);
         layoutComponents();
 
         topicHistoryPane.addActionListener(this);
             final ServiceManager serviceManager,
             final CommandController commandController,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         topicDisplayPane = new TopicDisplayPane(channel, iconManager, serviceManager, parent,
-                channelWindow, clipboard, commandController, eventBus, colourManagerFactory);
+                channelWindow, clipboard, commandController, eventBus, colourManagerFactory,
+                tabCompleterUtils);
         topicHistoryPane = new TopicHistoryPane(channel);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
             final InputTextFrame newParent,
             final String text,
             final Window parentWindow,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         super(parentWindow, ModalityType.MODELESS);
 
         parent = newParent;
         this.pluginManager = pluginManager;
         this.commandController = commandController;
 
-        initComponents(eventBus, text, colourManagerFactory);
+        initComponents(eventBus, text, colourManagerFactory, tabCompleterUtils);
         initListeners();
 
         setFocusTraversalPolicy(new PasteDialogFocusTraversalPolicy(
      * @param text text to show in the dialog
      */
     private void initComponents(final DMDircMBassador eventBus, final String text,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         scrollPane = new JScrollPane();
         textField = new TextAreaInputField(iconManager, colourManagerFactory, config, text);
         editButton = new JButton("Edit");
 
         new SwingInputHandler(pluginManager, textField, commandController,
                 parent.getContainer().getCommandParser(),
-                parent.getContainer(), eventBus).setTypes(false, false, true, false);
+                parent.getContainer(), tabCompleterUtils, eventBus)
+                .setTypes(false, false, true,false);
 
         scrollPane.setViewportView(textField);
         scrollPane.setVisible(false);

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java

 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
     private final CommandController commandController;
     private final DMDircMBassador eventBus;
     private final ColourManagerFactory colourManagerFactory;
+    private final TabCompleterUtils tabCompleterUtils;
 
     @Inject
     public PasteDialogFactory(
             final PluginManager pluginManager,
             final CommandController commandController,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         this.iconManager = iconManager;
         this.config = config;
         this.pluginManager = pluginManager;
         this.commandController = commandController;
         this.eventBus = eventBus;
         this.colourManagerFactory = colourManagerFactory;
+        this.tabCompleterUtils = tabCompleterUtils;
     }
 
     public PasteDialog getPasteDialog(final InputTextFrame newParent, final String text,
             final Window parentWindow) {
         return new PasteDialog(iconManager, config, pluginManager, commandController, eventBus,
-                newParent, text, parentWindow, colourManagerFactory);
+                newParent, text, parentWindow, colourManagerFactory, tabCompleterUtils);
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

 import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.ui.core.feedback.CoreFeedbackDialogModel;
 import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
+import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
             final Clipboard clipboard,
             final CommandController commandController,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final ColourManagerFactory colourManagerFactory,
+            final TabCompleterUtils tabCompleterUtils) {
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
             @Override
             protected ChannelSettingsDialog getInstance(final Channel key) {
                 return new ChannelSettingsDialog(identityFactory, windowFactory,
                         userConfig, serviceManager, preferencesManager, compFactory, key,
-                        parentWindow, clipboard, commandController, eventBus, colourManagerFactory);
+                        parentWindow, clipboard, commandController, eventBus,
+                        colourManagerFactory, tabCompleterUtils);
             }
         };
     }