Make commands take a WindowModel.

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

@@ -22,7 +22,6 @@
 
 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;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -70,7 +70,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    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()));

audio/src/com/dmdirc/addons/audio/AudioCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.audio;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.io.File;
 
@@ -56,7 +56,7 @@ public class AudioCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final String filename = args.getArgumentsAsString();
         final File file = new File(filename);

audio/src/com/dmdirc/addons/audio/BeepCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.audio;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.awt.Toolkit;
 
@@ -59,7 +59,7 @@ public class BeepCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         toolkit.beep();
     }

calc/src/com/dmdirc/addons/calc/CalcCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.calc;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.text.ParseException;
 
@@ -58,7 +58,7 @@ public class CalcCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         try {
             int offset = 0;

conditional_execute/src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -59,7 +60,7 @@ public class ConditionalExecuteCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         final String cmdname = args.getWordsAsString(0, 0);
 
@@ -238,7 +239,8 @@ public class ConditionalExecuteCommand extends Command {
             } else {
                 // Command to run!
                 if (namespace.canRun(inverse) && origin.isWritable()) {
-                    origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(i));
+                    origin.getCommandParser().parseCommand((FrameContainer) origin,
+                            args.getArgumentsAsString(i));
                 }
                 return;
             }

contactlist/src/com/dmdirc/addons/contactlist/ContactListCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.contactlist;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -58,7 +58,7 @@ public class ContactListCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final ChannelCommandContext chanContext = (ChannelCommandContext) context;
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.events.DccChatRequestSentEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
 import com.dmdirc.addons.dcc.io.DCC;
@@ -43,6 +42,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -106,7 +106,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 1) {
             final String target = args.getArguments()[1];
@@ -157,7 +157,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param isSilent   Is this a silent command
      */
     private void startChat(final Parser parser, final Connection connection,
-            final FrameContainer origin, final String myNickname,
+            final WindowModel origin, final String myNickname,
             final String target, final boolean isSilent) {
         final DCCChat chat = new DCCChat();
         if (myPlugin.listen(chat)) {
@@ -197,7 +197,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
      *
      * @since 0.6.3m1
      */
-    public void sendFile(final String target, final FrameContainer origin,
+    public void sendFile(final String target, final WindowModel origin,
             final Connection connection, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);

dcop/src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.dcop;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.List;
 
@@ -63,7 +63,7 @@ public class DcopCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final String[] arguments = args.getArguments();
         if (arguments.length != 3) {

debug/src/com/dmdirc/addons/debug/Debug.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.ArrayList;
@@ -81,7 +82,7 @@ public class Debug extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "debug",
@@ -97,7 +98,7 @@ public class Debug extends Command implements IntelligentCommand {
                         Arrays.asList((controller.getCommandChar()
                                 + command.getName() + ' '
                                 + args.getArgumentsAsString(1)).split(" ")));
-                command.execute(origin, newArgs, context);
+                command.execute((FrameContainer) origin, newArgs, context);
             }
         }
     }

dns/src/com/dmdirc/addons/dns/DNSCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.dns;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import com.google.common.net.InetAddresses;
 
@@ -64,7 +64,7 @@ public class DNSCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "dns", "<IP|hostname>");
@@ -81,7 +81,7 @@ public class DNSCommand extends Command {
         }, 0);
     }
 
