Remove WritableFrameContainer.

Move the functionality down into just FrameContainer. Callers can use
isWritable() to determine if the FrameContainer is writable, instead
of horrible instanceof/casting logic.

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

src/com/dmdirc/FrameContainer.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameComponentChangeListener;
@@ -31,14 +32,20 @@ import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
 
+import com.google.common.base.Optional;
+
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -48,6 +55,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import static com.google.common.base.Preconditions.checkState;
+
 /**
  * The frame container implements basic methods that should be present in all objects that handle a
  * frame.
@@ -84,6 +93,26 @@ public abstract class FrameContainer {
     private final Object documentSync = new Object();
     /** The icon manager to use for this container. */
     private final IconManager iconManager;
+    /** Whether or not this container is writable. */
+    private final boolean writable;
+    /**
+     * The command parser used for commands in this container.
+     * <p>
+     * Only defined if this container is {@link #writable}.
+     */
+    private final Optional<CommandParser> commandParser;
+    /**
+     * The manager to use to despatch messages to sinks.
+     * <p>
+     * Only defined if this container is {@link #writable}.
+     */
+    private final Optional<MessageSinkManager> messageSinkManager;
+    /**
+     * The tab completer to use.
+     * <p>
+     * Only defined if this container is {@link #writable}.
+     */
+    private final Optional<TabCompleter> tabCompleter;
 
     /**
      * Instantiate new frame container.
@@ -109,6 +138,49 @@ public abstract class FrameContainer {
         this.title = title;
         this.components = new HashSet<>(components);
         this.iconManager = new IconManager(configManager, urlBuilder);
+        this.writable = false;
+        this.commandParser = Optional.absent();
+        this.tabCompleter = Optional.absent();
+        this.messageSinkManager = Optional.absent();
+
+        setIcon(icon);
+    }
+
+    /**
+     * Instantiate new frame container that accepts user input.
+     *
+     * @param icon               The icon to use for this container
+     * @param name               The name of this container
+     * @param title              The title of this container
+     * @param config             The config manager for this container
+     * @param urlBuilder         The URL builder to use when finding icons.
+     * @param commandParser      The command parser to use for input.
+     * @param tabCompleter       The tab completer to use.
+     * @param messageSinkManager The manager to use to despatch notifications.
+     * @param components         The UI components that this frame requires
+     *
+     * @since 0.6.4
+     */
+    protected FrameContainer(
+            final String icon,
+            final String name,
+            final String title,
+            final AggregateConfigProvider config,
+            final URLBuilder urlBuilder,
+            final CommandParser commandParser,
+            final TabCompleter tabCompleter,
+            final MessageSinkManager messageSinkManager,
+            final Collection<String> components) {
+        this.configManager = config;
+        this.name = name;
+        this.title = title;
+        this.components = new HashSet<>(components);
+        this.iconManager = new IconManager(configManager, urlBuilder);
+        this.writable = true;
+        this.commandParser = Optional.of(commandParser);
+        this.tabCompleter = Optional.of(tabCompleter);
+        this.messageSinkManager = Optional.of(messageSinkManager);
+        commandParser.setOwner(this);
 
         setIcon(icon);
     }
@@ -137,6 +209,10 @@ public abstract class FrameContainer {
         return configManager;
     }
 
