And some more.

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

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

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Wrapping commands are commands whose arguments may be wrapped into multiple lines when sending.
@@ -40,6 +40,6 @@ public interface WrappableCommand {
      *
      * @since 0.6.3m1
      */
-    int getLineCount(FrameContainer origin, CommandArguments arguments);
+    int getLineCount(WindowModel origin, CommandArguments arguments);
 
 }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.chat;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -73,7 +72,7 @@ public class Me extends Command implements ValidatingCommand {
 
     @Override
     public ValidationResponse validateArguments(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandArguments arguments) {
         final int length = 2 + arguments.getArgumentsAsString().length();
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -76,7 +75,7 @@ public class AllServers extends Command implements IntelligentCommand {
 
         for (Connection target : connectionManager.getConnections()) {
             target.getWindowModel().getCommandParser()
-                    .parseCommand((FrameContainer) target.getWindowModel(), command);
+                    .parseCommand(target.getWindowModel(), command);
         }
     }
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -107,8 +106,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
 
         if (result != negative) {
             if (origin.isWritable()) {
-                origin.getCommandParser().parseCommand(
-                        (FrameContainer) origin, args.getArgumentsAsString(1));
+                origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(1));
             } else {
                 globalCommandParserProvider.get()
                         .parseCommand(globalWindowProvider.get(), args.getArgumentsAsString(1));

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

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -113,8 +112,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
             if (parent == null) {
                 window = windowManager.findCustomWindow(args.getArguments()[start]);
             } else {
-                window = windowManager.findCustomWindow(
-                        (FrameContainer) parent, args.getArguments()[start]);
+                window = windowManager.findCustomWindow(parent, args.getArguments()[start]);
             }
 
             final String title = args.getArguments().length > start + 1
@@ -127,9 +125,9 @@ public class OpenWindow extends Command implements IntelligentCommand {
                             configProvider, eventBus, backBufferFactory);
                     windowManager.addWindow(newWindow);
                 } else {
-                    newWindow = new CustomWindow(args.getArguments()[start], title,
-                            (FrameContainer) parent, backBufferFactory);
-                    windowManager.addWindow((FrameContainer) parent, newWindow);
+                    newWindow = new CustomWindow(args.getArguments()[start], title, parent,
+                            backBufferFactory);
+                    windowManager.addWindow(parent, newWindow);
                 }
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -72,8 +71,7 @@ public class AllChannels extends Command implements IntelligentCommand {
         final String command = args.getArgumentsAsString();
 
         for (GroupChat channel : server.getGroupChatManager().getChannels()) {
-            channel.getWindowModel().getCommandParser().parseCommand(
-                    (FrameContainer) channel.getWindowModel(),
+            channel.getWindowModel().getCommandParser().parseCommand(channel.getWindowModel(),
                     command);
         }
     }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -118,7 +117,7 @@ public class Message extends Command implements IntelligentCommand,
     }
 
     @Override
-    public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
+    public int getLineCount(final WindowModel origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
             return origin.getConnection().get().getWindowModel().getNumLines(

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

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

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces.ui;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.WindowModel;
 
 /**

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces.ui;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.WindowModel;
 
 /**

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

@@ -286,7 +286,7 @@ public abstract class InputHandler implements ConfigChangeListener {
 
             if (command != null && command.getValue() instanceof ValidatingCommand) {
                 final ValidationResponse vr = ((ValidatingCommand) command.getValue())
-                        .validateArguments((FrameContainer) parentWindow, args);
+                        .validateArguments(parentWindow, args);
 
                 if (vr.isFailure()) {
                     fireCommandFailure(vr.getFailureReason());
@@ -297,7 +297,7 @@ public abstract class InputHandler implements ConfigChangeListener {
 
             if (command != null && command.getValue() instanceof WrappableCommand) {
                 final int count = ((WrappableCommand) command.getValue())
-                        .getLineCount((FrameContainer) parentWindow, args);
+                        .getLineCount(parentWindow, args);
                 fireLineWrap(count);
             }
         } else {
@@ -434,7 +434,7 @@ public abstract class InputHandler implements ConfigChangeListener {
 
             case KeyEvent.VK_ENTER:
                 if ((flags & HANDLE_RETURN) != 0 && !line.isEmpty()) {
-                    commandParser.parseCommandCtrl((FrameContainer) parentWindow, line);
+                    commandParser.parseCommandCtrl(parentWindow, line);
                     addToBuffer(line);
                 }
                 break;
@@ -551,8 +551,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     private void doCommandTabCompletion(final String text, final int start,
             final int end, final boolean shiftPressed) {
         doNormalTabCompletion(text, start, end, shiftPressed,
-                tabCompleterUtils.getIntelligentResults((FrameContainer) parentWindow,
-                        commandController,
+                tabCompleterUtils.getIntelligentResults(parentWindow, commandController,
                         text.substring(0, start), text.substring(start, end)));
     }
 
@@ -589,7 +588,7 @@ public abstract class InputHandler implements ConfigChangeListener {
             eventBus.publishAsync(new ClientUserInputEvent(
                     (FrameContainer) parentWindow, bufferedLine));
             addToBuffer(bufferedLine.toString());
-            commandParser.parseCommand((FrameContainer) parentWindow, bufferedLine.toString());
+            commandParser.parseCommand(parentWindow, bufferedLine.toString());
         }
 
         cancelTypingNotification();

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -132,7 +131,7 @@ public class TabCompleterUtils {
      */
     @Nullable
     public AdditionalTabTargets getIntelligentResults(
-            final FrameContainer window, final CommandController commandController,
+            final WindowModel window, final CommandController commandController,
             final String text, final String partial) {
         return getIntelligentResults(window,
                 new CommandArguments(commandController, text), partial);

src/com/dmdirc/ui/messages/BackBuffer.java

@@ -23,9 +23,9 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.EventUtils;
 
 import net.engio.mbassy.listener.Handler;
@@ -39,10 +39,10 @@ public class BackBuffer {
     private final Styliser styliser;
     private final DMDircMBassador eventBus;
     private final EventFormatter formatter;
-    private final FrameContainer owner;
+    private final WindowModel owner;
 
     public BackBuffer(
-            final FrameContainer owner,
+            final WindowModel owner,
             final ColourManagerFactory colourManagerFactory,
             final EventFormatter formatter) {
         this.owner = owner;

src/com/dmdirc/ui/messages/BackBufferFactory.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -44,7 +44,7 @@ public class BackBufferFactory {
         this.formatter = formatter;
     }
 
-    public BackBuffer getBackBuffer(final FrameContainer owner) {
+    public BackBuffer getBackBuffer(final WindowModel owner) {
         return new BackBuffer(owner, colourManagerFactory, formatter);
     }
 

src/com/dmdirc/ui/messages/sink/CustomWindowMessageSink.java

@@ -23,7 +23,6 @@
 package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.CustomWindow;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -73,7 +72,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    (FrameContainer) connectionContainer, backBufferFactory);
+                    connectionContainer, backBufferFactory);
             windowManager.addWindow(connectionContainer, targetWindow);
         }