-    private void resolve(@Nonnull final FrameContainer origin, final boolean isSilent,
+    private void resolve(@Nonnull final WindowModel origin, final boolean isSilent,
             final String arg) {
         try {
             final InetAddress address = InetAddresses.forString(arg);

exec/src/com/dmdirc/addons/exec/ExecCommand.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.exec;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.CommandUtils;
 import com.dmdirc.util.io.StreamUtils;
@@ -70,7 +70,7 @@ public class ExecCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final String[] commandArray = CommandUtils.parseArguments(
                 args.getArgumentsAsString());

freedesktop_notifications/src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -58,7 +58,7 @@ public final class FDNotifyCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         new Thread() {
 

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

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -62,11 +63,11 @@ public class LoggingCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 0) {
             if ("history".equalsIgnoreCase(args.getArguments()[0])) {
-                if (!manager.showHistory(origin)) {
+                if (!manager.showHistory((FrameContainer) origin)) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR,
                             "Unable to open history for this window.");
                 }

nma/src/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.nma;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.PluginDomain;
 
 import java.io.IOException;
@@ -68,7 +68,7 @@ public class NotifyMyAndroidCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final String[] parts = args.getArgumentsAsString().split("\\s+--\\s+", 2);
         LOG.trace("Split input: {}", (Object[]) parts);

notifications/src/com/dmdirc/addons/notifications/NotificationCommand.java

@@ -22,14 +22,15 @@
 
 package com.dmdirc.addons.notifications;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.Collection;
@@ -44,7 +45,7 @@ public class NotificationCommand extends Command implements
         IntelligentCommand {
 
     /** A command info object for this command. */
-    public static final BaseCommandInfo INFO = new BaseCommandInfo(
+    public static final CommandInfo INFO = new BaseCommandInfo(
             "notification",
             "notification [--methods|--method <method>] text - "
             + "Notifies you of the text",
@@ -66,7 +67,7 @@ public class NotificationCommand extends Command implements
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 0 &&
                 "--methods".equalsIgnoreCase(args.getArguments()[0])) {
@@ -101,7 +102,7 @@ public class NotificationCommand extends Command implements
      * @param origin   The input window where the command was entered
      * @param isSilent Whether this command is being silenced
      */
-    private void doMethodList(final FrameContainer origin,
+    private void doMethodList(final WindowModel origin,
             final boolean isSilent) {
         final Collection<String> handlers = manager.getHandlerNames();
 

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -26,6 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -33,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -51,7 +53,7 @@ import javax.inject.Inject;
 public class NowPlayingCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
-    public static final BaseCommandInfo INFO = new BaseCommandInfo("nowplaying",
+    public static final CommandInfo INFO = new BaseCommandInfo("nowplaying",
             "nowplaying [--sources|--source <source>] [format] - "
             + "tells the channel the song you're currently playing",
             CommandType.TYPE_CHAT);
@@ -87,7 +89,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Chat target = ((ChatCommandContext) context).getChat();
         if (args.getArguments().length > 0
@@ -105,7 +107,8 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
                     if (source.getState() == MediaSourceState.CLOSED) {
                         sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source is not running.");
                     } else {
-                        target.getWindowModel().getCommandParser().parseCommand(origin,
+                        target.getWindowModel().getCommandParser().parseCommand(
+                                (FrameContainer) origin,
                                 getInformation(source, args.getArgumentsAsString(2)));
                     }
                 }
@@ -115,7 +118,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
             }
         } else {
             if (manager.hasRunningSource()) {
-                target.getWindowModel().getCommandParser().parseCommand(origin,
+                target.getWindowModel().getCommandParser().parseCommand((FrameContainer) origin,
                         getInformation(manager.getBestSource(), args.
                                 getArgumentsAsString(0)));
             } else {
@@ -132,7 +135,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
      * @param isSilent Whether this command is being silenced
      * @param format   Format to be passed to getInformation
      */
-    private void doSourceList(final FrameContainer origin, final boolean isSilent,
+    private void doSourceList(final WindowModel origin, final boolean isSilent,
             final String format) {
         final List<MediaSource> sources = manager.getSources();
 

osd/src/com/dmdirc/addons/osd/OsdCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.osd;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -78,7 +78,7 @@ public class OsdCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 0
                 && "--close".equalsIgnoreCase(args.getArguments()[0])) {

osx_integration/src/com/dmdirc/addons/osx_integration/DockBounceCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.osx_integration;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -65,7 +65,7 @@ public class DockBounceCommand extends Command {
 
     @Override
     public void execute(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandArguments args,
             final CommandContext context) {
         apple.requestUserAttention(false);

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 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;
@@ -69,13 +69,12 @@ public final class ParserDebugCommand extends Command {
 
     /**
      * Executes this command.
-     *
-     * @param origin      The frame container in which this command was issued
+     *  @param origin      The frame container in which this command was issued
      * @param commandArgs The user supplied arguments
      * @param context     The Context of this command execution
      */
     @Override
-    public void execute(@Nonnull final FrameContainer origin, final CommandArguments commandArgs,
+    public void execute(@Nonnull final WindowModel origin, final CommandArguments commandArgs,
             final CommandContext context) {
         final boolean isSilent = commandArgs.isSilent();
 

redirect/src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -78,7 +79,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Chat target = ((ChatCommandContext) context).getChat();
         target.getWindowModel().getCommandParser().parseCommand(

scriptplugin/src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.scriptplugin;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -100,7 +100,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         final String[] sargs = args.getArguments();
 

systray/src/com/dmdirc/addons/systray/PopupCommand.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.systray;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -72,7 +72,7 @@ public class PopupCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         showPopup("DMDirc", args.getArgumentsAsString());
     }

time/src/com/dmdirc/addons/time/TimerCommand.java

@@ -25,11 +25,13 @@ package com.dmdirc.addons.time;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.Map.Entry;
@@ -46,7 +48,7 @@ import javax.inject.Inject;
 public class TimerCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
-    public static final BaseCommandInfo INFO = new BaseCommandInfo("timer",
+    public static final CommandInfo INFO = new BaseCommandInfo("timer",
             "timer [--list|--cancel <timer id> | <repetitions> <interval> "
             + "<command>] - lists all active timers / cancels an active timer "
             + "of given ID / schedules a command to be executed after a certain "
@@ -69,7 +71,7 @@ public class TimerCommand extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
 
         if (args.getArguments().length > 0) {
@@ -93,7 +95,7 @@ public class TimerCommand extends Command implements IntelligentCommand {
         }
     }
 
-    private void doCommand(final FrameContainer origin, final CommandArguments args) {
+    private void doCommand(final WindowModel origin, final CommandArguments args) {
         final int repetitions;
         final int interval;
 
@@ -112,12 +114,12 @@ public class TimerCommand extends Command implements IntelligentCommand {
             return;
         }
 
-        manager.addTimer(repetitions, interval, command, origin);
+        manager.addTimer(repetitions, interval, command, (FrameContainer) origin);
 
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
     }
 
-    private void doCancel(final FrameContainer origin, final boolean isSilent, final String arg) {
+    private void doCancel(final WindowModel origin, final boolean isSilent, final String arg) {
         final int timerKey;
         try {
             timerKey = Integer.parseInt(arg);
@@ -133,7 +135,7 @@ public class TimerCommand extends Command implements IntelligentCommand {
         }
     }
 
-    private void doList(final FrameContainer origin, final boolean isSilent) {
+    private void doList(final WindowModel origin, final boolean isSilent) {
         final Set<Entry<Integer, TimedCommand>> timerList = manager.listTimers();
         if (timerList.isEmpty()) {
             sendLine(origin, isSilent, FORMAT_ERROR, "There are currently no active timers");
@@ -151,7 +153,7 @@ public class TimerCommand extends Command implements IntelligentCommand {
      * @param origin   The window that the command was entered in
      * @param isSilent Whether this command is being silenced or not
      */
-    private void doUsage(final FrameContainer origin, final boolean isSilent) {
+    private void doUsage(final WindowModel origin, final boolean isSilent) {
         showUsage(origin, isSilent, INFO.getName(), INFO.getHelp());
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -36,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -68,7 +68,7 @@ public class ChannelSettings extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         dialogProvider.displayOrRequestFocus(((ChannelCommandContext) context).getGroupChat());
     }

ui_swing/src/com/dmdirc/addons/ui_swing/commands/Input.java

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -66,17 +67,17 @@ public class Input extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "input",
                     "[--clear] <text to insert into inputfield");
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
-            ((InputWindow) windowFactory.getSwingWindow(origin))
+            ((InputWindow) windowFactory.getSwingWindow((FrameContainer) origin))
                     .getInputHandler().clearInputField();
         } else {
-            ((InputWindow) windowFactory.getSwingWindow(origin))
+            ((InputWindow) windowFactory.getSwingWindow((FrameContainer) origin))
                     .getInputHandler().addToInputField(args
                             .getArgumentsAsString());
         }

ui_swing/src/com/dmdirc/addons/ui_swing/commands/PopInCommand.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -65,10 +66,10 @@ public class PopInCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         UIUtilities.invokeLater(() -> {
-            final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
+            final TextFrame swingWindow = windowFactory.getSwingWindow((FrameContainer) origin);
             if (swingWindow == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
                         + " currently no window to pop in.");

ui_swing/src/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -65,10 +66,10 @@ public class PopOutCommand extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
         UIUtilities.invokeLater(() -> {
-            final TextFrame swingWindow = windowFactory.getSwingWindow(origin);
+            final TextFrame swingWindow = windowFactory.getSwingWindow((FrameContainer) origin);
             if (swingWindow == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "There is"
                         + " currently no window to pop out.");

ui_swing/src/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -67,7 +67,7 @@ public class ServerSettings extends Command implements IntelligentCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         dialogProvider.displayOrRequestFocus(
                 context.getSource().getConnection().orElse(null));

windowflashing/src/com/dmdirc/addons/windowflashing/FlashWindow.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.windowflashing;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class FlashWindow extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         manager.flashWindow();
     }