Remove WritableFrameContainer.

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

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.activewindow;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -69,10 +68,9 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final TextFrame frame = activeFrameManager.getActiveFrame();
-        if (frame.getContainer() instanceof WritableFrameContainer) {
-            ((WritableFrameContainer) frame.getContainer()).getCommandParser()
-                    .parseCommand(frame.getContainer(),
-                            args.getArgumentsAsString());
+        if (frame.getContainer().isWritable()) {
+            frame.getContainer().getCommandParser().parseCommand(frame.getContainer(),
+                    args.getArgumentsAsString());
         }
     }
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.activewindow;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.messages.MessageSink;
@@ -60,10 +60,10 @@ public class ActiveWindowMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager despatcher,
-            final WritableFrameContainer source, final String[] patternMatches,
+            final FrameContainer source, final String[] patternMatches,
             final Date date, final String messageType, final Object... args) {
         final TextFrame frame = activeFrameManager.getActiveFrame();
-        if (frame.getContainer() instanceof WritableFrameContainer) {
+        if (frame.getContainer().isWritable()) {
             frame.getContainer().addLine(messageType, date, args);
         }
     }

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.conditional_execute;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -237,9 +236,8 @@ public class ConditionalExecuteCommand extends Command {
                         "You can't run commands and manipulate the namespace at the same time, ignored.");
             } else {
                 // Command to run!
-                if (namespace.canRun(inverse) && origin instanceof WritableFrameContainer) {
-                    ((WritableFrameContainer) origin).getCommandParser().parseCommand(origin, args.
-                            getArgumentsAsString(i++));
+                if (namespace.canRun(inverse) && origin.isWritable()) {
+                    origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(i++));
                 }
                 return;
             }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -57,7 +56,7 @@ public class DCCCommandParser extends GlobalCommandParser {
      */
     @Override
     protected void handleNonCommand(final FrameContainer origin, final String line) {
-        ((WritableFrameContainer) origin).sendLine(line);
+        origin.sendLine(line);
     }
 
     @Override

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -35,7 +35,7 @@ import java.util.Collection;
 /**
  * This class links DCC objects to a window.
  */
-public abstract class DCCFrameContainer extends WritableFrameContainer {
+public abstract class DCCFrameContainer extends FrameContainer {
 
     /** The Window we're using. */
     private boolean windowClosing = false;
@@ -61,9 +61,9 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
             final Collection<String> components) {
-        super(icon, title, title, configManager, parser,
+        super(icon, title, title, configManager, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(configManager),
-                messageSinkManager, urlBuilder,
+                messageSinkManager,
                 components);
     }
 

src/com/dmdirc/addons/debug/commands/Time.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
@@ -70,7 +69,6 @@ public class Time extends DebugCommand implements IntelligentCommand {
      * Facilitates timing of a command.
      *
      * @param origin The origin of the command
-     * @param window The window to be passed on to the timed command, if any
      * @param args   The arguments that were passed to the command
      */
     private void doTime(final FrameContainer origin,
@@ -80,11 +78,9 @@ public class Time extends DebugCommand implements IntelligentCommand {
             return;
         }
 
-        if (origin instanceof WritableFrameContainer) {
-            final WritableFrameContainer container = (WritableFrameContainer) origin;
+        if (origin.isWritable()) {
             final long start = System.currentTimeMillis();
-            container.getCommandParser().parseCommand(origin,
-                    args.getArgumentsAsString(0));
+            origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(0));
             final long end = System.currentTimeMillis();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                     "Command executed in " + (end - start) + " milliseconds.");

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -83,12 +82,12 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final WritableFrameContainer target = ((ChatCommandContext) context).getChat();
-        if (args.getArguments().length > 0 && args.getArguments()[0]
-                .equalsIgnoreCase("--sources")) {
+        final FrameContainer target = ((ChatCommandContext) context).getChat();
+        if (args.getArguments().length > 0
+                && args.getArguments()[0].equalsIgnoreCase("--sources")) {
             doSourceList(origin, args.isSilent(), args.getArgumentsAsString(1));
-        } else if (args.getArguments().length > 0 && args.getArguments()[0]
-                .equalsIgnoreCase("--source")) {
+        } else if (args.getArguments().length > 0
+                && args.getArguments()[0].equalsIgnoreCase("--source")) {
             if (args.getArguments().length > 1) {
                 final String sourceName = args.getArguments()[1];
                 final MediaSource source = manager.getSource(sourceName);

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.redirect;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.messages.Formatter;
@@ -34,10 +34,10 @@ import java.util.Date;
 /**
  * Implements a fake input window, which sends echoed text to the specified chat window instead.
  */
-public class FakeWriteableFrameContainer extends WritableFrameContainer {
+public class FakeWriteableFrameContainer extends FrameContainer {
 
     /** The target for this window. */
-    private final WritableFrameContainer target;
+    private final FrameContainer target;
 
     /**
      * Creates a new instance of FakeInputWindow.
@@ -47,13 +47,13 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
      * @param urlBuilder         The URL builder to use when finding icons.
      */
     public FakeWriteableFrameContainer(
-            final WritableFrameContainer target,
+            final FrameContainer target,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder) {
         super(target.getIcon(), target.getName(), target.getTitle(),
-                target.getConfigManager(), target.getCommandParser(),
+                target.getConfigManager(), urlBuilder, target.getCommandParser(),
                 target.getTabCompleter(), messageSinkManager,
-                urlBuilder, Collections.<String>emptyList());
+                Collections.<String>emptyList());
         this.target = target;
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.redirect;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -75,7 +74,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final WritableFrameContainer target = ((ChatCommandContext) context).getChat();
+        final FrameContainer target = ((ChatCommandContext) context).getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
                 target, messageSinkManager, urlBuilder), args.getArgumentsAsString());
     }

src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterResult;
@@ -42,7 +42,7 @@ public class BashStyle implements TabCompletionStyle {
     /** The tab completer that we use. */
     protected final TabCompleter tabCompleter;
     /** The input window that we use. */
-    protected final WritableFrameContainer window;
+    protected final FrameContainer window;
 
     /**
      * Creates a new Bash-style tab completer.
@@ -50,7 +50,7 @@ public class BashStyle implements TabCompletionStyle {
      * @param completer The tab completer this style is for
      * @param window    The window this tab style is for
      */
-    public BashStyle(final TabCompleter completer, final WritableFrameContainer window) {
+    public BashStyle(final TabCompleter completer, final FrameContainer window) {
         this.tabCompleter = completer;
         this.window = window;
     }

src/com/dmdirc/addons/tabcompletion_bash/BashStylePlugin.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
@@ -43,7 +43,7 @@ public class BashStylePlugin extends BasePlugin {
      */
     @Exported
     public TabCompletionStyle getCompletionStyle(final TabCompleter completer,
-            final WritableFrameContainer window) {
+            final FrameContainer window) {
         return new BashStyle(completer, window);
     }
 

src/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.tabcompletion_mirc;
 
 import com.dmdirc.Channel;
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterResult;
@@ -42,7 +42,7 @@ public class MircStyle implements TabCompletionStyle {
     /** The tab completer that we use. */
     protected final TabCompleter tabCompleter;
     /** The input window that we use. */
-    protected final WritableFrameContainer window;
+    protected final FrameContainer window;
 
     /**
      * Creates a new mIRC-style tab completer.
@@ -50,7 +50,7 @@ public class MircStyle implements TabCompletionStyle {
      * @param completer The tab completer this style is for
      * @param window    The window this tab style is for
      */
-    public MircStyle(final TabCompleter completer, final WritableFrameContainer window) {
+    public MircStyle(final TabCompleter completer, final FrameContainer window) {
         this.tabCompleter = completer;
         this.window = window;
     }
@@ -61,7 +61,7 @@ public class MircStyle implements TabCompletionStyle {
             final AdditionalTabTargets additional) {
 
         final String word = original.substring(start, end);
-        String target = "";
+        final String target;
         if (word.equals(lastWord)) {
             final TabCompleterResult res = tabCompleter.complete(tabString, additional);
             Collections.sort(res.getResults(), String.CASE_INSENSITIVE_ORDER);

src/com/dmdirc/addons/tabcompletion_mirc/MircStylePlugin.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.tabcompletion_mirc;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
@@ -43,7 +43,7 @@ public class MircStylePlugin extends BasePlugin {
      */
     @Exported
     public TabCompletionStyle getCompletionStyle(final TabCompleter completer,
-            final WritableFrameContainer window) {
+            final FrameContainer window) {
         return new MircStyle(completer, window);
     }
 

src/com/dmdirc/addons/time/TimedCommand.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.time;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
@@ -104,7 +103,7 @@ public class TimedCommand extends TimerTask {
         if (origin == null) {
             parser = new GlobalCommandParser(origin.getConfigManager(), commandController);
         } else {
-            parser = ((WritableFrameContainer) origin).getCommandParser();
+            parser = origin.getCommandParser();
         }
 
         parser.parseCommand(origin, command);

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrameFactory;
@@ -104,8 +103,7 @@ public class SwingWindowFactory implements FrameListener {
                 new WindowProvider() {
                     @Override
                     public TextFrame getWindow(final FrameContainer container) {
-                        return customInputFrameFactory.getCustomInputFrame(
-                                (WritableFrameContainer) container);
+                        return customInputFrameFactory.getCustomInputFrame(container);
                     }
                 });
         registerImplementation(

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.commandparser.PopupType;
@@ -61,7 +60,7 @@ public class ComponentInputFrame extends InputTextFrame {
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final URLBuilder urlBuilder,
-            final WritableFrameContainer owner) {
+            final FrameContainer owner) {
         super(deps, inputFieldProvider, owner);
         this.controller = deps.controller;
         this.urlBuilder = urlBuilder;

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.util.annotations.factory.Factory;
@@ -52,7 +52,7 @@ public class CustomInputFrame extends InputTextFrame {
     public CustomInputFrame(
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
-            @Unbound final WritableFrameContainer owner) {
+            @Unbound final FrameContainer owner) {
         super(deps, inputFieldProvider, owner);
 
         initComponents();

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;
@@ -112,7 +112,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     public InputTextFrame(
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
-            final WritableFrameContainer owner) {
+            final FrameContainer owner) {
         super(owner, owner.getCommandParser(), deps);
 
         this.config = owner.getConfigManager();
@@ -168,8 +168,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         inputHandler = new SwingInputHandler(pluginManager, inputField, commandController,
                 getContainer().getCommandParser(), getContainer(), eventBus);
         inputHandler.addValidationListener(inputField);
-        inputHandler.setTabCompleter(((WritableFrameContainer) frameParent).
-                getTabCompleter());
+        inputHandler.setTabCompleter(frameParent.getTabCompleter());
 
         getInputField().addMouseListener(this);
 
@@ -215,18 +214,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 "ctrl V"), "paste");
     }
 
-    /**
-     * Returns the container associated with this frame.
-     *
-     * @return This frame's container.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public WritableFrameContainer getContainer() {
-        return (WritableFrameContainer) super.
-                getContainer();
-    }
-
     /**
      * Returns the input handler associated with this frame.
      *

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -66,7 +66,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             final InputField target,
             final CommandController commandController,
             final CommandParser commandParser,
-            final WritableFrameContainer parentWindow,
+            final FrameContainer parentWindow,
             final EventBus eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
     }

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_web.uicomponents;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputField;
@@ -42,7 +42,7 @@ public class WebInputHandler extends InputHandler {
             final InputField target,
             final CommandController commandController,
             final CommandParser commandParser,
-            final WritableFrameContainer parentWindow,
+            final FrameContainer parentWindow,
             final EventBus eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
     }

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_web.uicomponents;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_web.Client;
 import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.commandparser.parsers.CommandParser;
@@ -37,26 +37,19 @@ import java.util.Map;
  */
 public class WebInputWindow extends WebWindow implements InputWindow {
 
-    private final WritableFrameContainer container;
     private final CommandParser commandparser;
     private final WebInputHandler inputHandler;
     private final Map<Client, WebInputHandler> inputHandlers = new HashMap<>();
     private final WebInterfaceUI controller;
 
     public WebInputWindow(final WebInterfaceUI controller,
-            final WritableFrameContainer parent, final String id) {
+            final FrameContainer parent, final String id) {
         super(controller, parent, id);
-        this.container = parent;
         this.commandparser = parent.getCommandParser();
         this.controller = controller;
         this.inputHandler = new WebInputHandler(controller.getPluginManager(),
                 new WebInputField(), controller.getCommandController(),
-                commandparser, getContainer(), controller.getEventBus());
-    }
-
-    @Override
-    public WritableFrameContainer getContainer() {
-        return container;
+                commandparser, parent, controller.getEventBus());
     }
 
     @Override

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -83,6 +83,7 @@ public class WebWindow implements Window, IRCDocumentListener,
         return id;
     }
 
+    @Override
     public FrameContainer getContainer() {
         return container;
     }

test/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommandTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.conditional_execute;
 
-import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
@@ -47,7 +47,7 @@ public class ConditionalExecuteCommandTest {
 
     @Mock private CommandController commandController;
     @Mock private CommandParser commandParser;
-    @Mock private WritableFrameContainer container;
+    @Mock private FrameContainer container;
     @Mock private CommandContext context;
     private ConditionalExecuteCommand command;
 
@@ -56,6 +56,7 @@ public class ConditionalExecuteCommandTest {
         when(commandController.getCommandChar()).thenReturn('/');
         when(commandController.getSilenceChar()).thenReturn('/');
         when(container.getCommandParser()).thenReturn(commandParser);
+        when(container.isWritable()).thenReturn(true);
 
         command = new ConditionalExecuteCommand(commandController);
     }

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.redirect;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.global.Echo;
@@ -34,6 +33,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
 import org.junit.Before;
@@ -44,7 +44,11 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RedirectCommandTest {
@@ -52,9 +56,10 @@ public class RedirectCommandTest {
     @Mock private MessageTarget target;
     @Mock private InputWindow inputWindow;
     @Mock private CommandController commandController;
-    @Mock private WritableFrameContainer frameContainer;
+    @Mock private FrameContainer frameContainer;
     @Mock private AggregateConfigProvider configProvider;
     @Mock private CommandParser commandParser;
+    @Mock private TabCompleter tabCompleter;
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private WindowManager windowManager;
     @Mock private URLBuilder urlBuilder;
@@ -66,6 +71,7 @@ public class RedirectCommandTest {
         when(inputWindow.getContainer()).thenReturn(frameContainer);
         when(target.getConfigManager()).thenReturn(configProvider);
         when(target.getCommandParser()).thenReturn(commandParser);
+        when(target.getTabCompleter()).thenReturn(tabCompleter);
         when(configProvider.hasOptionString("formatter", "commandOutput")).thenReturn(true);
         when(configProvider.getOption("formatter", "commandOutput")).thenReturn("%1$s");
         doAnswer(new Answer<Void>() {