Weaken some things to WindowModel.

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

@@ -23,13 +23,13 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSelfmessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketclosedEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
@@ -70,7 +70,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param eventBus            The bus to dispatch events on.
      */
     public ChatContainer(
-            @Nullable final FrameContainer parent,
+            @Nullable final WindowModel parent,
             final DCCChat dcc,
             final AggregateConfigProvider configManager,
             final BackBufferFactory backBufferFactory,

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

@@ -26,6 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -58,7 +59,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
      * @param components          The UI components that this frame requires
      */
     public DCCFrameContainer(
-            @Nullable final FrameContainer parent,
+            @Nullable final WindowModel parent,
             final String title,
             final String icon,
             final AggregateConfigProvider configManager,

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -191,7 +190,7 @@ public class LagDisplayManager implements ConfigChangeListener {
         if (event.getNumeric() != 421) {
             return;
         }
-        final boolean useAlternate = ((FrameContainer) event.getConnection()).getConfigManager()
+        final boolean useAlternate = event.getConnection().getWindowModel().getConfigManager()
                 .getOptionBool(domain, "usealternate");
         final boolean isActive = isActiveWindow(event.getConnection());
         final String[] args = event.getArgs();

logging/src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -58,7 +58,7 @@ public class HistoryWindow extends FrameContainer {
     public HistoryWindow(
             final String title,
             final Path logFile,
-            final FrameContainer parent,
+            final WindowModel parent,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final int numLines) {

logging/src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -67,7 +66,7 @@ public class LoggingCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 0) {
             if ("history".equalsIgnoreCase(args.getArguments()[0])) {
-                if (!manager.showHistory((FrameContainer) origin)) {
+                if (!manager.showHistory(origin)) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR,
                             "Unable to open history for this window.");
                 }

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.logging;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -54,6 +53,7 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -371,7 +371,7 @@ public class LoggingManager implements ConfigChangeListener {
         final String filename = locator.getLogFile(event.getChannel().getName());
 
         if (autobackbuffer) {
-            showBackBuffer((FrameContainer) event.getChannel().getWindowModel(), filename);
+            showBackBuffer(event.getChannel().getWindowModel(), filename);
         }
 
         synchronized (FORMAT_LOCK) {
@@ -400,7 +400,7 @@ public class LoggingManager implements ConfigChangeListener {
      * @param frame    The frame to add the backbuffer lines to
      * @param filename File to get backbuffer from
      */
-    protected void showBackBuffer(final FrameContainer frame, final String filename) {
+    protected void showBackBuffer(final WindowModel frame, final String filename) {
         if (frame == null) {
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null, "Given a null frame", ""));
             return;
@@ -562,7 +562,7 @@ public class LoggingManager implements ConfigChangeListener {
      *
      * @return True if the history is available, false otherwise
      */
-    protected boolean showHistory(final FrameContainer target) {
+    protected boolean showHistory(final WindowModel target) {
         final String descriptor;
 
         if (target instanceof GroupChat) {