Make commands take a WindowModel.

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

 
 package com.dmdirc.addons.activewindow;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 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;
 
     }
 
     @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

 
 package com.dmdirc.addons.audio;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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;
 
     }
 
     @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

 
 package com.dmdirc.addons.audio;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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;
 
     }
 
     @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

 
 package com.dmdirc.addons.calc;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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;
 
     }
 
     @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

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

 
 package com.dmdirc.addons.contactlist;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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;
     }
 
     @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

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

 
 package com.dmdirc.addons.dcop;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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;
 
     }
 
     @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

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

 
 package com.dmdirc.addons.dns;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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;
 
     }
 
     @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>");
         }, 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

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

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

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

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

 
 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;
         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",
     }
 
     @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])) {
      * @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

 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.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;
 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);
     }
 
     @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
                     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)));
                     }
                 }
             }
         } else {
             if (manager.hasRunningSource()) {
-                target.getWindowModel().getCommandParser().parseCommand(origin,
+                target.getWindowModel().getCommandParser().parseCommand((FrameContainer) origin,
                         getInformation(manager.getBestSource(), args.
                                 getArgumentsAsString(0)));
             } else {
      * @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

 
 package com.dmdirc.addons.osd;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 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;
 
     }
 
     @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

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

 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
 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;
 
     /**
      * 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

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

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

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

 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;
 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 "
     }
 
     @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) {
         }
     }
 
-    private void doCommand(final FrameContainer origin, final CommandArguments args) {
+    private void doCommand(final WindowModel origin, final CommandArguments args) {
         final int repetitions;
         final int interval;
 
             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);
         }
     }
 
-    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");
      * @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

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

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

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

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

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

 
 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;
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         manager.flashWindow();
     }