Pass TabCompleter into base class.

There's no sane reason for this to be an abstract method - instead
just create the tab completer and pass it up to WritableFrameContainer.

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

src/com/dmdirc/Channel.java

@@ -40,7 +40,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.ui.Colour;
 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;
@@ -78,8 +77,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
     private ChannelInfo channelInfo;
     /** The server this channel is on. */
     private final Server server;
-    /** The tabcompleter used for this channel. */
-    private final TabCompleter tabCompleter;
     /** A list of previous topics we've seen. */
     private final RollingList<Topic> topics;
     /** Our event handler. */
@@ -122,6 +119,9 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 new ChannelCommandParser(newServer, commandController),
+                tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
+                        configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
+                        CommandType.TYPE_CHAT),
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
@@ -146,9 +146,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
         showModePrefix = getConfigManager().getOptionBool("channel", "showmodeprefix");
         showColours = getConfigManager().getOptionBool("ui", "shownickcoloursintext");
 
-        tabCompleter = tabCompleterFactory.getTabCompleter(server.getTabCompleter(),
-                getConfigManager(), CommandType.TYPE_CHANNEL, CommandType.TYPE_CHAT);
-
         eventHandler = new ChannelEventHandler(this, eventBus);
 
         registerCallbacks();
@@ -166,11 +163,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
         return channelInfo;
     }
 
-    @Override
-    public TabCompleter getTabCompleter() {
-        return tabCompleter;
-    }
-
     @Override
     public boolean isOnChannel() {
         return isOnChannel;
@@ -359,7 +351,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
     public void addClient(final ChannelClientInfo client) {
         listenerList.getCallable(NicklistListener.class).clientAdded(client);
 
-        tabCompleter.addEntry(TabCompletionType.CHANNEL_NICK, client.getClient().getNickname());
+        getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK,
+                client.getClient().getNickname());
     }
 
     /**
@@ -370,7 +363,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
     public void removeClient(final ChannelClientInfo client) {
         listenerList.getCallable(NicklistListener.class).clientRemoved(client);
 
-        tabCompleter.removeEntry(TabCompletionType.CHANNEL_NICK, client.getClient().getNickname());
+        getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK,
+                client.getClient().getNickname());
 
         if (client.getClient().equals(server.getParser().getLocalClient())) {
             resetWindow();
@@ -385,10 +379,11 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
     public void setClients(final Collection<ChannelClientInfo> clients) {
         listenerList.getCallable(NicklistListener.class).clientListUpdated(clients);
 
-        tabCompleter.clear(TabCompletionType.CHANNEL_NICK);
+        getTabCompleter().clear(TabCompletionType.CHANNEL_NICK);
 
         for (ChannelClientInfo client : clients) {
-            tabCompleter.addEntry(TabCompletionType.CHANNEL_NICK, client.getClient().getNickname());
+            getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK,
+                    client.getClient().getNickname());
         }
     }
 
@@ -399,8 +394,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
      * @param newName The new nickname of the client
      */
     public void renameClient(final String oldName, final String newName) {
-        tabCompleter.removeEntry(TabCompletionType.CHANNEL_NICK, oldName);
-        tabCompleter.addEntry(TabCompletionType.CHANNEL_NICK, newName);
+        getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK, oldName);
+        getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK, newName);
         refreshClients();
     }
 

src/com/dmdirc/FrameContainer.java