+    public boolean isWritable() {
+        return writable;
+    }
+
     /**
      * Returns a collection of direct children of this frame.
      *
@@ -522,6 +598,204 @@ public abstract class FrameContainer {
         listeners.remove(FrameInfoListener.class, listener);
     }
 
+    /**
+     * Sends a line of text to this container's source.
+     *
+     * @param line The line to be sent
+     */
+    public void sendLine(final String line) {
+        throw new UnsupportedOperationException("Container doesn't override sendLine");
+    }
+
+    /**
+     * Retrieves the command parser to be used for this container.
+     *
+     * @return This container's command parser
+     */
+    public CommandParser getCommandParser() {
+        checkState(writable);
+        return commandParser.get();
+    }
+
+    /**
+     * Retrieves the tab completer which should be used for this cotnainer.
+     *
+     * @return This container's tab completer
+     */
+    public TabCompleter getTabCompleter() {
+        checkState(writable);
+        return tabCompleter.get();
+    }
+
+    /**
+     * Returns the maximum length that a line passed to sendLine() should be, in order to prevent it
+     * being truncated or causing protocol violations.
+     *
+     * @return The maximum line length for this container
+     */
+    public int getMaxLineLength() {
+        throw new UnsupportedOperationException("Container doesn't override getMaxLineLength");
+    }
+
+    /**
+     * Splits the specified line into chunks that contain a number of bytes less than or equal to
+     * the value returned by {@link #getMaxLineLength()}.
+     *
+     * @param line The line to be split
+     *
+     * @return An ordered list of chunks of the desired length
+     */
+    protected List<String> splitLine(final String line) {
+        final List<String> result = new ArrayList<>();
+
+        if (line.indexOf('\n') > -1) {
+            for (String part : line.split("\n")) {
+                result.addAll(splitLine(part));
+            }
+        } else {
+            final StringBuilder remaining = new StringBuilder(line);
+
+            while (getMaxLineLength() > -1 && remaining.toString().getBytes().length
+                    > getMaxLineLength()) {
+                int number = Math.min(remaining.length(), getMaxLineLength());
+
+                while (remaining.substring(0, number).getBytes().length > getMaxLineLength()) {
+                    number--;
+                }
+
+                result.add(remaining.substring(0, number));
+                remaining.delete(0, number);
+            }
+
+            result.add(remaining.toString());
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns the number of lines that the specified string would be sent as.
+     *
+     * @param line The string to be split and sent
+     *
+     * @return The number of lines required to send the specified string
+     */
+    public final int getNumLines(final String line) {
+        final String[] splitLines = line.split("(\n|\r\n|\r)", Integer.MAX_VALUE);
+        int lines = 0;
+
+        for (String splitLine : splitLines) {
+            if (getMaxLineLength() <= 0) {
+                lines++;
+            } else {
+                lines += (int) Math.ceil(splitLine.getBytes().length
+                        / (double) getMaxLineLength());
+            }
+        }
+
+        return lines;
+    }
+
+    /**
+     * Processes and displays a notification.
+     *
+     * @param messageType The name of the formatter to be used for the message
+     * @param args        The arguments for the message
+     *
+     * @return True if any further behaviour should be executed, false otherwise
+     */
+    public boolean doNotification(final String messageType, final Object... args) {
+        return doNotification(new Date(), messageType, args);
+    }
+
+    /**
+     * Processes and displays a notification.
+     *
+     * @param date        The date/time at which the event occured
+     * @param messageType The name of the formatter to be used for the message
+     * @param args        The arguments for the message
+     *
+     * @return True if any further behaviour should be executed, false otherwise
+     */
+    public boolean doNotification(final Date date, final String messageType, final Object... args) {
+        final List<Object> messageArgs = new ArrayList<>();
+        final List<Object> actionArgs = new ArrayList<>();
+        final StringBuffer buffer = new StringBuffer(messageType);
+
+        actionArgs.add(this);
+
+        for (Object arg : args) {
+            actionArgs.add(arg);
+
+            if (!processNotificationArg(arg, messageArgs)) {
+                messageArgs.add(arg);
+            }
+        }
+
+        modifyNotificationArgs(actionArgs, messageArgs);
+
+        handleNotification(date, buffer.toString(), messageArgs.toArray());
+
+        return true;
+    }
+
+    /**
+     * Allows subclasses to modify the lists of arguments for notifications.
+     *
+     * @param actionArgs  The list of arguments to be passed to the actions system
+     * @param messageArgs The list of arguments to be passed to the formatter
+     */
+    protected void modifyNotificationArgs(final List<Object> actionArgs,
+            final List<Object> messageArgs) {
+        // Do nothing
+    }
+
+    /**
+     * Allows subclasses to process specific types of notification arguments.
+     *
+     * @param arg  The argument to be processed
+     * @param args The list of arguments that any data should be appended to
+     *
+     * @return True if the arg has been processed, false otherwise
+     */
+    protected boolean processNotificationArg(final Object arg, final List<Object> args) {
+        return false;
+    }
+
+    /**
+     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
+     * select where the notifications should go in their config.
+     *
+     * @param messageType The type of message that is being sent
+     * @param args        The arguments for the message
+     */
+    public void handleNotification(final String messageType, final Object... args) {
+        handleNotification(new Date(), messageType, args);
+    }
+
+    /**
+     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
+     * select where the notifications should go in their config.
+     *
+     * @param date        The date/time at which the event occured
+     * @param messageType The type of message that is being sent
+     * @param args        The arguments for the message
+     */
+    public void handleNotification(final Date date, final String messageType, final Object... args) {
+        checkState(writable);
+        messageSinkManager.get().despatchMessage(this, date, messageType, args);
+    }
+
+    /**
+     * Sets the composition state for the local user for this chat.
+     *
+     * @param state The new composition state
+     */
+    public void setCompositionState(final CompositionState state) {
+        // Default implementation does nothing. Subclasses that support
+        // composition should override this.
+    }
+
     /**
      * Updates the icon of this frame if its config setting is changed.
      */

src/com/dmdirc/GlobalWindow.java

@@ -45,7 +45,7 @@ import javax.inject.Singleton;
 /**
  * A window which can be used to execute global commands.
  */
-public class GlobalWindow extends WritableFrameContainer {
+public class GlobalWindow extends FrameContainer {
 
     /**
      * Creates a new instance of GlobalWindow.
@@ -62,10 +62,9 @@ public class GlobalWindow extends WritableFrameContainer {
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder) {
-        super("icon", "Global", "(Global)", config, parser,
+        super("icon", "Global", "(Global)", config, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager,
-                urlBuilder,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/MessageTarget.java

@@ -33,7 +33,7 @@ import java.util.Collection;
 /**
  * Defines common methods for objects that you can send messages to (such as channels and queries).
  */
-public abstract class MessageTarget extends WritableFrameContainer {
+public abstract class MessageTarget extends FrameContainer {
 
     /**
      * Creates a new MessageTarget.
@@ -60,7 +60,7 @@ public abstract class MessageTarget extends WritableFrameContainer {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final Collection<String> components) {
-        super(icon, name, title, config, parser, tabCompleter, messageSinkManager, urlBuilder,
+        super(icon, name, title, config, urlBuilder, parser, tabCompleter, messageSinkManager,
                 components);
     }
 

src/com/dmdirc/Raw.java

@@ -45,8 +45,7 @@ import java.util.Date;
  * server).
  */
 @Factory(inject = true, providers = true, singleton = true)
-public class Raw extends WritableFrameContainer
-        implements DataInListener, DataOutListener {
+public class Raw extends FrameContainer implements DataInListener, DataOutListener {
 
     /** The server object that's being monitored. */
     private final Server server;
@@ -64,11 +63,10 @@ public class Raw extends WritableFrameContainer
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder) {
-        super("raw", "Raw", "(Raw log)", newServer.getConfigManager(),
+        super("raw", "Raw", "(Raw log)", newServer.getConfigManager(), urlBuilder,
                 new ServerCommandParser(newServer.getConfigManager(), commandController),
                 newServer.getTabCompleter(),
                 messageSinkManager,
-                urlBuilder,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/Server.java

@@ -99,7 +99,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * queries, etc, and handles parser callbacks pertaining to the server.
  */
 @Factory(inject = true, singleton = true, providers = true, name = "ServerFactoryImpl")
-public class Server extends WritableFrameContainer implements ConfigChangeListener,
+public class Server extends FrameContainer implements ConfigChangeListener,
         CertificateProblemListener, Connection {
 
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(Server.class);
@@ -228,11 +228,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 getHost(uri),
                 getHost(uri),
                 configMigrator.getConfigProvider(),
+                urlBuilder,
                 commandParser,
                 tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),
                         CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL),
                 messageSinkManager,
-                urlBuilder,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier(),

src/com/dmdirc/WritableFrameContainer.java

@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc;
-
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.messages.MessageSinkManager;
-import com.dmdirc.parser.common.CompositionState;
-import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.util.URLBuilder;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-/**
- * The writable frame container adds additional methods to the frame container class that allow the
- * sending of lines back to whatever the container's data source is (e.g. an IRC channel or server).
- */
-public abstract class WritableFrameContainer extends FrameContainer {
-
-    /** The name of the server notification target. */
-    protected static final String NOTIFICATION_SERVER = "server";
-    /** The name of the channel notification target. */
-    protected static final String NOTIFICATION_CHANNEL = "channel";
-    /** The command parser used for commands in this container. */
-    private 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.
-     *
-     * @param icon               The icon to use for this container
-     * @param name               The name of this container
-     * @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
-     *
-     * @since 0.6.4
-     */
-    public WritableFrameContainer(
-            final String icon,
-            final String name,
-            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);
-    }
-
-    /**
-     * Sends a line of text to this container's source.
-     *
-     * @param line The line to be sent
-     */
-    public abstract void sendLine(String line);
-
-    /**
-     * Retrieves the command parser to be used for this container.
-     *
-     * @return This container's command parser
-     */
-    public CommandParser getCommandParser() {
-        return commandParser;
-    }
-
-    /**
-     * Retrieves the tab completer which should be used for this cotnainer.
-     *
-     * @return This container's tab completer
-     */
-    public TabCompleter getTabCompleter() {
-        return tabCompleter;
-    }
-
-    /**
-     * Returns the maximum length that a line passed to sendLine() should be, in order to prevent it
-     * being truncated or causing protocol violations.
-     *
-     * @return The maximum line length for this container
-     */
-    public abstract int getMaxLineLength();
-
-    /**
-     * Splits the specified line into chunks that contain a number of bytes less than or equal to
-     * the value returned by {@link #getMaxLineLength()}.
-     *
-     * @param line The line to be split
-     *
-     * @return An ordered list of chunks of the desired length
-     */
-    protected List<String> splitLine(final String line) {
-        final List<String> result = new ArrayList<>();
-
-        if (line.indexOf('\n') > -1) {
-            for (String part : line.split("\n")) {
-                result.addAll(splitLine(part));
-            }
-        } else {
-            final StringBuilder remaining = new StringBuilder(line);
-
-            while (getMaxLineLength() > -1 && remaining.toString().getBytes().length
-                    > getMaxLineLength()) {
-                int number = Math.min(remaining.length(), getMaxLineLength());
-
-                while (remaining.substring(0, number).getBytes().length > getMaxLineLength()) {
-                    number--;
-                }
-
-                result.add(remaining.substring(0, number));
-                remaining.delete(0, number);
-            }
-
-            result.add(remaining.toString());
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns the number of lines that the specified string would be sent as.
-     *
-     * @param line The string to be split and sent
-     *
-     * @return The number of lines required to send the specified string
-     */
-    public final int getNumLines(final String line) {
-        final String[] splitLines = line.split("(\n|\r\n|\r)", Integer.MAX_VALUE);
-        int lines = 0;
-
-        for (String splitLine : splitLines) {
-            if (getMaxLineLength() <= 0) {
-                lines++;
-            } else {
-                lines += (int) Math.ceil(splitLine.getBytes().length
-                        / (double) getMaxLineLength());
-            }
-        }
-
-        return lines;
-    }
-
-    /**
-     * Processes and displays a notification.
-     *
-     * @param messageType The name of the formatter to be used for the message
-     * @param args        The arguments for the message
-     *
-     * @return True if any further behaviour should be executed, false otherwise
-     */
-    public boolean doNotification(final String messageType, final Object... args) {
-        return doNotification(new Date(), messageType, args);
-    }
-
-    /**
-     * Processes and displays a notification.
-     *
-     * @param date        The date/time at which the event occured
-     * @param messageType The name of the formatter to be used for the message
-     * @param args        The arguments for the message
-     *
-     * @return True if any further behaviour should be executed, false otherwise
-     */
-    public boolean doNotification(final Date date, final String messageType, final Object... args) {
-        final List<Object> messageArgs = new ArrayList<>();
-        final List<Object> actionArgs = new ArrayList<>();
-        final StringBuffer buffer = new StringBuffer(messageType);
-
-        actionArgs.add(this);
-
-        for (Object arg : args) {
-            actionArgs.add(arg);
-
-            if (!processNotificationArg(arg, messageArgs)) {
-                messageArgs.add(arg);
-            }
-        }
-
-        modifyNotificationArgs(actionArgs, messageArgs);
-
-        handleNotification(date, buffer.toString(), messageArgs.toArray());
-
-        return true;
-    }
-
-    /**
-     * Allows subclasses to modify the lists of arguments for notifications.
-     *
-     * @param actionArgs  The list of arguments to be passed to the actions system
-     * @param messageArgs The list of arguments to be passed to the formatter
-     */
-    protected void modifyNotificationArgs(final List<Object> actionArgs,
-            final List<Object> messageArgs) {
-        // Do nothing
-    }
-
-    /**
-     * Allows subclasses to process specific types of notification arguments.
-     *
-     * @param arg  The argument to be processed
-     * @param args The list of arguments that any data should be appended to
-     *
-     * @return True if the arg has been processed, false otherwise
-     */
-    protected boolean processNotificationArg(final Object arg, final List<Object> args) {
-        return false;
-    }
-
-    /**
-     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
-     * select where the notifications should go in their config.
-     *
-     * @param messageType The type of message that is being sent
-     * @param args        The arguments for the message
-     */
-    public void handleNotification(final String messageType, final Object... args) {
-        handleNotification(new Date(), messageType, args);
-    }
-
-    /**
-     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
-     * select where the notifications should go in their config.
-     *
-     * @param date        The date/time at which the event occured
-     * @param messageType The type of message that is being sent
-     * @param args        The arguments for the message
-     */
-    public void handleNotification(final Date date, final String messageType, final Object... args) {
-        messageSinkManager.despatchMessage(this, date, messageType, args);
-    }
-
-    /**
-     * Sets the composition state for the local user for this chat.
-     *
-     * @param state The new composition state
-     */
-    public void setCompositionState(final CompositionState state) {
-        // Default implementation does nothing. Subclasses that support
-        // composition should override this.
-    }
-
-}

src/com/dmdirc/actions/ActionModel.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -149,12 +149,12 @@ public class ActionModel {
             return false;
         }
 
-        WritableFrameContainer container = null;
+        FrameContainer container = null;
         CommandParser cp;
 
-        if (arguments.length > 0
-                && arguments[0] instanceof WritableFrameContainer) {
-            container = (WritableFrameContainer) arguments[0];
+        if (arguments.length > 0 && arguments[0] instanceof FrameContainer
+                && ((FrameContainer) arguments[0]).isWritable()) {
+            container = (FrameContainer) arguments[0];
         } else if (serverManager.numServers() > 0) {
             container = serverManager.getServers().get(0);
         }

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -23,7 +23,6 @@
 package com.dmdirc.actions.wrappers;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionGroup;
@@ -91,9 +90,8 @@ public class AliasWrapper extends ActionGroup {
                 aliases.add(commandName);
 
                 for (FrameContainer root : windowManager.getRootWindows()) {
-                    if (root instanceof WritableFrameContainer) {
-                        ((WritableFrameContainer) root).getTabCompleter()
-                                .addEntry(TabCompletionType.COMMAND, commandName);
+                    if (root.isWritable()) {
+                        root.getTabCompleter().addEntry(TabCompletionType.COMMAND, commandName);
                     }
                 }
             } else {
@@ -116,9 +114,8 @@ public class AliasWrapper extends ActionGroup {
             aliases.remove(commandName);
 
             for (FrameContainer root : windowManager.getRootWindows()) {
-                if (root instanceof WritableFrameContainer) {
-                    ((WritableFrameContainer) root).getTabCompleter()
-                            .removeEntry(TabCompletionType.COMMAND, commandName);
+                if (root.isWritable()) {
+                    root.getTabCompleter().removeEntry(TabCompletionType.COMMAND, commandName);
                 }
             }
         }

src/com/dmdirc/commandparser/commands/IntelligentCommand.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
@@ -53,14 +53,21 @@ public interface IntelligentCommand {
     @SuppressWarnings("PMD.UnusedPrivateField")
     class IntelligentCommandContext {
 
-        public IntelligentCommandContext(final WritableFrameContainer window,
+        /** The window the command is being entered in. */
+        private final FrameContainer window;
+        /** The previously supplied arguments, if any. */
+        private final List<String> previousArgs;
+        /** The partially typed word, if any. */
+        private final String partial;
+
+        public IntelligentCommandContext(final FrameContainer window,
                 final List<String> previousArgs, final String partial) {
             this.window = window;
             this.previousArgs = previousArgs;
             this.partial = partial;
         }
 
-        public WritableFrameContainer getWindow() {
+        public FrameContainer getWindow() {
             return window;
         }
 
@@ -71,12 +78,6 @@ public interface IntelligentCommand {
         public String getPartial() {
             return partial;
         }
-        /** The window the command is being entered in. */
-        private final WritableFrameContainer window;
-        /** The previously supplied arguments, if any. */
-        private final List<String> previousArgs;
-        /** The partially typed word, if any. */
-        private final String partial;
 
     }
 

src/com/dmdirc/commandparser/commands/ValidatingCommand.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.util.validators.ValidationResponse;
 
@@ -42,7 +42,6 @@ public interface ValidatingCommand {
      *
      * @since 0.6.3m1
      */
-    ValidationResponse validateArguments(WritableFrameContainer origin,
-            CommandArguments arguments);
+    ValidationResponse validateArguments(FrameContainer origin, CommandArguments arguments);
 
 }

src/com/dmdirc/commandparser/commands/WrappableCommand.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 
 /**
@@ -40,6 +40,6 @@ public interface WrappableCommand {
      *
      * @since 0.6.3m1
      */
-    int getLineCount(WritableFrameContainer origin, CommandArguments arguments);
+    int getLineCount(FrameContainer origin, CommandArguments arguments);
 
 }

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.chat;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -72,7 +71,7 @@ public class Me extends Command implements ValidatingCommand {
 
     @Override
     public ValidationResponse validateArguments(
-            final WritableFrameContainer origin,
+            final FrameContainer origin,
             final CommandArguments arguments) {
         if (origin.getConnection() == null
                 || origin.getConnection().getParser() == null) {

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -82,8 +81,8 @@ public class Help extends Command implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      */
     private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
-        final List<String> commands = new ArrayList<>(((WritableFrameContainer) origin)
-                .getCommandParser().getCommands().keySet());
+        final List<String> commands = new ArrayList<>(origin.getCommandParser()
+                .getCommands().keySet());
 
         Collections.sort(commands);
 

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -95,12 +94,11 @@ public class Ifplugin extends Command implements IntelligentCommand {
         }
 
         if (result != negative) {
-            if (origin == null) {
+            if (origin == null || !origin.isWritable()) {
                 globalCommandParserProvider.get()
                         .parseCommand(null, args.getArgumentsAsString(1));
             } else {
-                ((WritableFrameContainer) origin).getCommandParser()
-                        .parseCommand(origin, args.getArgumentsAsString(1));
+                origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(1));
             }
         }
     }

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -113,8 +112,7 @@ public class Message extends Command implements IntelligentCommand,
     }
 
     @Override
-    public int getLineCount(final WritableFrameContainer origin,
-            final CommandArguments arguments) {
+    public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
             return ((Server) origin.getConnection()).getNumLines("PRIVMSG "

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -110,8 +109,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
     }
 
     @Override
-    public int getLineCount(final WritableFrameContainer origin,
-            final CommandArguments arguments) {
+    public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
             return ((Server) origin.getConnection()).getNumLines("PRIVMSG "

src/com/dmdirc/interfaces/ui/InputWindow.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces.ui;
 
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.InputHandler;
 
 /**
@@ -38,12 +37,4 @@ public interface InputWindow extends Window {
      */
     InputHandler getInputHandler();
 
-    /**
-     * Retrieves the container that owns this command window.
-     *
-     * @return The container that owns this command window.
-     */
-    @Override
-    WritableFrameContainer getContainer();
-
 }

src/com/dmdirc/messages/AllMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -42,7 +42,7 @@ public class AllMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         source.getConnection().addLineToAll(messageType, date, args);

src/com/dmdirc/messages/ChannelMessageSink.java

@@ -23,7 +23,7 @@
 package com.dmdirc.messages;
 
 import com.dmdirc.Channel;
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -45,7 +45,7 @@ public class ChannelMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String user = String.format(patternMatches[0], args);

src/com/dmdirc/messages/CommonChanelsMessageSink.java

@@ -23,7 +23,7 @@
 package com.dmdirc.messages;
 
 import com.dmdirc.Channel;
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -46,7 +46,7 @@ public class CommonChanelsMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String user = String.format(patternMatches[0], args);

src/com/dmdirc/messages/CustomWindowMessageSink.java

@@ -25,7 +25,6 @@ package com.dmdirc.messages;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.URLBuilder;
 
@@ -64,7 +63,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         FrameContainer targetWindow = windowManager

src/com/dmdirc/messages/ForkMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -42,7 +42,7 @@ public class ForkMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         for (String target : patternMatches[0].split("\\|")) {

src/com/dmdirc/messages/FormatMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -42,7 +42,7 @@ public class FormatMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         despatcher.despatchMessage(source, date, patternMatches[0], patternMatches[1], args);

src/com/dmdirc/messages/GroupMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -45,7 +45,7 @@ public class GroupMessageSink implements MessageSink {
     /** {@inheritDoc} */
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String target;

src/com/dmdirc/messages/LastCommandMessageSink.java

@@ -24,7 +24,6 @@ package com.dmdirc.messages;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -49,7 +48,7 @@ public class LastCommandMessageSink implements MessageSink {
     /** {@inheritDoc} */
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final Object[] escapedargs = new Object[args.length];
@@ -60,7 +59,7 @@ public class LastCommandMessageSink implements MessageSink {
 
         final String command = String.format(patternMatches[0], escapedargs);
 
-        WritableFrameContainer best = source;
+        FrameContainer best = source;
         long besttime = 0;
 
         final List<FrameContainer> containers = new ArrayList<>();
@@ -69,15 +68,14 @@ public class LastCommandMessageSink implements MessageSink {
         containers.addAll(((Server) source.getConnection()).getChildren());
 
         for (FrameContainer container : containers) {
-            if (!(container instanceof WritableFrameContainer)) {
+            if (!container.isWritable()) {
                 continue;
             }
 
-            final long time = ((WritableFrameContainer) container)
-                    .getCommandParser().getCommandTime(command);
+            final long time = container.getCommandParser().getCommandTime(command);
             if (time > besttime) {
                 besttime = time;
-                best = (WritableFrameContainer) container;
+                best = container;
             }
         }
 

src/com/dmdirc/messages/MessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -52,7 +52,7 @@ public interface MessageSink {
      * @param args           The message arguments
      */
     void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args);
 

src/com/dmdirc/messages/MessageSinkManager.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.WindowManager;
@@ -73,8 +73,8 @@ public class MessageSinkManager {
      * @param messageType The type (or 'format') of the message
      * @param args        The message arguments
      */
-    public void despatchMessage(final WritableFrameContainer source,
-            final Date date, final String messageType, final Object... args) {
+    public void despatchMessage(final FrameContainer source, final Date date,
+            final String messageType, final Object... args) {
         final String target;
         if (source.getConfigManager().hasOptionString(CONFIG_DOMAIN, messageType)) {
             target = source.getConfigManager().getOption(CONFIG_DOMAIN, messageType);
@@ -94,7 +94,7 @@ public class MessageSinkManager {
      * @param targetSink  The textual representation of the destination sink
      * @param args        The message arguments
      */
-    public void despatchMessage(final WritableFrameContainer source,
+    public void despatchMessage(final FrameContainer source,
             final Date date, final String messageType, final String targetSink,
             final Object... args) {
         for (MessageSink sink : sinks) {

src/com/dmdirc/messages/NullMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -44,7 +44,7 @@ public class NullMessageSink implements MessageSink {
     /** {@inheritDoc} */
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         // Do nothing

src/com/dmdirc/messages/SelfMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -44,7 +44,7 @@ public class SelfMessageSink implements MessageSink {
     /** {@inheritDoc} */
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         source.addLine(messageType, date, args);

src/com/dmdirc/messages/ServerMessageSink.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.messages;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -45,7 +45,7 @@ public class ServerMessageSink implements MessageSink {
     /** {@inheritDoc} */
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         ((Server) source.getConnection()).addLine(messageType, date, args);

src/com/dmdirc/messages/StatusBarMessageSink.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.messages;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.messages.Formatter;
@@ -58,7 +58,7 @@ public class StatusBarMessageSink implements MessageSink {
     /** {@inheritDoc} */
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source,
+            final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String message = Formatter.formatMessage(source.getConfigManager(),

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.commands.Command;
@@ -97,7 +97,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     /** The CommandParser to use for our input. */
     protected final CommandParser commandParser;
     /** The frame that we belong to. */
-    protected final WritableFrameContainer parentWindow;
+    protected final FrameContainer parentWindow;
     /** The tab completion style. */
     protected TabCompletionStyle style;
     /** Our listener list. */
@@ -128,7 +128,7 @@ public abstract class InputHandler implements ConfigChangeListener {
             final InputField target,
             final CommandController commandController,
             final CommandParser commandParser,
-            final WritableFrameContainer parentWindow,
+            final FrameContainer parentWindow,
             final EventBus eventBus) {
         buffer = new RollingList<>(parentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -251,7 +251,7 @@ public class TabCompleter {
      * @since 0.6.4
      */
     private static AdditionalTabTargets getIntelligentResults(
-            final WritableFrameContainer window,
+            final FrameContainer window,
             final CommandArguments args, final String partial) {
         if (!args.isCommand()) {
             return null;
@@ -294,7 +294,7 @@ public class TabCompleter {
      * @since 0.6.4
      */
     public static AdditionalTabTargets getIntelligentResults(
-            final WritableFrameContainer window, final String text,
+            final FrameContainer window, final String text,
             final String partial) {
         return getIntelligentResults(window,
                 new CommandArguments(window.getCommandParser().getCommandManager(), text), partial);

test/com/dmdirc/ServerTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -30,6 +31,7 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
@@ -40,11 +42,13 @@ import java.util.concurrent.ScheduledExecutorService;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
 public class ServerTest {
@@ -58,6 +62,7 @@ public class ServerTest {
     @Mock private ParserFactory parserFactory;
     @Mock private IdentityFactory identityFactory;
     @Mock private TabCompleterFactory tabCompleterFactory;
+    @Mock private TabCompleter tabCompleter;
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private WindowManager windowManager;
     @Mock private ChannelFactory channelFactory;
@@ -75,6 +80,8 @@ public class ServerTest {
         MockitoAnnotations.initMocks(this);
         when(configManager.getOptionInt(anyString(), anyString())).thenReturn(Integer.MAX_VALUE);
         when(configMigrator.getConfigProvider()).thenReturn(configManager);
+        when(tabCompleterFactory.getTabCompleter(eq(configManager),
+                Matchers.<CommandType>anyVararg())).thenReturn(tabCompleter);
 
         server = new Server(
                 serverManager,

test/com/dmdirc/WritableFrameContainerTest.java

@@ -36,8 +36,9 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
 
 public class WritableFrameContainerTest {
 
@@ -60,7 +61,7 @@ public class WritableFrameContainerTest {
 
     @Test
     public void testGetNumLines() {
-        final WritableFrameContainer container10
+        final FrameContainer container10
                 = new TestWritableFrameContainer(10, acp, commands, messageSinkManager, urlBuilder);
 
         final int res0a = container10.getNumLines("");
@@ -90,7 +91,7 @@ public class WritableFrameContainerTest {
 
     @Test
     public void testSplitLine() {
-        final WritableFrameContainer container10
+        final FrameContainer container10
                 = new TestWritableFrameContainer(10, acp, commands, messageSinkManager, urlBuilder);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.harness;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
@@ -36,17 +36,17 @@ import java.util.Collections;
 
 import static org.mockito.Mockito.mock;
 
-public class TestWritableFrameContainer extends WritableFrameContainer {
+public class TestWritableFrameContainer extends FrameContainer {
 
     private final int lineLength;
 
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager, final URLBuilder urlBuilder) {
-        super("raw", "Raw", "(Raw)", cm,
+        super("raw", "Raw", "(Raw)", cm, urlBuilder,
                 new GlobalCommandParser(cm, commandManager),
                 new TabCompleter(mock(CommandController.class), cm),
-                messageSinkManager, urlBuilder,
+                messageSinkManager,
                 Collections.<String>emptySet());
 
         this.lineLength = lineLength;