And some more.

activewindow/test/com/dmdirc/addons/activewindow/ActiveCommandTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.activewindow;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.commandparser.CommandArguments;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandCo
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
 import java.util.Optional;
@@ -52,7 +52,7 @@ public class ActiveCommandTest {
     @Mock private CommandController commandController;
     @Mock private ActiveFrameManager activeFrameManager;
     @Mock private TabCompleterUtils tabCompleterUtils;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private TextFrame textFrame;
     @Mock private CommandArguments commandArguments;
     @Mock private CommandContext commandContext;

activewindow/test/com/dmdirc/addons/activewindow/ActiveWindowMessageSinkTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.activewindow;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Date;
@@ -48,7 +48,7 @@ public class ActiveWindowMessageSinkTest {
     private static final Pattern PATTERN = Pattern.compile("active");
     @Mock private ActiveFrameManager activeFrameManager;
     @Mock private MessageSinkManager messageSinkManager;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private TextFrame textFrame;
     @Mock private Date date;
     private ActiveWindowMessageSink sink;

audio/test/com/dmdirc/addons/audio/BeepCommandTest.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.audio;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.awt.Toolkit;
 
@@ -42,7 +42,7 @@ public class BeepCommandTest {
 
     @Mock private Toolkit toolkit;
     @Mock private CommandController commandController;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private CommandArguments commandArguments;
     @Mock private CommandContext commandContext;
     private BeepCommand beepCommand;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.conditional_execute;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -239,8 +238,7 @@ public class ConditionalExecuteCommand extends Command {
             } else {
                 // Command to run!
                 if (namespace.canRun(inverse) && origin.isWritable()) {
-                    origin.getCommandParser().parseCommand((FrameContainer) origin,
-                            args.getArgumentsAsString(i));
+                    origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(i));
                 }
                 return;
             }

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.conditional_execute;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +47,7 @@ public class ConditionalExecuteCommandTest {
 
     @Mock private CommandController commandController;
     @Mock private CommandParser commandParser;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private CommandContext context;
     private ConditionalExecuteCommand command;
 

dcc/src/com/dmdirc/addons/dcc/ui/TransferPanel.java

@@ -23,13 +23,13 @@
 package com.dmdirc.addons.dcc.ui;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.DCCTransferHandler;
 import com.dmdirc.addons.dcc.TransferContainer;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.SwingFrameComponent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
@@ -86,7 +86,7 @@ public class TransferPanel extends JPanel implements ActionListener,
      * @param owner    The frame container that owns this frame
      * @param errorBus The event bus to post errors to
      */
-    public TransferPanel(final FrameContainer owner, final DMDircMBassador errorBus) {
+    public TransferPanel(final WindowModel owner, final DMDircMBassador errorBus) {
         this.transferContainer = (TransferContainer) owner;
         this.errorBus = errorBus;
         dcc = transferContainer.getDCC();

debug/src/com/dmdirc/addons/debug/Debug.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -36,10 +35,9 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
@@ -70,7 +68,7 @@ public class Debug extends Command implements IntelligentCommand {
     @Inject
     public Debug(
             final CommandController controller,
-            final Set<DebugCommand> subcommands) {
+            final Collection<DebugCommand> subcommands) {
         super(controller);
 
         this.controller = controller;
@@ -98,7 +96,7 @@ public class Debug extends Command implements IntelligentCommand {
                         Arrays.asList((controller.getCommandChar()
                                 + command.getName() + ' '
                                 + args.getArgumentsAsString(1)).split(" ")));
-                command.execute((FrameContainer) origin, newArgs, context);
+                command.execute(origin, newArgs, context);
             }
         }
     }
@@ -111,7 +109,7 @@ public class Debug extends Command implements IntelligentCommand {
      * @param type     The type of message to send
      * @param args     The arguments of the message
      */
-    public void proxySendLine(final FrameContainer target,
+    public void proxySendLine(final WindowModel target,
             final boolean isSilent, final String type, final Object... args) {
         sendLine(target, isSilent, type, args);
     }
@@ -124,7 +122,7 @@ public class Debug extends Command implements IntelligentCommand {
      * @param name     The name of the command that's raising the error
      * @param args     The arguments that the command accepts or expects
      */
-    public void proxyShowUsage(final FrameContainer target,
+    public void proxyShowUsage(final WindowModel target,
             final boolean isSilent, final String name, final String args) {
         showUsage(target, isSilent, INFO.getName(), name + ' ' + args);
     }
@@ -147,8 +145,8 @@ public class Debug extends Command implements IntelligentCommand {
      *
      * @return List of command names
      */
-    public List<String> getCommandNames() {
-        final List<String> names = new ArrayList<>(commands.size());
+    public Collection<String> getCommandNames() {
+        final Collection<String> names = new ArrayList<>(commands.size());
 
         names.addAll(commands.values().stream()
                 .map(DebugCommand::getName)

debug/src/com/dmdirc/addons/debug/DebugCommand.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Provider;
@@ -78,12 +78,11 @@ public abstract class DebugCommand {
 
     /**
      * Executes this command.
-     *
-     * @param origin  The container which received the command
+     *  @param origin  The container which received the command
      * @param args    Arguments passed to this command
      * @param context The context the command was executed in
      */
-    public abstract void execute(@Nonnull final FrameContainer origin,
+    public abstract void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context);
 
     /**
@@ -94,7 +93,7 @@ public abstract class DebugCommand {
      * @param type     The type of message to send
      * @param args     The arguments of the message
      */
-    public void sendLine(final FrameContainer target,
+    public void sendLine(final WindowModel target,
             final boolean isSilent, final String type, final Object... args) {
         commandProvider.get().proxySendLine(target, isSilent, type, args);
     }
@@ -107,7 +106,7 @@ public abstract class DebugCommand {
      * @param name     The name of the command that's raising the error
      * @param args     The arguments that the command accepts or expects
      */
-    public void showUsage(final FrameContainer target,
+    public void showUsage(final WindowModel target,
             final boolean isSilent, final String name, final String args) {
         commandProvider.get().proxyShowUsage(target, isSilent, name, args);
     }

debug/src/com/dmdirc/addons/debug/RawWindow.java

@@ -56,7 +56,7 @@ public class RawWindow extends FrameContainer {
             final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory) {
-        super((FrameContainer) connection.getWindowModel(), "raw", "Raw", "(Raw log)",
+        super(connection.getWindowModel(), "raw", "Raw", "(Raw log)",
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
                 new ServerCommandParser(

debug/src/com/dmdirc/addons/debug/RawWindowFactory.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.WindowManager;
@@ -59,7 +58,7 @@ public class RawWindowFactory {
     public RawWindow getRawWindow(final Connection connection) {
         final RawWindow rawWindow = new RawWindow(connection, commandController,
                 messageSinkManager, tabCompleterFactory,  backBufferFactory);
-        windowManager.addWindow((FrameContainer) connection.getWindowModel(), rawWindow);
+        windowManager.addWindow(connection.getWindowModel(), rawWindow);
         return rawWindow;
     }
 

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class Benchmark extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final long[] results = new long[10];
 

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -58,7 +58,7 @@ public class ColourSpam extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (int i = 0; i < 100; i++) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
 import javax.annotation.Nonnull;
@@ -59,7 +59,7 @@ public class ConfigInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.debug.commands;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.ClientLineAddedEvent;
 import com.dmdirc.events.DMDircEvent;
 import com.dmdirc.events.FrameClosingEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -86,7 +86,7 @@ public class EventBusViewer extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final boolean isGlobal = args.getArguments().length > 0
                 && "--global".equals(args.getArguments()[0]);
@@ -113,9 +113,9 @@ public class EventBusViewer extends DebugCommand {
     private static class WindowUpdater {
 
         private final DMDircMBassador eventBus;
-        private final FrameContainer target;
+        private final WindowModel target;
 
-        WindowUpdater(final DMDircMBassador eventBus, final FrameContainer target) {
+        WindowUpdater(final DMDircMBassador eventBus, final WindowModel target) {
             this.eventBus = eventBus;
             this.target = target;
         }
@@ -147,7 +147,7 @@ public class EventBusViewer extends DebugCommand {
                                 .append(method.getName().substring(3))
                                 .append(Styliser.CODE_UNDERLINE)
                                 .append('=')
-                                .append(method.invoke(event).toString());
+                                .append(method.invoke(event));
                     } catch (ReflectiveOperationException ex) {
                         // Ignore.
                     }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -70,7 +70,7 @@ public class FakeError extends DebugCommand implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if ((args.getArguments().length == 1
                 || args.getArguments().length == 2)

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.updater.checking.BaseCheckResult;
@@ -83,7 +83,7 @@ public class FakeUpdates extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         updateManager.addCheckStrategy(new FakeUpdateCheckStrategy());
         updateManager.addRetrievalStrategy(new FakeUpdateRetriever());

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

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.FirstRunEvent;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -66,7 +66,7 @@ public class FirstRun extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         eventBus.publish(new FirstRunEvent());
     }

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

@@ -24,11 +24,11 @@ package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.messages.Styliser;
@@ -88,7 +88,7 @@ public class ForceUpdate extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (globalConfig.getOptionBool("updater", "enable")) {
             UpdateChecker.checkNow(updateManager, identityController, eventBus,

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

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
@@ -69,7 +69,7 @@ public class GlobalConfigInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (ConfigProvider source : globalConfig.getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
@@ -68,7 +68,7 @@ public class Identities extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final String type;
 

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -58,7 +58,7 @@ public class MemInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Total Memory: "
                 + Runtime.getRuntime().totalMemory());

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.colours.Colour;
 
 import java.util.Optional;
@@ -61,7 +61,7 @@ public class Notify extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Colour> colour = origin.getUnreadStatusManager().getNotificationColour();
         if (colour.isPresent()) {

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -58,7 +58,7 @@ public class RunGC extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         System.gc();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -61,7 +61,7 @@ public class ServerInfo extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -61,7 +61,7 @@ public class ServerState extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.plugins.ServiceProvider;
@@ -70,7 +70,7 @@ public class Services extends DebugCommand implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Available Services:");
         for (Service service : serviceManager.getAllServices()) {

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.addons.debug.RawWindowFactory;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -63,7 +63,7 @@ public class ShowRaw extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Optional<Connection> connection = origin.getConnection();
         if (connection.isPresent()) {

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

@@ -24,12 +24,12 @@ package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 
@@ -76,7 +76,7 @@ public class StatusbarMessage extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         eventBus.publishAsync(new StatusBarMessageEvent(new StatusMessage(null,
                 "Test: " + args.getArgumentsAsString(), null, 5, globalConfig)));

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.util.Map.Entry;
@@ -61,7 +61,7 @@ public class Threads extends DebugCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         for (Entry<Thread, StackTraceElement[]> thread
                 : Thread.getAllStackTraces().entrySet()) {

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -61,7 +61,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         doTime(origin, args);
     }
@@ -72,7 +72,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
      * @param origin The origin of the command
      * @param args   The arguments that were passed to the command
      */
-    private void doTime(final FrameContainer origin,
+    private void doTime(final WindowModel origin,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), getName(), getUsage());

debug/test/com/dmdirc/addons/debug/DebugTest.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import com.google.common.collect.Sets;
 
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
 public class DebugTest {
 
     @Mock private CommandArguments arguments;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private CommandController controller;
     @Mock private DebugCommand debugCommand;
     @Mock private CommandContext commandContext;

logging/test/com/dmdirc/addons/logging/HistoryWindowTest.java

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -56,7 +56,7 @@ public class HistoryWindowTest {
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder configBinder;
     @Mock private Connection connection;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private DMDircMBassador eventBus;
     @Mock private BackBufferFactory backBufferFactory;
     private HistoryWindow instance;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -107,8 +106,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
                     if (source.getState() == MediaSourceState.CLOSED) {
                         sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source is not running.");
                     } else {
-                        target.getWindowModel().getCommandParser().parseCommand(
-                                (FrameContainer) origin,
+                        target.getWindowModel().getCommandParser().parseCommand(origin,
                                 getInformation(source, args.getArgumentsAsString(2)));
                     }
                 }
@@ -118,7 +116,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
             }
         } else {
             if (manager.hasRunningSource()) {
-                target.getWindowModel().getCommandParser().parseCommand((FrameContainer) origin,
+                target.getWindowModel().getCommandParser().parseCommand(origin,
                         getInformation(manager.getBestSource(), args.
                                 getArgumentsAsString(0)));
             } else {

parserdebug/src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -56,7 +56,7 @@ public class DebugWindow extends FrameContainer {
             final Connection connection,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super((FrameContainer) connection.getWindowModel(), "raw", "Parser Debug", title,
+        super(connection.getWindowModel(), "raw", "Parser Debug", title,
                 connection.getWindowModel().getConfigManager(), backBufferFactory,
                 eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.parserdebug;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.CallbackNotFoundException;
@@ -101,7 +100,7 @@ public class ParserDebugManager implements DebugInfoListener {
             parser.getCallbackManager().addCallback(DebugInfoListener.class, this);
             final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
                     connection, eventBus, backBufferFactory);
-            windowManager.addWindow((FrameContainer) connection.getWindowModel(), window);
+            windowManager.addWindow(connection.getWindowModel(), window);
             registeredParsers.put(parser, window);
             window.addLine("======================", new Date());
             window.addLine("Started Monitoring: " + parser, new Date());

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.redirect;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
@@ -39,13 +40,13 @@ import java.util.Optional;
 public class FakeWriteableFrameContainer extends FrameContainer {
 
     /** The target for this window. */
-    private final FrameContainer target;
+    private final WindowModel target;
 
     /**
      * Creates a new instance of FakeInputWindow.
      */
     public FakeWriteableFrameContainer(
-            final FrameContainer target,
+            final WindowModel target,
             final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.redirect;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -83,7 +82,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final Chat target = ((ChatCommandContext) context).getChat();
         target.getWindowModel().getCommandParser().parseCommand(
-                new FakeWriteableFrameContainer((FrameContainer) target.getWindowModel(),
+                new FakeWriteableFrameContainer(target.getWindowModel(),
                         messageSinkManager, eventBus, backBufferFactory),
                 args.getArgumentsAsString());
     }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionMatches;
@@ -43,7 +43,7 @@ public class BashStyle implements TabCompletionStyle {
     /** The tab completer that we use. */
     protected final TabCompleter tabCompleter;
     /** The input window that we use. */
-    protected final FrameContainer window;
+    protected final WindowModel window;
 
     /**
      * Creates a new Bash-style tab completer.
@@ -51,7 +51,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 FrameContainer window) {
+    public BashStyle(final TabCompleter completer, final WindowModel window) {
         this.tabCompleter = completer;
         this.window = window;
     }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 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 FrameContainer window) {
+            final WindowModel window) {
         return new BashStyle(completer, window);
     }
 

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.tabcompletion_mirc;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionMatches;
@@ -45,7 +45,7 @@ public class MircStyle implements TabCompletionStyle {
     /** The tab completer that we use. */
     protected final TabCompleter tabCompleter;
     /** The input window that we use. */
-    protected final FrameContainer window;
+    protected final WindowModel window;
 
     /**
      * Creates a new mIRC-style tab completer.
@@ -53,7 +53,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 FrameContainer window) {
+    public MircStyle(final TabCompleter completer, final WindowModel window) {
         this.tabCompleter = completer;
         this.window = window;
     }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.tabcompletion_mirc;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 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 FrameContainer window) {
+            final WindowModel window) {
         return new MircStyle(completer, window);
     }
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -37,7 +37,7 @@ public class TimedCommand extends TimerTask {
     /** The command to execute. */
     private final String command;
     /** The container to use for executing commands. */
-    private final FrameContainer origin;
+    private final WindowModel origin;
     /** The number of seconds between each execution. */
     private final int delay;
     /** The key for this timer in the Timer Manager. */
@@ -63,7 +63,7 @@ public class TimedCommand extends TimerTask {
             final int repetitions,
             final int delay,
             final String command,
-            final FrameContainer origin) {
+            final WindowModel origin) {
         this.timerKey = timerKey;
         this.repetitions = repetitions;
         this.command = command;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -114,7 +113,7 @@ public class TimerCommand extends Command implements IntelligentCommand {
             return;
         }
 
-        manager.addTimer(repetitions, interval, command, (FrameContainer) origin);
+        manager.addTimer(repetitions, interval, command, origin);
 
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
     }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,7 +55,7 @@ public class TimerManager {
      * @param origin      The frame container to use for the execution
      */
     public void addTimer(final int repetitions, final int interval,
-            final String command, final FrameContainer origin) {
+            final String command, final WindowModel origin) {
 
         synchronized (this) {
             final int timerKey = findFreeKey();

time/test/com/dmdirc/addons/time/TimedCommandTest.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Timer;
 
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
 public class TimedCommandTest {
 
     @Mock private TimerManager timerManager;
-    @Mock private FrameContainer origin;
+    @Mock private WindowModel origin;
     @Mock private CommandParser commandParser;
     @Mock private TimerFactory timerFactory;
     @Mock private Timer timer;

time/test/com/dmdirc/addons/time/TimerCommandTest.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import com.google.common.collect.ImmutableMap;
@@ -52,7 +52,7 @@ public class TimerCommandTest {
 
     @Mock private TimerManager timerManager;
     @Mock private CommandController commandController;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private CommandContext commandContext;
     @Mock private IntelligentCommandContext intelligentCommandContext;
     @Mock private CommandArguments commandArguments;

ui_swing/src/com/dmdirc/addons/ui_swing/commands/Input.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -74,10 +73,10 @@ public class Input extends Command implements IntelligentCommand {
                     "[--clear] <text to insert into inputfield");
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
-            ((InputWindow) windowFactory.getSwingWindow((FrameContainer) origin))
+            ((InputWindow) windowFactory.getSwingWindow(origin))
                     .getInputHandler().clearInputField();
         } else {
-            ((InputWindow) windowFactory.getSwingWindow((FrameContainer) origin))
+            ((InputWindow) windowFactory.getSwingWindow(origin))
                     .getInputHandler().addToInputField(args
                             .getArgumentsAsString());
         }

ui_swing/src/com/dmdirc/addons/ui_swing/commands/PopInCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -69,7 +68,7 @@ public class PopInCommand extends Command {
     public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         UIUtilities.invokeLater(() -> {
-            final TextFrame swingWindow = windowFactory.getSwingWindow((FrameContainer) origin);
+            final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
             if (swingWindow == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
                         + " currently no window to pop in.");

ui_swing/src/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -69,7 +68,7 @@ public class PopOutCommand extends Command {
     public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         UIUtilities.invokeLater(() -> {
-            final TextFrame swingWindow = windowFactory.getSwingWindow((FrameContainer) origin);
+            final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
             if (swingWindow == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
                         + " currently no window to pop out.");

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -162,9 +161,8 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
 
         final SwingInputHandler handler = new SwingInputHandler(
                 serviceManager, topicText, commandController,
-                channel.getWindowModel().getCommandParser(),
-                (FrameContainer) channel.getWindowModel(), tabCompleterUtils,
-                channel.getEventBus());
+                channel.getWindowModel().getCommandParser(), channel.getWindowModel(),
+                tabCompleterUtils, channel.getEventBus());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getWindowModel().getTabCompleter());
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
@@ -106,8 +105,7 @@ public final class ChannelFrame extends InputTextFrame {
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final TopicBarFactory topicBarFactory,
             final GroupChat owner) {
-        super(deps, inputFieldProvider, inputTextFramePasteActionFactory,
-                (FrameContainer) owner.getWindowModel());
+        super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner.getWindowModel());
 
         this.eventBus = deps.eventBus;
         this.globalConfig = deps.globalConfig;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ui.Window;
 
@@ -64,7 +63,7 @@ public class CommandAction extends AbstractAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
         for (String line : command.split("\n")) {
-            parser.parseCommand((FrameContainer) window.getContainer(), line);
+            parser.parseCommand(window.getContainer(), line);
         }
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.WindowModel;
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.WindowModel;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.interfaces.WindowModel;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
@@ -77,8 +76,7 @@ public final class ServerFrame extends InputTextFrame {
             final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider,
             final SSLCertificateDialogFactory sslDialogFactory,
             final Connection owner) {
-        super(deps, inputFieldProvider, inputTextFramePasteActionFactory,
-                (FrameContainer) owner.getWindowModel());
+        super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner.getWindowModel());
         this.sslDialogFactory = sslDialogFactory;
         this.dialogProvider = dialogProvider;
         this.connection = owner;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.DMDircMBassador;
-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;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -141,8 +140,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
         identity = identityFactory.createChannelConfig(groupChat.getConnection().get().getNetwork(),
                 groupChat.getName());
-        channelWindow = (InputWindow) windowFactory.getSwingWindow(
-                (FrameContainer) groupChat.getWindowModel());
+        channelWindow = (InputWindow) windowFactory.getSwingWindow(groupChat.getWindowModel());
 
         initComponents(tabCompleterUtils);
         initListeners();

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -311,11 +311,11 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             scroller = new TreeTreeScroller(swingEventBus, tree);
 
             for (WindowModel window : windowManager.getRootWindows()) {
-                addWindow(null, windowFactory.getSwingWindow((FrameContainer) window));
+                addWindow(null, windowFactory.getSwingWindow(window));
                 final Collection<WindowModel> childWindows = window.getChildren();
                 for (WindowModel childWindow : childWindows) {
-                    addWindow(nodes.get(windowFactory.getSwingWindow((FrameContainer) window)),
-                            windowFactory.getSwingWindow((FrameContainer) childWindow));
+                    addWindow(nodes.get(windowFactory.getSwingWindow(window)),
+                            windowFactory.getSwingWindow(childWindow));
                 }
             }