@@ -436,8 +436,7 @@ public abstract class FrameContainer {
                     timestamp),
                     myLine,});
             } else {
-                lines.add(new String[]{
-                    myLine,});
+                lines.add(new String[]{myLine});
             }
 
             ActionManager.getActionManager().triggerEvent(

src/com/dmdirc/GlobalWindow.java

@@ -33,7 +33,6 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 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.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
@@ -48,9 +47,6 @@ import javax.inject.Singleton;
  */
 public class GlobalWindow extends WritableFrameContainer {
 
-    /** The tab completer we use. */
-    private final TabCompleter tabCompleter;
-
     /**
      * Creates a new instance of GlobalWindow.
      *
@@ -66,16 +62,13 @@ public class GlobalWindow extends WritableFrameContainer {
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder) {
-        super("icon", "Global", "(Global)", config, parser, messageSinkManager, urlBuilder,
+        super("icon", "Global", "(Global)", config, parser,
+                tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
+                messageSinkManager,
+                urlBuilder,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
-
-        tabCompleter = tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL);
-    }
-
-    public TabCompleter getTabCompleter() {
-        return tabCompleter;
     }
 
     @Override

src/com/dmdirc/MessageTarget.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 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.util.URLBuilder;
 
 import java.util.Collection;
@@ -42,6 +43,7 @@ public abstract class MessageTarget extends WritableFrameContainer {
      * @param title              The title of this target
      * @param config             The config manager to use for this target
      * @param parser             The command parser for this container
+     * @param tabCompleter       The tab completer to use
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param urlBuilder         The URL builder to use when finding icons.
      * @param components         The UI components that this frame requires
@@ -54,10 +56,12 @@ public abstract class MessageTarget extends WritableFrameContainer {
             final String title,
             final AggregateConfigProvider config,
             final CommandParser parser,
+            final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final Collection<String> components) {
-        super(icon, name, title, config, parser, messageSinkManager, urlBuilder, components);
+        super(icon, name, title, config, parser, tabCompleter, messageSinkManager, urlBuilder,
+                components);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -43,7 +43,6 @@ import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
@@ -71,8 +70,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
     private String host;
     /** The nickname of the client associated with this query. */
     private String nickname;
-    /** The tab completer for the query window. */
-    private final TabCompleter tabCompleter;
 
     /**
      * Creates a new instance of Query.
@@ -93,7 +90,11 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final URLBuilder urlBuilder) {
         super("query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
-                newServer.getConfigManager(), new QueryCommandParser(newServer, commandController),
+                newServer.getConfigManager(),
+                new QueryCommandParser(newServer, commandController),
+                tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
+                        newServer.getConfigManager(),
+                        CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
@@ -104,9 +105,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         this.host = newHost;
         this.nickname = server.parseHostmask(host)[0];
 
-        tabCompleter = tabCompleterFactory.getTabCompleter(server.getTabCompleter(),
-                getConfigManager(), CommandType.TYPE_QUERY, CommandType.TYPE_CHAT);
-
         if (!server.getState().isDisconnected()) {
             reregister();
         }
@@ -114,11 +112,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         updateTitle();
     }
 
-    @Override
-    public TabCompleter getTabCompleter() {
-        return tabCompleter;
-    }
-
     @Override
     public void sendLine(final String line) {
         sendLine(line, getNickname());

src/com/dmdirc/Raw.java

@@ -33,7 +33,6 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
@@ -67,6 +66,7 @@ public class Raw extends WritableFrameContainer
             final URLBuilder urlBuilder) {
         super("raw", "Raw", "(Raw log)", newServer.getConfigManager(),
                 new ServerCommandParser(newServer.getConfigManager(), commandController),
+                newServer.getTabCompleter(),
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
@@ -129,9 +129,4 @@ public class Raw extends WritableFrameContainer
         return server.getMaxLineLength();
     }
 
-    @Override
-    public TabCompleter getTabCompleter() {
-        return server.getTabCompleter();
-    }
-
 }

src/com/dmdirc/Server.java

@@ -57,7 +57,6 @@ import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 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.Formatter;
@@ -139,8 +138,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     private final Object myStateLock = new Object();
     /** The current state of this server. */
     private final ServerStatus myState = new ServerStatus(this, myStateLock);
-    /** The tabcompleter used for this server. */
-    private final TabCompleter tabCompleter;
     /** Our reason for being away, if any. */
     private String awayMessage;
     /** Our event handler. */
@@ -232,6 +229,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 getHost(uri),
                 configMigrator.getConfigProvider(),
                 commandParser,
+                tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),
+                        CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL),
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
@@ -254,9 +253,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
         setConnectionDetails(uri, profile);
 
-        tabCompleter = tabCompleterFactory.getTabCompleter(getConfigManager(),
-                CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL);
-
         updateIcon();
 
         getConfigManager().addChangeListener("formatter", "serverName", this);
@@ -537,7 +533,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             ActionManager.getActionManager().triggerEvent(
                     CoreActionType.QUERY_OPENED, null, newQuery);
 
-            tabCompleter.addEntry(TabCompletionType.QUERY_NICK, nick);
+            getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);
         }
 
