Make UIs use WindowModel more.

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.activewindow;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -73,7 +74,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         activeFrameManager.getActiveFrame().ifPresent(f -> f.getContainer().getCommandParser()
-                .parseCommand(f.getContainer(), args.getArgumentsAsString()));
+                .parseCommand((FrameContainer) f.getContainer(), args.getArgumentsAsString()));
     }
 
     @Override

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.events.DccChatRequestEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
 import com.dmdirc.addons.dcc.io.DCC;
@@ -53,6 +52,7 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -789,7 +789,7 @@ public class DCCManager {
         }
 
         @Override
-        public TextFrame getWindow(final FrameContainer container) {
+        public TextFrame getWindow(final WindowModel container) {
             return componentFrameFactory.getComponentFrame(container, commandParser,
                     Collections.singletonList(componentSupplier));
         }

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -45,6 +45,7 @@ import com.dmdirc.events.ServerPingSentEvent;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
@@ -305,7 +306,7 @@ public class LagDisplayManager implements ConfigChangeListener {
 
     private boolean isActiveWindow(final Connection connection) {
         return activeFrameManager.getActiveFrame().map(TextFrame::getContainer)
-                .flatMap(FrameContainer::getConnection)
+                .flatMap(WindowModel::getConnection)
                 .filter(connection::equals).isPresent();
     }
 

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.core.util.URLHandler;
 
@@ -61,7 +61,7 @@ public class SwingLinkHandler {
 
     @Handler
     public void handleChannelClick(final LinkChannelClickedEvent event) {
-        final FrameContainer container = event.getWindow().getContainer();
+        final WindowModel container = event.getWindow().getContainer();
         container.getConnection()
                 .map(Connection::getGroupChatManager)
                 .ifPresent(c -> c.join(new ChannelJoinRequest(event.getTarget())));
@@ -74,7 +74,7 @@ public class SwingLinkHandler {
 
     @Handler
     public void handleNicknameClick(final LinkNicknameClickedEvent event) {
-        final FrameContainer container = event.getWindow().getContainer();
+        final WindowModel container = event.getWindow().getContainer();
         container.getConnection().ifPresent(c ->
                 eventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(Optional.ofNullable(
                         windowFactory.getSwingWindow(c.getQuery(event.getTarget()))))));

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 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;
@@ -59,7 +58,7 @@ public class SwingWindowFactory implements FrameListener {
     /** A map of known implementations of window interfaces. */
     private final Map<Collection<String>, WindowProvider> implementations = new HashMap<>();
     /** A map of frame containers to their Swing windows. */
-    private final Map<FrameContainer, TextFrame> windows = new HashMap<>();
+    private final Map<WindowModel, TextFrame> windows = new HashMap<>();
     /** The event bus to post errors to. */
     private final DMDircMBassador eventBus;
     /** The swing event bus. */
@@ -113,8 +112,8 @@ public class SwingWindowFactory implements FrameListener {
     public void addWindow(final WindowModel parent, final WindowModel window,
             final boolean focus) {
         UIUtilities.invokeLater(() -> {
-            final TextFrame parentWindow = getSwingWindow((FrameContainer) parent);
-            final TextFrame childWindow = doAddWindow((FrameContainer) window);
+            final TextFrame parentWindow = getSwingWindow(parent);
+            final TextFrame childWindow = doAddWindow(window);
 
             if (childWindow == null) {
                 return;
@@ -136,7 +135,7 @@ public class SwingWindowFactory implements FrameListener {
      *
      * @return The created window or null on error
      */
-    protected TextFrame doAddWindow(final FrameContainer window) {
+    protected TextFrame doAddWindow(final WindowModel window) {
         if (!implementations.containsKey(window.getComponents())) {
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, null,
                     "Unable to create window: Unknown type.", ""));
@@ -159,8 +158,8 @@ public class SwingWindowFactory implements FrameListener {
 
     @Override
     public void delWindow(final WindowModel parent, final WindowModel window) {
-        final TextFrame parentWindow = getSwingWindow((FrameContainer) parent);
-        final TextFrame childWindow = getSwingWindow((FrameContainer) window);
+        final TextFrame parentWindow = getSwingWindow(parent);
+        final TextFrame childWindow = getSwingWindow(window);
         windows.remove(window);
         UIUtilities.invokeLater(() -> swingEventBus.publish(new SwingWindowDeletedEvent(
                 Optional.ofNullable(parentWindow), childWindow)));
@@ -174,7 +173,7 @@ public class SwingWindowFactory implements FrameListener {
      *
      * @return A relevant window or null
      */
-    public TextFrame getSwingWindow(@Nullable final FrameContainer window) {
+    public TextFrame getSwingWindow(@Nullable final WindowModel window) {
         return windows.get(window);
     }
 
@@ -195,7 +194,7 @@ public class SwingWindowFactory implements FrameListener {
          *
          * @return A new window for the given container.
          */
-        TextFrame getWindow(FrameContainer container);
+        TextFrame getWindow(WindowModel container);
 
         /**
          * Gets the set of components that this provider can provide windows for.

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.interfaces.ui.Window;
 
@@ -42,6 +43,8 @@ public class WindowComparator implements Comparator<Window>, Serializable {
 
     @Override
     public int compare(final Window item1, final Window item2) {
-        return comparator.compare(item1.getContainer(), item2.getContainer());
+        return comparator.compare(
+                (FrameContainer) item1.getContainer(),
+                (FrameContainer) item2.getContainer());
     }
 }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.config.ConfigBinding;
@@ -30,6 +29,7 @@ import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.ServerAwayEvent;
 import com.dmdirc.events.ServerBackEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.swing.JLabel;
 
@@ -48,14 +48,14 @@ public class AwayLabel extends JLabel {
     /** Away indicator. */
     private boolean useAwayIndicator;
     /** Parent frame container. */
-    private final FrameContainer container;
+    private final WindowModel container;
 
     /**
      * Creates a new away label for the specified container.
      *
      * @param container Parent frame container
      */
-    public AwayLabel(final FrameContainer container) {
+    public AwayLabel(final WindowModel container) {
         super("(away)");
 
         this.container = checkNotNull(container);

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.FrameComponentAddedEvent;
 import com.dmdirc.events.FrameComponentRemovedEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import javax.swing.JLabel;
@@ -43,7 +43,7 @@ public class TypingLabel extends JLabel {
     /** A version number for this class. */
     private static final long serialVersionUID = 2;
     /** Parent frame container. */
-    private final FrameContainer container;
+    private final WindowModel container;
     /** Whether or not to show the typing indicator. */
     private boolean useTypingIndicator;
 
@@ -52,7 +52,7 @@ public class TypingLabel extends JLabel {
      *
      * @param container Parent frame container
      */
-    public TypingLabel(final FrameContainer container) {
+    public TypingLabel(final WindowModel container) {
         super("[Typing...]");
         this.container = container;
         setVisible(false);

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrameFactory.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.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.TopicBarFactory;
@@ -31,6 +30,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.core.components.WindowComponent;
@@ -81,7 +81,7 @@ public class ChannelFrameFactory implements SwingWindowFactory.WindowProvider {
     }
 
     @Override
-    public TextFrame getWindow(final FrameContainer container) {
+    public TextFrame getWindow(final WindowModel container) {
         final ChannelFrame frame = new ChannelFrame(domain, dependencies.get(), inputFieldProvider,
                 identityFactory, dialogProvider.get(), inputTextFramePasteActionFactory,
                 topicBarFactory, (GroupChat) container);

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

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

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

@@ -22,9 +22,9 @@
 
 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;
 
 import java.util.function.Supplier;
 
@@ -51,7 +51,7 @@ public class ComponentFrame extends TextFrame {
      */
     public ComponentFrame(
             final TextFrameDependencies deps,
-            final FrameContainer owner,
+            final WindowModel owner,
             final CommandParser commandParser,
             final Iterable<Supplier<? extends JComponent>> componentSupplier) {
         super(owner, commandParser, deps);

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

@@ -25,6 +25,7 @@ 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;
 
 import java.util.function.Supplier;
 
@@ -52,7 +53,7 @@ public class ComponentFrameFactory {
     }
 
     public ComponentFrame getComponentFrame(
-            final FrameContainer owner,
+            final WindowModel owner,
             final CommandParser commandParser,
             final Iterable<Supplier<? extends JComponent>> componentSupplier) {
         final ComponentFrame frame = new ComponentFrame(dependencies, owner, commandParser,

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

@@ -25,6 +25,7 @@ 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;
 
 import javax.swing.JPopupMenu;
 
@@ -48,7 +49,7 @@ public class CustomFrame extends TextFrame {
     public CustomFrame(
             final TextFrameDependencies deps,
             final CommandParser commandParser,
-            final FrameContainer owner) {
+            final WindowModel owner) {
         super(owner, commandParser, deps);
 
         initComponents();

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import java.util.Collections;
@@ -55,7 +55,7 @@ public class CustomFrameFactory implements SwingWindowFactory.WindowProvider {
     }
 
     @Override
-    public TextFrame getWindow(final FrameContainer container) {
+    public TextFrame getWindow(final WindowModel container) {
         return new CustomFrame(dependencies.get(), commandParser, container);
     }
 

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

@@ -25,6 +25,7 @@ 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;
 
 import javax.inject.Provider;
 import javax.swing.JPopupMenu;
@@ -50,7 +51,7 @@ public class CustomInputFrame extends InputTextFrame {
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
-            final FrameContainer owner) {
+            final WindowModel owner) {
         super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner);
 
         initComponents();

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import java.util.Arrays;
@@ -62,7 +62,7 @@ public class CustomInputFrameFactory implements SwingWindowFactory.WindowProvide
     }
 
     @Override
-    public TextFrame getWindow(final FrameContainer container) {
+    public TextFrame getWindow(final WindowModel container) {
         final CustomInputFrame frame = new CustomInputFrame(dependencies.get(), inputFieldProvider,
                 inputTextFramePasteActionFactory, container);
         eventBus.subscribe(frame);

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

@@ -35,6 +35,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
@@ -95,7 +96,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
-            final FrameContainer owner) {
+            final WindowModel owner) {
         super(owner, owner.getCommandParser(), deps);
 
         serviceManager = deps.serviceManager;

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

@@ -23,10 +23,10 @@
 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.events.UserErrorEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 
 import java.awt.Toolkit;
@@ -55,7 +55,7 @@ public final class InputTextFramePasteAction extends AbstractAction {
     /** Swing input field. */
     private final SwingInputField inputField;
     /** Frame container. */
-    private final FrameContainer container;
+    private final WindowModel container;
     /** Paste dialog factory. */
     private final PasteDialogFactory pasteDialogFactory;
     /** Window to parent the dialog on. */
@@ -69,7 +69,7 @@ public final class InputTextFramePasteAction extends AbstractAction {
      */
     public InputTextFramePasteAction(final InputTextFrame inputFrame,
             final SwingInputField inputField,
-            final FrameContainer container,
+            final WindowModel container,
             final Clipboard clipboard,
             final DMDircMBassador eventBus,
             final PasteDialogFactory pasteDialogFactory,

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

@@ -27,6 +27,7 @@ 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;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -58,7 +59,7 @@ public class InputTextFramePasteActionFactory {
     public InputTextFramePasteAction getInputTextFramePasteAction(
             final InputTextFrame inputFrame,
             final SwingInputField inputField,
-            final FrameContainer container) {
+            final WindowModel container) {
         return new InputTextFramePasteAction(inputFrame, inputField, container, clipboard,
                 eventBus, pasteDialogFactory, window);
     }

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

@@ -23,13 +23,13 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialogFactory;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import java.util.Arrays;
@@ -72,7 +72,7 @@ public class ServerFrameFactory implements SwingWindowFactory.WindowProvider {
     }
 
     @Override
-    public TextFrame getWindow(final FrameContainer container) {
+    public TextFrame getWindow(final WindowModel container) {
         final ServerFrame frame =  new ServerFrame(dependencies.get(), inputFieldProvider,
                 inputTextFramePasteActionFactory, dialogProvider.get(),
                 sslCertificateDialogFactory, container.getConnection().get());

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -58,6 +57,7 @@ import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.ServiceManager;
@@ -96,7 +96,7 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
     /** A version number for this class. */
     private static final long serialVersionUID = 5;
     /** The channel object that owns this frame. */
-    protected final FrameContainer frameParent;
+    protected final WindowModel frameParent;
     /** Colour manager. */
     protected final ColourManager colourManager;
     /** Frame output pane. */
@@ -129,7 +129,7 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
      * @param deps          Collection of TextPane dependencies.
      */
     protected TextFrame(
-            final FrameContainer owner,
+            final WindowModel owner,
             final CommandParser commandParser,
             final TextFrameDependencies deps) {
         this.swingEventBus = deps.swingEventBus;
@@ -270,7 +270,7 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
     }
     
     @Override
-    public FrameContainer getContainer() {
+    public WindowModel getContainer() {
         return frameParent;
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 
 import java.io.Serializable;
@@ -48,7 +49,9 @@ public class TextFrameComparator implements Comparator<TextFrame>,
      */
     @Override
     public int compare(final TextFrame item1, final TextFrame item2) {
-        return comparator.compare(item1.getContainer(), item2.getContainer());
+        return comparator.compare(
+                (FrameContainer) item1.getContainer(),
+                (FrameContainer) item2.getContainer());
     }
 
 }

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

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
@@ -66,7 +67,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             final InputField target,
             final CommandController commandController,
             final CommandParser commandParser,
-            final FrameContainer parentWindow,
+            final WindowModel parentWindow,
             final TabCompleterUtils tabCompleterUtils,
             final DMDircMBassador eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow,

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
@@ -34,8 +34,8 @@ import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dialog;
 import java.util.Optional;
@@ -131,7 +131,7 @@ public class ChannelMenu extends JMenu implements MenuListener {
     private void doJoinChannel(final String text) {
         activeFrameManager.getActiveFrame()
                 .map(TextFrame::getContainer)
-                .flatMap(FrameContainer::getConnection)
+                .flatMap(WindowModel::getConnection)
                 .map(Connection::getGroupChatManager)
                 .ifPresent(c -> c.join(new ChannelJoinRequest(text)));
     }
@@ -139,7 +139,8 @@ public class ChannelMenu extends JMenu implements MenuListener {
     @Override
     public final void menuSelected(final MenuEvent e) {
         final Optional<ServerState> activeConnectionState = activeFrameManager.getActiveFrame()
-                .map(TextFrame::getContainer).flatMap(FrameContainer::getConnection)
+                .map(TextFrame::getContainer)
+                .flatMap(WindowModel::getConnection)
                 .map(Connection::getState);
         final boolean connected = activeConnectionState.equals(Optional.of(ServerState.CONNECTED));
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -33,6 +32,7 @@ import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -104,7 +104,7 @@ public class ServerMenu extends JMenu implements MenuListener {
         disconnect.setMnemonic('d');
         disconnect.addActionListener(e -> activeFrameManager.getActiveFrame()
                 .map(TextFrame::getContainer)
-                .flatMap(FrameContainer::getConnection)
+                .flatMap(WindowModel::getConnection)
                 .ifPresent(Connection::disconnect));
         add(disconnect);
 
@@ -128,7 +128,8 @@ public class ServerMenu extends JMenu implements MenuListener {
     @Override
     public final void menuSelected(final MenuEvent e) {
         final Optional<ServerState> activeConnectionState = activeFrameManager.getActiveFrame()
-                .map(TextFrame::getContainer).flatMap(FrameContainer::getConnection)
+                .map(TextFrame::getContainer)
+                .flatMap(WindowModel::getConnection)
                 .map(Connection::getState);
         final boolean connected = activeConnectionState.equals(Optional.of(ServerState.CONNECTED));
 

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

@@ -237,10 +237,12 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             }
 
             node.getLabel().unreadStatusChanged(new UnreadStatusChangedEvent(
-                    window.getContainer(), window.getContainer().getUnreadStatusManager(),
+                    (FrameContainer) window.getContainer(),
+                    window.getContainer().getUnreadStatusManager(),
                     window.getContainer().getUnreadStatusManager().getNotificationColour(),
                     window.getContainer().getUnreadStatusManager().getUnreadLines()));
-            node.getLabel().iconChanged(new FrameIconChangedEvent(window.getContainer(),
+            node.getLabel().iconChanged(new FrameIconChangedEvent(
+                    (FrameContainer) window.getContainer(),
                     window.getContainer().getIcon()));
         });
     }

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.windowstatus;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -44,6 +43,7 @@ import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.PrivateChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
@@ -126,7 +126,7 @@ public class WindowStatusManager {
      *
      * @param current Window to use when adding status.
      */
-    public void updateStatus(final FrameContainer current) {
+    public void updateStatus(final WindowModel current) {
         if (current == null) {
             return;
         }