Fix a bunch more FrameContainer references.

src/com/dmdirc/Channel.java

@@ -40,6 +40,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -116,13 +117,12 @@ public class Channel extends FrameContainer implements GroupChat {
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager) {
-        super((FrameContainer) connection.getWindowModel(), "channel-inactive",
+        super(connection.getWindowModel(), "channel-inactive",
                 newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                new ChannelCommandParser((FrameContainer) connection.getWindowModel(),
-                        commandController,  eventBus),
+                new ChannelCommandParser(connection.getWindowModel(), commandController,  eventBus),
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
                         CommandType.TYPE_CHAT),
@@ -523,7 +523,7 @@ public class Channel extends FrameContainer implements GroupChat {
     }
 
     @Override
-    public FrameContainer getWindowModel() {
+    public WindowModel getWindowModel() {
         return this;
     }
 

src/com/dmdirc/ChannelFactory.java

@@ -69,7 +69,7 @@ public class ChannelFactory {
         final Channel channel = new Channel(connection, channelInfo, configMigrator,
                 tabCompleterFactory, commandController, messageSinkManager, eventBus,
                 backBufferFactory, groupChatUserManager);
-        windowManager.addWindow((FrameContainer) connection.getWindowModel(), channel);
+        windowManager.addWindow(connection.getWindowModel(), channel);
         connection.getWindowModel().getEventBus().publish(new ChannelOpenedEvent(channel));
         return channel;
     }

src/com/dmdirc/CustomWindow.java

@@ -42,7 +42,7 @@ public class CustomWindow extends FrameContainer {
     public CustomWindow(
             final String name,
             final String title,
-            final FrameContainer parent,
+            final WindowModel parent,
             final BackBufferFactory backBufferFactory) {
         super(parent, "custom", name, title, parent.getConfigManager(), backBufferFactory,
                 parent.getEventBus(),

src/com/dmdirc/Query.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
@@ -80,12 +81,12 @@ public class Query extends FrameContainer implements PrivateActionListener,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final BackBufferFactory backBufferFactory) {
-        super((FrameContainer) connection.getWindowModel(), "query",
+        super(connection.getWindowModel(), "query",
                 user.getNickname(),
                 user.getNickname(),
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
-                new QueryCommandParser((FrameContainer) connection.getWindowModel(),
+                new QueryCommandParser(connection.getWindowModel(),
                         commandController, connection.getWindowModel().getEventBus()),
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         connection.getWindowModel().getConfigManager(),
@@ -281,7 +282,7 @@ public class Query extends FrameContainer implements PrivateActionListener,
     }
 
     @Override
-    public FrameContainer getWindowModel() {
+    public WindowModel getWindowModel() {
         return this;
     }
 

src/com/dmdirc/QueryFactory.java

@@ -60,7 +60,7 @@ public class QueryFactory {
     public Query getQuery(final Connection connection, final User user) {
         final Query query = new Query(connection, user, tabCompleterFactory, commandController,
                 messageSinkManager, backBufferFactory);
-        windowManager.addWindow((FrameContainer) connection.getWindowModel(), query);
+        windowManager.addWindow(connection.getWindowModel(), query);
         connection.getWindowModel().getEventBus().publish(new QueryOpenedEvent(query));
         return query;
     }

src/com/dmdirc/Server.java

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InviteManager;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
@@ -766,7 +767,7 @@ public class Server extends FrameContainer implements Connection {
     }
 
     @Override
-    public FrameContainer getWindowModel() {
+    public WindowModel getWindowModel() {
         return this;
     }
 

src/com/dmdirc/commandparser/aliases/AliasCommandHandler.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.aliases;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
@@ -48,8 +47,7 @@ public class AliasCommandHandler extends Command {
             final CommandContext context) {
         if (args.getArguments().length >= alias.getMinArguments()) {
             for (String line : alias.getSubstitution().split("\n")) {
-                origin.getCommandParser().parseCommand((FrameContainer) origin,
-                        getSubstituteCommand(line, args));
+                origin.getCommandParser().parseCommand(origin, getSubstituteCommand(line, args));
             }
         } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, alias.getName() + " requires at least "

src/com/dmdirc/commandparser/auto/AutoCommandHandler.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
@@ -79,7 +78,7 @@ public class AutoCommandHandler {
                 event.getConnection().getAddress(), event.getConnection().getProfile().getName())) {
             final WindowModel container = event.getConnection().getWindowModel();
             final CommandParser parser = container.getCommandParser();
-            execute((FrameContainer) container, parser);
+            execute(container, parser);
         }
     }
 
@@ -99,7 +98,7 @@ public class AutoCommandHandler {
         return target.map(value::equalsIgnoreCase).orElse(true);
     }
 
-    private void execute(final FrameContainer origin, final CommandParser parser) {
+    private void execute(final WindowModel origin, final CommandParser parser) {
         for (String line : autoCommand.getResponse().split("\n")) {
             parser.parseCommand(origin, commandController.getCommandChar() + line);
         }

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -53,7 +52,7 @@ public class ChannelCommandParser extends ChatCommandParser {
      * @param commandController The controller to load commands from.
      * @param eventBus          Event bus to post events on
      */
-    public ChannelCommandParser(final FrameContainer owner,
+    public ChannelCommandParser(final WindowModel owner,
             final CommandController commandController,
             final DMDircMBassador eventBus) {
         super(owner, commandController, eventBus);

src/com/dmdirc/commandparser/parsers/ChatCommandParser.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -55,7 +54,7 @@ public class ChatCommandParser extends ServerCommandParser {
      * @param commandController The controller to load commands from.
      * @param eventBus          Event but to post events on
      */
-    public ChatCommandParser(final FrameContainer owner, final CommandController commandController,
+    public ChatCommandParser(final WindowModel owner, final CommandController commandController,
             final DMDircMBassador eventBus) {
         super(owner.getConfigManager(), commandController, eventBus);
         super.setOwner(owner);

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -56,7 +55,7 @@ public class QueryCommandParser extends ChatCommandParser {
      * @param commandController The controller to load commands from.
      * @param eventBus          Event bus to post events on
      */
-    public QueryCommandParser(final FrameContainer owner, final CommandController commandController,
+    public QueryCommandParser(final WindowModel owner, final CommandController commandController,
             final DMDircMBassador eventBus) {
         super(owner, commandController, eventBus);
     }

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

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

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.Optional;
@@ -53,7 +53,7 @@ public class ChannelMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String channelName = String.format(patternMatches[0], args);

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

@@ -22,10 +22,10 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -54,7 +54,7 @@ public class CommonChannelsMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String username = String.format(patternMatches[0], args);

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

@@ -63,7 +63,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final WindowModel connectionContainer =

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

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

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -48,7 +48,7 @@ public class FormatMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         dispatcher.dispatchMessage(source, date, patternMatches[0], patternMatches[1], args);

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -49,7 +49,7 @@ public class GroupMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String target;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.ArrayList;
@@ -52,7 +51,7 @@ public class LastCommandMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final Object[] escapedargs = new Object[args.length];

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

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

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

@@ -23,8 +23,8 @@
 package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 
 import java.util.ArrayList;
@@ -77,7 +77,7 @@ public class MessageSinkManager {
      * @param messageType The type (or 'format') of the message
      * @param args        The message arguments
      */
-    public void dispatchMessage(final FrameContainer source, final Date date,
+    public void dispatchMessage(final WindowModel source, final Date date,
             final String messageType, final Object... args) {
         final String target;
         if (source.getConfigManager().hasOptionString(CONFIG_DOMAIN, messageType)) {
@@ -98,7 +98,7 @@ public class MessageSinkManager {
      * @param targetSink  The textual representation of the destination sink
      * @param args        The message arguments
      */
-    public void dispatchMessage(final FrameContainer source, final Date date,
+    public void dispatchMessage(final WindowModel source, final Date date,
             final String messageType, final String targetSink, final Object... args) {
         for (MessageSink sink : sinks) {
             final Matcher matcher = sink.getPattern().matcher(targetSink);

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -48,7 +48,7 @@ public class NullMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         // Do nothing

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -48,7 +48,7 @@ public class SelfMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         source.addLine(messageType, date, args);

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -48,7 +48,7 @@ public class ServerMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         source.getConnection().get().getWindowModel().addLine(messageType, date, args);

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

@@ -23,8 +23,8 @@
 package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.messages.Formatter;
 
@@ -60,7 +60,7 @@ public class StatusBarMessageSink implements MessageSink {
 
     @Override
     public void handleMessage(final MessageSinkManager dispatcher,
-            final FrameContainer source,
+            final WindowModel source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String message = Formatter.formatMessage(source.getConfigManager(),