@@ -546,8 +542,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
     @Override
     public void updateQuery(final Query query, final String oldNick, final String newNick) {
-        tabCompleter.removeEntry(TabCompletionType.QUERY_NICK, oldNick);
-        tabCompleter.addEntry(TabCompletionType.QUERY_NICK, newNick);
+        getTabCompleter().removeEntry(TabCompletionType.QUERY_NICK, oldNick);
+        getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, newNick);
 
         queries.put(converter.toLowerCase(newNick), query);
         queries.remove(converter.toLowerCase(oldNick));
@@ -560,7 +556,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
     @Override
     public void delQuery(final Query query) {
-        tabCompleter.removeEntry(TabCompletionType.QUERY_NICK, query.getNickname());
+        getTabCompleter().removeEntry(TabCompletionType.QUERY_NICK, query.getNickname());
         queries.remove(converter.toLowerCase(query.getNickname()));
     }
 
@@ -588,7 +584,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
     @Override
     public void delChannel(final String chan) {
-        tabCompleter.removeEntry(TabCompletionType.CHANNEL, chan);
+        getTabCompleter().removeEntry(TabCompletionType.CHANNEL, chan);
         channels.remove(converter.toLowerCase(chan));
     }
 
@@ -621,7 +617,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             windowManager.addWindow(this, newChan, focus);
             eventBus.post(new ChannelOpenedEvent(newChan));
 
-            tabCompleter.addEntry(TabCompletionType.CHANNEL, chan.getName());
+            getTabCompleter().addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.put(converter.toLowerCase(chan.getName()), newChan);
         }
 
@@ -1009,11 +1005,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         return awayMessage;
     }
 
-    @Override
-    public TabCompleter getTabCompleter() {
-        return tabCompleter;
-    }
-
     @Override
     public ServerState getState() {
         return myState.getState();

src/com/dmdirc/WritableFrameContainer.java

@@ -48,6 +48,8 @@ public abstract class WritableFrameContainer extends FrameContainer {
     protected final CommandParser commandParser;
     /** The manager to use to despatch messages to sinks. */
     private final MessageSinkManager messageSinkManager;
+    /** The tab completer to use. */
+    private final TabCompleter tabCompleter;
 
     /**
      * Creates a new WritableFrameContainer.
@@ -57,6 +59,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @param title              The title of this container
      * @param config             The config manager for this container
      * @param parser             The command parser for this container
+     * @param tabCompleter       The tab completer to use.
      * @param messageSinkManager The sink manager to use to despatch messages
      * @param urlBuilder         The URL builder to use when finding icons.
      * @param components         The UI components that this frame requires
@@ -69,12 +72,14 @@ public abstract class WritableFrameContainer extends FrameContainer {
             final String title,
             final AggregateConfigProvider config,
             final CommandParser parser,
+            final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final Collection<String> components) {
         super(icon, name, title, config, urlBuilder, components);
 
         this.commandParser = parser;
+        this.tabCompleter = tabCompleter;
         this.messageSinkManager = messageSinkManager;
         parser.setOwner(this);
     }
@@ -100,7 +105,9 @@ public abstract class WritableFrameContainer extends FrameContainer {
      *
      * @return This container's tab completer
      */
-    public abstract TabCompleter getTabCompleter();
+    public TabCompleter getTabCompleter() {
+        return tabCompleter;
+    }
 
     /**
      * Returns the maximum length that a line passed to sendLine() should be, in order to prevent it

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -34,7 +34,7 @@ import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
 
 public class TestWritableFrameContainer extends WritableFrameContainer {
 
@@ -44,7 +44,9 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager, final URLBuilder urlBuilder) {
         super("raw", "Raw", "(Raw)", cm,
-                new GlobalCommandParser(cm, commandManager), messageSinkManager, urlBuilder,
+                new GlobalCommandParser(cm, commandManager),
+                new TabCompleter(mock(CommandController.class), cm),
+                messageSinkManager, urlBuilder,
                 Collections.<String>emptySet());
 
         this.lineLength = lineLength;
@@ -65,8 +67,4 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
         return null;
     }
 
-    @Override
-    public TabCompleter getTabCompleter() {
-        return new TabCompleter(mock(CommandController.class), getConfigManager());
-    }
 }