Make UIs use WindowModel more.

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

 
 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;
     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

 
 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;
 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;
         }
 
         @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

 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;
 
     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

 
 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;
 
 
     @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())));
 
     @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

 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;
     /** 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. */
     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;
      *
      * @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.", ""));
 
     @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)));
      *
      * @return A relevant window or null
      */
-    public TextFrame getSwingWindow(@Nullable final FrameContainer window) {
+    public TextFrame getSwingWindow(@Nullable final WindowModel window) {
         return windows.get(window);
     }
 
          *
          * @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

 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.interfaces.ui.Window;
 
 
     @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

 
 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;
 import com.dmdirc.events.ServerAwayEvent;
 import com.dmdirc.events.ServerBackEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.swing.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

 
 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;
     /** 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;
 
      *
      * @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

 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;
 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;
     }
 
     @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

 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ui.Window;
 
     @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

 
 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;
 
      */
     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

 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.function.Supplier;
 
     }
 
     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

 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.swing.JPopupMenu;
 
     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

 
 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;
     }
 
     @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

 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;
             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

 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;
     }
 
     @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

 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;
             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

 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;
     /** 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. */
      */
     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

 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;
     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

 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;
     }
 
     @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

 
 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;
 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;
     /** 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. */
      * @param deps          Collection of TextPane dependencies.
      */
     protected TextFrame(
-            final FrameContainer owner,
+            final WindowModel owner,
             final CommandParser commandParser,
             final TextFrameDependencies deps) {
         this.swingEventBus = deps.swingEventBus;
     }
     
     @Override
-    public FrameContainer getContainer() {
+    public WindowModel getContainer() {
         return frameParent;
     }
 

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

 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 
 import java.io.Serializable;
      */
     @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

 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;
             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

 
 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;
 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;
     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)));
     }
     @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

 
 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;
 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;
 
         disconnect.setMnemonic('d');
         disconnect.addActionListener(e -> activeFrameManager.getActiveFrame()
                 .map(TextFrame::getContainer)
-                .flatMap(FrameContainer::getConnection)
+                .flatMap(WindowModel::getConnection)
                 .ifPresent(Connection::disconnect));
         add(disconnect);
 
     @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

             }
 
             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

 
 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;
 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;
      *
      * @param current Window to use when adding status.
      */
-    public void updateStatus(final FrameContainer current) {
+    public void updateStatus(final WindowModel current) {
         if (current == null) {
             return;
         }