Fix almost all remaining FrameContainer refs.

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.CustomWindow;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -121,12 +120,11 @@ public class Echo extends Command implements IntelligentCommand {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "Unable to find target window");
             } else if (!args.isSilent()) {
-                frame.getEventBus().publishAsync(new CommandOutputEvent(
-                        (FrameContainer) frame, time.getTime(),
+                frame.getEventBus().publishAsync(new CommandOutputEvent(frame, time.getTime(),
                         results.getArgumentsAsString()));
             }
         } else if (!args.isSilent()) {
-            origin.getEventBus().publishAsync(new CommandOutputEvent((FrameContainer) origin,
+            origin.getEventBus().publishAsync(new CommandOutputEvent(origin,
                     time.getTime(), results.getArgumentsAsString()));
         }
     }

src/com/dmdirc/commandparser/commands/global/NewServer.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;
@@ -96,7 +95,7 @@ public class NewServer extends Command implements IntelligentCommand {
                     profileManager.getDefault());
             server.connect();
         } catch (InvalidURIException ex) {
-            origin.getEventBus().publishAsync(new CommandErrorEvent((FrameContainer) origin,
+            origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
                     "Invalid URI: " + ex.getMessage() +
                             (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage())));
         }

src/com/dmdirc/commandparser/commands/server/ChangeServer.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;
@@ -81,8 +80,7 @@ public class ChangeServer extends Command {
             connection.connect(address, connection.getProfile());
         } catch (InvalidURIException ex) {
             origin.getEventBus().publishAsync(
-                    new CommandErrorEvent(
-                            (FrameContainer) origin, "Invalid URI: " + ex.getMessage() +
+                    new CommandErrorEvent(origin, "Invalid URI: " + ex.getMessage() +
                             (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage())));
         }
     }

src/com/dmdirc/commandparser/parsers/CommandParser.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.CommandInfoPair;
@@ -201,8 +200,7 @@ public abstract class CommandParser implements Serializable {
         if (someValid) {
             for (String channelName : parts) {
                 if (!server.getGroupChatManager().isValidChannelName(channelName)) {
-                    origin.getEventBus().publishAsync(new CommandErrorEvent(
-                            (FrameContainer) origin,
+                    origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
                             "Invalid channel name: " + channelName));
                     continue;
                 }
@@ -337,7 +335,7 @@ public abstract class CommandParser implements Serializable {
         if (origin == null) {
             eventBus.publish(new UnknownCommandEvent(null, args.getCommandName(), args.getArguments()));
         } else {
-            final UnknownCommandEvent event = new UnknownCommandEvent((FrameContainer) origin,
+            final UnknownCommandEvent event = new UnknownCommandEvent(origin,
                     args.getCommandName(), args.getArguments());
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownCommand");
 

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

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.ClientModule;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -112,8 +111,7 @@ public class GlobalCommandParser extends CommandParser {
                     "Invalid Global Command: " + line, ""));
         } else {
             origin.getEventBus().publishAsync(
-                    new CommandErrorEvent((FrameContainer) origin,
-                            "Invalid global command: " + line));
+                    new CommandErrorEvent(origin, "Invalid global command: " + line));
         }
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -102,8 +101,7 @@ public class ServerCommandParser extends GlobalCommandParser {
                     && server.getState() != ServerState.CONNECTING)
                     || !server.getParser().isPresent())) {
                 if (!args.isSilent()) {
-                    origin.getEventBus().publishAsync(new CommandErrorEvent(
-                            (FrameContainer) origin,
+                    origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
                             "You must be connected to use this command"));
                 }
             } else {

src/com/dmdirc/events/BaseDisplayableEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -37,14 +37,14 @@ public abstract class BaseDisplayableEvent extends DMDircEvent implements Displa
     /** The properties associated with this event. */
     private final DisplayPropertyMap properties = new DisplayPropertyMap();
     /** The frame container that caused this event. */
-    private final FrameContainer source;
+    private final WindowModel source;
 
-    public BaseDisplayableEvent(final long timestamp, final FrameContainer source) {
+    public BaseDisplayableEvent(final long timestamp, final WindowModel source) {
         super(timestamp);
         this.source = source;
     }
 
-    public BaseDisplayableEvent(final FrameContainer source) {
+    public BaseDisplayableEvent(final WindowModel source) {
         this.source = source;
     }
 
@@ -74,7 +74,7 @@ public abstract class BaseDisplayableEvent extends DMDircEvent implements Displa
     }
 
     @Override
-    public FrameContainer getSource() {
+    public WindowModel getSource() {
         return source;
     }
 

src/com/dmdirc/events/ChannelDisplayableEvent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -72,8 +72,8 @@ public abstract class ChannelDisplayableEvent extends ChannelEvent implements Di
     }
 
     @Override
-    public FrameContainer getSource() {
-        return (FrameContainer) getChannel().getWindowModel();
+    public WindowModel getSource() {
+        return getChannel().getWindowModel();
     }
 
 }

src/com/dmdirc/events/ClientFrameChangedEvent.java

@@ -22,20 +22,20 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event fired when a new frame has been focused.
  */
 public class ClientFrameChangedEvent extends DMDircEvent {
 
-    private final FrameContainer container;
+    private final WindowModel container;
 
-    public ClientFrameChangedEvent(final FrameContainer container) {
+    public ClientFrameChangedEvent(final WindowModel container) {
         this.container = container;
     }
 
-    public FrameContainer getFrameContainer() {
+    public WindowModel getFrameContainer() {
         return container;
     }
 

src/com/dmdirc/events/ClientLineAddedEvent.java

@@ -22,22 +22,22 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event fired when a line has been added to a window.
  */
 public class ClientLineAddedEvent extends DMDircEvent {
 
-    private final FrameContainer container;
+    private final WindowModel container;
     private final String line;
 
-    public ClientLineAddedEvent(final FrameContainer container, final String line) {
+    public ClientLineAddedEvent(final WindowModel container, final String line) {
         this.container = container;
         this.line = line;
     }
 
-    public FrameContainer getFrameContainer() {
+    public WindowModel getFrameContainer() {
         return container;
     }
 

src/com/dmdirc/events/ClientUserInputEvent.java

@@ -22,22 +22,22 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event fired when some input has been entered into the client.
  */
 public class ClientUserInputEvent extends DMDircEvent {
 
-    private final FrameContainer container;
+    private final WindowModel container;
     private final StringBuffer buffer;
 
-    public ClientUserInputEvent(final FrameContainer container, final StringBuffer buffer) {
+    public ClientUserInputEvent(final WindowModel container, final StringBuffer buffer) {
         this.container = container;
         this.buffer = buffer;
     }
 
-    public FrameContainer getFrameContainer() {
+    public WindowModel getFrameContainer() {
         return container;
     }
 

src/com/dmdirc/events/CommandErrorEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event raised when a command encounters an error and needs to provide feedback to the user.
@@ -31,7 +31,7 @@ public class CommandErrorEvent extends BaseDisplayableEvent {
 
     private final String message;
 
-    public CommandErrorEvent(final FrameContainer source, final String message) {
+    public CommandErrorEvent(final WindowModel source, final String message) {
         super(source);
         this.message = message;
     }

src/com/dmdirc/events/CommandOutputEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event raised when a command outputs some generic text to the user.
@@ -31,13 +31,13 @@ public class CommandOutputEvent extends BaseDisplayableEvent {
 
     private final String message;
 
-    public CommandOutputEvent(final FrameContainer source, final long timestamp,
+    public CommandOutputEvent(final WindowModel source, final long timestamp,
             final String message) {
         super(timestamp, source);
         this.message = message;
     }
 
-    public CommandOutputEvent(final FrameContainer source, final String message) {
+    public CommandOutputEvent(final WindowModel source, final String message) {
         super(source);
         this.message = message;
     }

src/com/dmdirc/events/DisplayableEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -80,6 +80,6 @@ public interface DisplayableEvent {
     /**
      * Gets the source of the displayable event.
      */
-    FrameContainer getSource();
+    WindowModel getSource();
 
 }

src/com/dmdirc/events/FrameChangedEvent.java

@@ -22,20 +22,20 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Base class for all frame info events.
  */
 public class FrameChangedEvent extends DMDircEvent {
 
-    private final FrameContainer container;
+    private final WindowModel container;
 
-    public FrameChangedEvent(final FrameContainer container) {
+    public FrameChangedEvent(final WindowModel container) {
         this.container = container;
     }
 
-    public FrameContainer getContainer() {
+    public WindowModel getContainer() {
         return container;
     }
 }

src/com/dmdirc/events/FrameClosingEvent.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Fired when a window is closed in the client.
  */
 public class FrameClosingEvent extends FrameEvent {
 
-    public FrameClosingEvent(final FrameContainer container) {
+    public FrameClosingEvent(final WindowModel container) {
         super(container);
     }
 }

src/com/dmdirc/events/FrameComponentAddedEvent.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Fired when a frame component is added.
  */
 public class FrameComponentAddedEvent extends FrameComponentEvent {
 
-    public FrameComponentAddedEvent(final FrameContainer container, final String component) {
+    public FrameComponentAddedEvent(final WindowModel container, final String component) {
         super(container, component);
     }
 }

src/com/dmdirc/events/FrameComponentEvent.java

@@ -22,22 +22,22 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Base class for frame component events.
  */
 public abstract class FrameComponentEvent extends DMDircEvent {
 
-    private final FrameContainer container;
+    private final WindowModel container;
     private final String component;
 
-    public FrameComponentEvent(final FrameContainer container, final String component) {
+    public FrameComponentEvent(final WindowModel container, final String component) {
         this.container = container;
         this.component = component;
     }
 
-    public FrameContainer getContainer() {
+    public WindowModel getContainer() {
         return container;
     }
 

src/com/dmdirc/events/FrameComponentRemovedEvent.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Fired when a frame component is removed.
  */
 public class FrameComponentRemovedEvent extends FrameComponentEvent {
 
-    public FrameComponentRemovedEvent(final FrameContainer container, final String component) {
+    public FrameComponentRemovedEvent(final WindowModel container, final String component) {
         super(container, component);
     }
 }

src/com/dmdirc/events/FrameEvent.java

@@ -22,20 +22,20 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Base class for window related events in the client.
  */
 public abstract class FrameEvent extends DMDircEvent {
 
-    private final FrameContainer container;
+    private final WindowModel container;
 
-    public FrameEvent(final FrameContainer container) {
+    public FrameEvent(final WindowModel container) {
         this.container = container;
     }
 
-    public FrameContainer getContainer() {
+    public WindowModel getContainer() {
         return container;
     }
 }

src/com/dmdirc/events/FrameIconChangedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Fired when a frame icon changes.
@@ -31,7 +31,7 @@ public class FrameIconChangedEvent extends FrameChangedEvent {
 
     private final String icon;
 
-    public FrameIconChangedEvent(final FrameContainer container, final String icon) {
+    public FrameIconChangedEvent(final WindowModel container, final String icon) {
         super(container);
         this.icon = icon;
     }

src/com/dmdirc/events/FrameNameChangedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Fired when a frame's name changes.
@@ -31,7 +31,7 @@ public class FrameNameChangedEvent extends FrameChangedEvent {
 
     private final String name;
 
-    public FrameNameChangedEvent(final FrameContainer container, final String name) {
+    public FrameNameChangedEvent(final WindowModel container, final String name) {
         super(container);
         this.name = name;
     }

src/com/dmdirc/events/FrameTitleChangedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Fired when a frame title changes.
@@ -31,7 +31,7 @@ public class FrameTitleChangedEvent extends FrameChangedEvent {
 
     private final String title;
 
-    public FrameTitleChangedEvent(final FrameContainer container, final String title) {
+    public FrameTitleChangedEvent(final WindowModel container, final String title) {
         super(container);
         this.title = title;
     }

src/com/dmdirc/events/QueryDisplayableEvent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -73,7 +73,7 @@ public abstract class QueryDisplayableEvent extends QueryEvent implements
     }
 
     @Override
-    public FrameContainer getSource() {
+    public WindowModel getSource() {
         return getQuery();
     }
 

src/com/dmdirc/events/ServerDisplayableEvent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -73,8 +73,8 @@ public abstract class ServerDisplayableEvent extends ServerEvent implements Disp
     }
 
     @Override
-    public FrameContainer getSource() {
-        return (FrameContainer) getConnection().getWindowModel();
+    public WindowModel getSource() {
+        return getConnection().getWindowModel();
     }
 
 }

src/com/dmdirc/events/UnknownCommandEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -38,11 +38,11 @@ public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent
     private final AtomicReference<String> displayFormatRef = new AtomicReference<>("");
     /** The properties associated with this event. */
     private final DisplayPropertyMap properties = new DisplayPropertyMap();
-    @Nullable private final FrameContainer source;
+    @Nullable private final WindowModel source;
     private final String command;
     private final String[] arguments;
 
-    public UnknownCommandEvent(final long timestamp, @Nullable final FrameContainer source,
+    public UnknownCommandEvent(final long timestamp, @Nullable final WindowModel source,
             final String command, final String[] arguments) {
         super(timestamp);
         this.source = source;
@@ -50,7 +50,7 @@ public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent
         this.arguments = arguments;
     }
 
-    public UnknownCommandEvent(@Nullable final FrameContainer source, final String command,
+    public UnknownCommandEvent(@Nullable final WindowModel source, final String command,
             final String[] arguments) {
         this.source = source;
         this.command = command;
@@ -59,7 +59,7 @@ public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent
 
     @Override
     @Nullable
-    public FrameContainer getSource() {
+    public WindowModel getSource() {
         return source;
     }
 

src/com/dmdirc/events/UnreadStatusChangedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 import com.dmdirc.util.colours.Colour;
 
@@ -33,12 +33,12 @@ import java.util.Optional;
  */
 public class UnreadStatusChangedEvent extends DMDircEvent {
 
-    private final FrameContainer source;
+    private final WindowModel source;
     private final UnreadStatusManager manager;
     private final Optional<Colour> notificationColour;
     private final int unreadCount;
 
-    public UnreadStatusChangedEvent(final FrameContainer source, final UnreadStatusManager manager,
+    public UnreadStatusChangedEvent(final WindowModel source, final UnreadStatusManager manager,
             final Optional<Colour> notificationColour, final int unreadCount) {
         this.source = source;
         this.manager = manager;
@@ -46,7 +46,7 @@ public class UnreadStatusChangedEvent extends DMDircEvent {
         this.unreadCount = unreadCount;
     }
 
-    public FrameContainer getSource() {
+    public WindowModel getSource() {
         return source;
     }
 

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

@@ -347,6 +347,7 @@ public abstract class InputHandler implements ConfigChangeListener {
         if (state != newState) {
             state = newState;
 
+            // TODO: Not sure where this should be exposed...
             ((FrameContainer) parentWindow).setCompositionState(state);
         }
     }
@@ -585,8 +586,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     public void enterPressed(final String line) {
         if (!line.isEmpty()) {
             final StringBuffer bufferedLine = new StringBuffer(line);
-            eventBus.publishAsync(new ClientUserInputEvent(
-                    (FrameContainer) parentWindow, bufferedLine));
+            eventBus.publishAsync(new ClientUserInputEvent(parentWindow, bufferedLine));
             addToBuffer(bufferedLine.toString());
             commandParser.parseCommand(parentWindow, bufferedLine.toString());
         }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.BaseChannelTextEvent;
 import com.dmdirc.events.BaseQueryTextEvent;
@@ -31,6 +30,7 @@ import com.dmdirc.events.ChannelHighlightEvent;
 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryHighlightEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.colours.Colour;
 
 import java.util.Optional;
@@ -43,7 +43,7 @@ import net.engio.mbassy.listener.Handler;
 public class UnreadStatusManager {
 
     private final DMDircMBassador eventBus;
-    private final FrameContainer container;
+    private final WindowModel container;
     private final ColourManager colourManager;
 
     private int unreadLines;
@@ -53,7 +53,7 @@ public class UnreadStatusManager {
     private Optional<Colour> messageColour = Optional.of(Colour.BLUE);
     private Optional<Colour> highlightColour = Optional.of(Colour.RED);
 
-    public UnreadStatusManager(final FrameContainer container) {
+    public UnreadStatusManager(final WindowModel container) {
         this.container = container;
         this.eventBus = container.getEventBus();
         this.colourManager = new ColourManager(container.getConfigManager(), eventBus);

test/com/dmdirc/InviteManagerImplTest.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +39,7 @@ import static org.mockito.Mockito.when;
 public class InviteManagerImplTest {
 
     @Mock private Connection connection;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private DMDircMBassador eventBus;
     @Mock private User user;
 

test/com/dmdirc/commandparser/aliases/AliasCommandHandlerTest.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.commandparser.aliases;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class AliasCommandHandlerTest {
 
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private CommandController commandController;
     @Mock private CommandParser commandParser;
     @Mock private CommandContext context;

test/com/dmdirc/commandparser/auto/AutoCommandHandlerTest.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;
@@ -31,6 +30,7 @@ import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -56,7 +56,7 @@ public class AutoCommandHandlerTest {
     @Mock private ServerConnectedEvent serverConnectedEvent;
     @Mock private Connection connection;
     @Mock private Profile profile;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private CommandParser commandParser;
     private AutoCommandHandler autoCommandHandler;
 

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -23,13 +23,13 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -54,7 +54,7 @@ public class BanTest {
     @Mock private GroupChatUser groupChatUser;
     @Mock private Channel channel;
     @Mock private CommandController controller;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     private Ban command;
 
     @Before

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -23,13 +23,13 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
@@ -57,7 +57,7 @@ public class KickReasonTest {
     @Mock private GroupChatUser groupChatUser;
     @Mock private Channel channel;
     @Mock private CommandController controller;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private ChannelInfo channelInfo;
     @Mock private AggregateConfigProvider configProvider;
     private KickReason command;

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Optional;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class ModeTest {
 
-    @Mock private FrameContainer origin;
+    @Mock private WindowModel origin;
     @Mock private CommandController controller;
     @Mock private Channel channel;
     @Mock private Connection connection;

test/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -23,11 +23,11 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Before;
@@ -36,14 +36,15 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PartTest {
 
     @Mock private Channel channel;
-    @Mock private FrameContainer origin;
-    @Mock private FrameContainer windowModel;
+    @Mock private WindowModel origin;
+    @Mock private WindowModel windowModel;
     @Mock private AggregateConfigProvider manager;
     @Mock private CommandController controller;
     private Part command;

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -22,7 +22,6 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.events.DisplayProperty;
@@ -30,6 +29,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.colours.Colour;
@@ -46,7 +46,6 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.anyChar;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -62,6 +61,7 @@ public class SetNickColourTest {
     @Mock private ColourManagerFactory colourManagerFactory;
     @Mock private ColourManager colourManager;
     @Mock private CommandController controller;
+    @Mock private WindowModel tiw;
     private SetNickColour command;
 
     @Before
@@ -80,7 +80,6 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
@@ -89,7 +88,6 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNicknameValid() {
-        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments(controller, "/foo moo"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
         verify(channel).refreshClients();
@@ -98,7 +96,6 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNicknameInvalid() {
-        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments(controller, "/foo foo"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
         verify(channel, never()).refreshClients();
@@ -108,7 +105,6 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageInvalidColour() {
-        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments(controller, "/foo moo omg"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
@@ -117,7 +113,6 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageValidColour() {
-        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments(controller, "/foo moo 4"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
         verify(channel).refreshClients();

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,11 +21,11 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.when;
 public class MeTest {
 
     @Mock private Chat chat;
-    @Mock private FrameContainer frameContainer;
+    @Mock private WindowModel frameContainer;
     @Mock private CommandController controller;
     private Me command;
 

test/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands.flags;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Arrays;
 import java.util.List;
@@ -33,8 +33,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @RunWith(Parameterized.class)
 public class CommandFlagHandlerTest {
@@ -67,7 +71,7 @@ public class CommandFlagHandlerTest {
 
     @Test
     public void testParse() {
-        final FrameContainer container = mock(FrameContainer.class);
+        final WindowModel container = mock(WindowModel.class);
         final CommandController controller = mock(CommandController.class);
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -21,12 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.aliases.AliasFactory;
 import com.dmdirc.commandparser.aliases.AliasManager;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
 import org.junit.Before;
@@ -38,7 +38,6 @@ import org.mockito.runners.MockitoJUnitRunner;
 import static org.mockito.Matchers.anyChar;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -49,6 +48,7 @@ public class AliasCommandTest {
     @Mock private AliasManager aliasManager;
     @Mock private CommandController controller;
     @Mock private TabCompleterUtils tabCompleterUtils;
+    @Mock private WindowModel tiw;
     private AliasCommand command;
 
     @Before
@@ -60,8 +60,6 @@ public class AliasCommandTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
-
         command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new CommandContext(null, AliasCommand.INFO));
 
@@ -70,8 +68,6 @@ public class AliasCommandTest {
 
     @Test
     public void testUsageOneArg() {
-        final FrameContainer tiw = mock(FrameContainer.class);
-
         command.execute(tiw, new CommandArguments(controller, "/foo --remove"),
                 new CommandContext(null, AliasCommand.INFO));
 

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -21,12 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -51,7 +51,7 @@ public class IfpluginTest {
     @Mock private TabCompleterUtils tabCompleterUtils;
     @Mock private CommandController controller;
     @Mock private PluginManager pluginManager;
-    @Mock private FrameContainer tiw;
+    @Mock private WindowModel tiw;
     private Ifplugin command;
 
     @Before

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -22,7 +22,6 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.profiles.Profile;
@@ -31,6 +30,7 @@ import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionFactory;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.util.URIParser;
 
@@ -59,7 +59,7 @@ public class NewServerTest {
     @Mock private CommandController controller;
     @Mock private ProfileManager profileManager;
     @Mock private Profile identity;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private ServiceManager serviceManager;
     @Mock private ConnectionFactory factory;
     @Mock private Connection connection;

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -22,13 +22,13 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.util.URIParser;
 
@@ -55,7 +55,7 @@ public class ChangeServerTest {
     @Mock private DMDircMBassador eventBus;
     @Mock private ErrorManager errorManager;
     @Mock private CommandController controller;
-    @Mock private FrameContainer tiw;
+    @Mock private WindowModel tiw;
     @Mock private Profile profile;
     @Mock private Connection connection;
     private ChangeServer command;

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -24,13 +24,13 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Optional;
@@ -57,7 +57,7 @@ public class CommandParserTest {
     @Mock private CommandInfo channelCommandInfo;
     @Mock private Command command;
     @Mock private Command channelCommand;
-    @Mock private FrameContainer container;
+    @Mock private WindowModel container;
     @Mock private Channel channel;
     @Mock private Connection connection;
     @Mock private GroupChatManager groupChatManager;

test/com/dmdirc/ui/WindowManagerTest.java

@@ -23,7 +23,7 @@ package com.dmdirc.ui;
 
 import com.dmdirc.CustomWindow;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.FrameListener;
 
 import java.util.Arrays;
@@ -52,9 +52,9 @@ import static org.mockito.Mockito.when;
 public class WindowManagerTest {
 
     @Mock private FrameListener frameListener;
-    @Mock private FrameContainer container;
-    @Mock private FrameContainer child;
-    @Mock private FrameContainer grandchild;
+    @Mock private WindowModel container;
+    @Mock private WindowModel child;
+    @Mock private WindowModel grandchild;
     @Mock private DMDircMBassador eventBus;
     private WindowManager manager;
 
@@ -67,13 +67,13 @@ public class WindowManagerTest {
     public void testAddRoot() {
         manager.addListener(frameListener);
 
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), anyBoolean());
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), anyBoolean());
+        verify(frameListener, never()).addWindow(anyObject(), anyBoolean());
+        verify(frameListener, never()).addWindow(anyObject(), anyObject(), anyBoolean());
 
         manager.addWindow(container);
 
         verify(frameListener).addWindow(same(container), eq(true));
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), anyBoolean());
+        verify(frameListener, never()).addWindow(anyObject(), anyObject(), anyBoolean());
     }
 
     @Test
@@ -82,7 +82,7 @@ public class WindowManagerTest {
         manager.addListener(frameListener);
         manager.addWindow(container, child);
 
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), anyBoolean());
+        verify(frameListener, never()).addWindow(anyObject(), anyBoolean());
         verify(frameListener).addWindow(same(container), same(child), eq(true));
     }
 
@@ -106,9 +106,9 @@ public class WindowManagerTest {
 
         manager.removeWindow(child);
 
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), anyBoolean());
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), anyBoolean());
-        verify(frameListener, never()).delWindow((FrameContainer) anyObject());
+        verify(frameListener, never()).addWindow(anyObject(), anyBoolean());
+        verify(frameListener, never()).addWindow(anyObject(), anyObject(), anyBoolean());
+        verify(frameListener, never()).delWindow(anyObject());
         verify(frameListener).delWindow(same(container), same(child));
     }
 
@@ -119,10 +119,10 @@ public class WindowManagerTest {
         manager.removeListener(frameListener);
         manager.addWindow(container, child);
 
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), anyBoolean());
-        verify(frameListener, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), anyBoolean());
-        verify(frameListener, never()).delWindow((FrameContainer) anyObject());
-        verify(frameListener, never()).delWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
+        verify(frameListener, never()).addWindow(anyObject(), anyBoolean());
+        verify(frameListener, never()).addWindow(anyObject(), anyObject(), anyBoolean());
+        verify(frameListener, never()).delWindow(anyObject());
+        verify(frameListener, never()).delWindow(anyObject(), anyObject());
     }
 
     @Test
@@ -197,10 +197,9 @@ public class WindowManagerTest {
 
     @Test
     public void testGetRootWindows() {
-        final FrameContainer root1 = mock(FrameContainer.class);
-        final FrameContainer root2 = mock(FrameContainer.class);
-        final Collection<FrameContainer> rootWindows
-                = Arrays.asList(root1, root2);
+        final WindowModel root1 = mock(WindowModel.class);
+        final WindowModel root2 = mock(WindowModel.class);
+        final Collection<WindowModel> rootWindows = Arrays.asList(root1, root2);
 
         manager.addWindow(root1);
         manager.addWindow(root2);
@@ -238,7 +237,7 @@ public class WindowManagerTest {
         when(customContainer.getName()).thenReturn("test");
         when(customChild.getName()).thenReturn("test1");
         when(customContainer.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{customChild, }));
+                new WindowModel[]{customChild, }));
 
         manager.addWindow(customContainer);
         manager.addWindow(customContainer, customChild);
@@ -254,7 +253,7 @@ public class WindowManagerTest {
         when(customContainer.getName()).thenReturn("test");
         when(customChild.getName()).thenReturn("test1");
         when(customContainer.getChildren()).thenReturn(Arrays.asList(
-                new FrameContainer[]{customChild, }));
+                new WindowModel[]{customChild, }));
 
         manager.addWindow(customContainer);
         manager.addWindow(customContainer, customChild);