Make Commands take a WindowModel.

src/com/dmdirc/commandparser/aliases/AliasCommandHandler.java

@@ -27,6 +27,7 @@ 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;
 
@@ -43,11 +44,12 @@ public class AliasCommandHandler 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) {
         if (args.getArguments().length >= alias.getMinArguments()) {
             for (String line : alias.getSubstitution().split("\n")) {
-                origin.getCommandParser().parseCommand(origin, getSubstituteCommand(line, args));
+                origin.getCommandParser().parseCommand((FrameContainer) origin,
+                        getSubstituteCommand(line, args));
             }
         } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, alias.getName() + " requires at least "

src/com/dmdirc/commandparser/commands/Command.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.Styliser;
 
 import javax.annotation.Nonnull;
@@ -59,7 +59,7 @@ public abstract class Command {
      * @param type     The type of message to send
      * @param args     The arguments of the message
      */
-    protected final void sendLine(@Nullable final FrameContainer target,
+    protected final void sendLine(@Nullable final WindowModel target,
             final boolean isSilent, final String type, final Object... args) {
         if (!isSilent && target != null) {
             target.addLine(type, args);
@@ -74,7 +74,7 @@ public abstract class Command {
      * @param name     The name of the command that's raising the error
      * @param args     The arguments that the command accepts or expects
      */
-    protected final void showUsage(@Nullable final FrameContainer target,
+    protected final void showUsage(@Nullable final WindowModel target,
             final boolean isSilent, final String name, final String args) {
         sendLine(target, isSilent, "commandUsage",
                 controller.getCommandChar(),
@@ -144,7 +144,7 @@ public abstract class Command {
      *
      * @since 0.6.4
      */
-    public abstract void execute(@Nonnull FrameContainer origin, CommandArguments args,
+    public abstract void execute(@Nonnull WindowModel origin, CommandArguments args,
             CommandContext context);
 
 }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -61,7 +61,7 @@ public class Ban 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 GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
 

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class Cycle extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -35,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -63,7 +64,7 @@ public class Invite extends Command implements ExternalCommand {
     }
 
     @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) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -66,7 +66,7 @@ public class KickReason 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 GroupChat groupChat = ((ChannelCommandContext) context).getGroupChat();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -36,6 +36,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -65,7 +66,7 @@ public class Mode 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 GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
 

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -36,6 +36,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -64,7 +65,7 @@ public class Names 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 GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         channel.getConnection().get().getParser().get().sendRawMessage("NAMES "

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class Part extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -71,7 +71,7 @@ public class SetNickColour 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 GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
 

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -65,7 +66,7 @@ public class ShowTopic extends Command implements ExternalCommand {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.validators.ValidationResponse;
 
 import javax.annotation.Nonnull;
@@ -60,7 +61,7 @@ public class Me extends Command implements ValidatingCommand {
     }
 
     @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) {

src/com/dmdirc/commandparser/commands/flags/CommandFlagHandler.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.commandparser.commands.flags;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -75,7 +75,7 @@ public class CommandFlagHandler {
      *         encountered.
      */
     @Nullable
-    public CommandFlagResult process(final FrameContainer origin,
+    public CommandFlagResult process(final WindowModel origin,
             final CommandArguments arguments) {
         final Map<CommandFlag, Integer> results = parse(origin, arguments);
 
@@ -93,7 +93,7 @@ public class CommandFlagHandler {
      *         the <code>arguments</code> object. If an error occurs, null is returned.
      */
     @Nullable
-    protected Map<CommandFlag, Integer> parse(final FrameContainer origin,
+    protected Map<CommandFlag, Integer> parse(final WindowModel origin,
             final CommandArguments arguments) {
         enabledFlags.clear();
         disabledBy.clear();
@@ -177,7 +177,7 @@ public class CommandFlagHandler {
      */
     protected int readArguments(final CommandFlag flag,
             final CommandArguments arguments, final int offset, final int argCount,
-            final FrameContainer origin, final Map<CommandFlag, Integer> results) {
+            final WindowModel origin, final Map<CommandFlag, Integer> results) {
         final int lastArg = argCount + offset - 1;
 
         if (arguments.getArguments().length <= lastArg) {
@@ -251,7 +251,7 @@ public class CommandFlagHandler {
      * @param messageType The type of the line to be sent
      * @param args        The arguments for the specified messageType
      */
-    protected static void sendLine(final FrameContainer origin, final boolean isSilent,
+    protected static void sendLine(final WindowModel origin, final boolean isSilent,
             final String messageType, final Object... args) {
         if (origin != null && !isSilent) {
             origin.addLine(messageType, args);

src/com/dmdirc/commandparser/commands/global/AliasCommand.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;
@@ -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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -78,7 +78,7 @@ public class AliasCommand 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 < 2) {
             showUsage(origin, args.isSilent(), "alias", "[--remove] <name> [command]");

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

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -69,7 +70,7 @@ public class AllServers 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 String command = args.getArgumentsAsString();
 

src/com/dmdirc/commandparser/commands/global/Clear.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;
@@ -31,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;
@@ -57,7 +57,7 @@ public class Clear 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) {
         origin.getBackBuffer().getDocument().clear();
     }

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

@@ -85,7 +85,7 @@ public class Echo 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) {
         @Nullable final CommandFlagResult results = handler.process(origin, args);
 
@@ -105,12 +105,13 @@ public class Echo extends Command implements IntelligentCommand {
 
         if (results.hasFlag(targetFlag)) {
             FrameContainer frame = null;
-            Optional<FrameContainer> target = Optional.ofNullable(origin);
+            Optional<WindowModel> target = Optional.ofNullable(origin);
 
             while (frame == null && target.isPresent()) {
-                frame = windowManager.findCustomWindow(target.get(),
+                frame = windowManager.findCustomWindow((FrameContainer) target.get(),
                         results.getArgumentsAsString(targetFlag));
-                target = target.get().getParent();
+                // TODO: Somewhat insane...
+                target = Optional.ofNullable((WindowModel) target.get().getParent().orElse(null));
             }
 
             if (frame == null) {
@@ -125,8 +126,8 @@ public class Echo extends Command implements IntelligentCommand {
                         results.getArgumentsAsString()));
             }
         } else if (!args.isSilent()) {
-            origin.getEventBus().publishAsync(new CommandOutputEvent(origin, time.getTime(),
-                    results.getArgumentsAsString()));
+            origin.getEventBus().publishAsync(new CommandOutputEvent((FrameContainer) origin,
+                    time.getTime(), results.getArgumentsAsString()));
         }
     }
 

src/com/dmdirc/commandparser/commands/global/Exit.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;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -61,7 +61,7 @@ public class Exit extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         controller.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));

src/com/dmdirc/commandparser/commands/global/Help.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;
@@ -31,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 com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
@@ -66,7 +66,7 @@ public class Help 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) {
             showAllCommands(origin, args.isSilent());
@@ -81,7 +81,7 @@ public class Help extends Command implements IntelligentCommand {
      * @param origin   The window the command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
+    private void showAllCommands(final WindowModel origin, final boolean isSilent) {
         final List<String> commands = new ArrayList<>(origin.getCommandParser()
                 .getCommands().keySet());
 
@@ -118,7 +118,7 @@ public class Help extends Command implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param name     The name of the command to display info for
      */
-    private void showCommand(final FrameContainer origin, final boolean isSilent,
+    private void showCommand(final WindowModel origin, final boolean isSilent,
             final String name) {
         final Map.Entry<CommandInfo, Command> command;
 

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

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -85,7 +86,7 @@ public class Ifplugin 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) {
             showUsage(origin, args.isSilent(), "ifplugin", "<[!]plugin> <command>");
@@ -106,7 +107,8 @@ public class Ifplugin extends Command implements IntelligentCommand {
 
         if (result != negative) {
             if (origin.isWritable()) {
-                origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(1));
+                origin.getCommandParser().parseCommand(
+                        (FrameContainer) origin, args.getArgumentsAsString(1));
             } else {
                 globalCommandParserProvider.get()
                         .parseCommand(globalWindowProvider.get(), args.getArgumentsAsString(1));

src/com/dmdirc/commandparser/commands/global/LoadPlugin.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;
@@ -31,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.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
@@ -66,7 +66,7 @@ public class LoadPlugin 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(), "loadplugin", "<plugin>");

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

@@ -35,6 +35,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.ui.input.AdditionalTabTargets;
 import com.dmdirc.util.InvalidURIException;
@@ -82,7 +83,7 @@ public class NewServer 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(), "newserver", "<host[:[+]port]> [password]");
@@ -95,7 +96,7 @@ public class NewServer extends Command implements IntelligentCommand {
                     profileManager.getDefault());
             server.connect();
         } catch (InvalidURIException ex) {
-            origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
+            origin.getEventBus().publishAsync(new CommandErrorEvent((FrameContainer) origin,
                     "Invalid URI: " + ex.getMessage() +
                             (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage())));
         }

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

@@ -35,6 +35,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.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -83,10 +84,10 @@ public class OpenWindow 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) {
         int start = 0;
-        FrameContainer parent = null;
+        WindowModel parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
             final Optional<Connection> connection = origin.getConnection();
@@ -96,7 +97,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
                 return;
             }
 
-            parent = (FrameContainer) connection.get().getWindowModel();
+            parent = connection.get().getWindowModel();
             start = 1;
         } else if (args.getArguments().length > 0 && "--child".equals(args.getArguments()[0])) {
             parent = origin;
@@ -107,12 +108,13 @@ public class OpenWindow extends Command implements IntelligentCommand {
             showUsage(origin, args.isSilent(), "openwindow",
                     "[--server|--child] <name> [title]");
         } else {
-            final FrameContainer window;
+            final WindowModel window;
 
             if (parent == null) {
                 window = windowManager.findCustomWindow(args.getArguments()[start]);
             } else {
-                window = windowManager.findCustomWindow(parent, args.getArguments()[start]);
+                window = windowManager.findCustomWindow(
+                        (FrameContainer) parent, args.getArguments()[start]);
             }
 
             final String title = args.getArguments().length > start + 1
@@ -125,9 +127,9 @@ public class OpenWindow extends Command implements IntelligentCommand {
                             configProvider, eventBus, backBufferFactory);
                     windowManager.addWindow(newWindow);
                 } else {
-                    newWindow = new CustomWindow(args.getArguments()[start], title, parent,
-                            backBufferFactory);
-                    windowManager.addWindow(parent, newWindow);
+                    newWindow = new CustomWindow(args.getArguments()[start], title,
+                            (FrameContainer) parent, backBufferFactory);
+                    windowManager.addWindow((FrameContainer) parent, newWindow);
                 }
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,

src/com/dmdirc/commandparser/commands/global/ReloadIdentities.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;
@@ -31,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.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -63,7 +63,7 @@ public class ReloadIdentities 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) {
         identityController.loadUserIdentities();
 

src/com/dmdirc/commandparser/commands/global/ReloadPlugin.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;
@@ -31,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.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -65,7 +65,7 @@ public class ReloadPlugin 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(), "reloadplugin", "<plugin>");

src/com/dmdirc/commandparser/commands/global/SaveConfig.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;
@@ -31,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.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -63,7 +63,7 @@ public final class SaveConfig 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) {
         identityController.saveAll();
 

src/com/dmdirc/commandparser/commands/global/SetCommand.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;
@@ -37,6 +36,7 @@ import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -104,7 +104,7 @@ public class SetCommand 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) {
         @Nullable final CommandFlagResult res = handler.process(origin, args);
 
@@ -180,7 +180,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param isSilent Whether or not the command is being silenced or not
      * @param manager  The config manager to use to retrieve data
      */
-    private void doDomainList(final FrameContainer origin, final boolean isSilent,
+    private void doDomainList(final WindowModel origin, final boolean isSilent,
             final AggregateConfigProvider manager) {
         final StringBuilder output = new StringBuilder(67);
 
@@ -204,7 +204,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param manager  The config manager to use to retrieve data
      * @param domain   The domain to be inspected
      */
-    private void doOptionsList(final FrameContainer origin,
+    private void doOptionsList(final WindowModel origin,
             final boolean isSilent, final ReadOnlyConfigProvider manager, final String domain) {
         final StringBuilder output = new StringBuilder(24);
 
@@ -237,7 +237,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param domain   The domain of the option
      * @param option   The name of the option
      */
-    private void doShowOption(final FrameContainer origin,
+    private void doShowOption(final WindowModel origin,
             final boolean isSilent, final ReadOnlyConfigProvider manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
@@ -258,7 +258,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param option   The name of the option
      * @param newvalue The value the option should be set to
      */
-    private void doSetOption(final FrameContainer origin,
+    private void doSetOption(final WindowModel origin,
             final boolean isSilent, final ConfigProvider identity,
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
@@ -278,7 +278,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param option   The name of the option
      * @param data     The data to be appended
      */
-    private void doAppendOption(final FrameContainer origin,
+    private void doAppendOption(final WindowModel origin,
             final boolean isSilent, final ConfigProvider identity,
             final ReadOnlyConfigProvider manager,
             final String domain, final String option, final String data) {
@@ -296,7 +296,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param domain   The domain of the option
      * @param option   The name of the option
      */
-    private void doUnsetOption(final FrameContainer origin,
+    private void doUnsetOption(final WindowModel origin,
             final boolean isSilent, final ConfigProvider identity, final String domain,
             final String option) {
         identity.unsetOption(domain, option);

src/com/dmdirc/commandparser/commands/global/UnloadPlugin.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;
@@ -31,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.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -65,7 +65,7 @@ public class UnloadPlugin 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(), "unloadplugin", "<plugin>");

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -65,7 +66,7 @@ public class AllChannels 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 Connection server = ((ServerCommandContext) context).getConnection();
         final String command = args.getArgumentsAsString();

src/com/dmdirc/commandparser/commands/server/Away.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;
@@ -33,6 +32,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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -58,7 +58,7 @@ public class Away extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line = args.getArgumentsAsString();

src/com/dmdirc/commandparser/commands/server/Back.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;
@@ -34,6 +33,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.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -60,7 +60,7 @@ public class Back 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 Connection connection = ((ServerCommandContext) context).getConnection();
         connection.getParser().get().getLocalClient().setBack();

src/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
@@ -67,7 +68,7 @@ public class ChangeServer 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(), "server", "<host[:[+]port]> [password]");
@@ -80,7 +81,8 @@ public class ChangeServer extends Command {
             connection.connect(address, connection.getProfile());
         } catch (InvalidURIException ex) {
             origin.getEventBus().publishAsync(
-                    new CommandErrorEvent(origin, "Invalid URI: " + ex.getMessage() +
+                    new CommandErrorEvent(
+                            (FrameContainer) origin, "Invalid URI: " + ex.getMessage() +
                             (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage())));
         }
     }

src/com/dmdirc/commandparser/commands/server/Ctcp.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;
@@ -34,6 +33,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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -62,7 +62,7 @@ public class Ctcp 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 Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length < 2) {

src/com/dmdirc/commandparser/commands/server/Disconnect.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;
@@ -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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -57,7 +57,7 @@ public class Disconnect extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line;

src/com/dmdirc/commandparser/commands/server/Ignore.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;
@@ -33,6 +32,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.common.IgnoreList;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -66,7 +66,7 @@ public class Ignore 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 Connection connection = ((ServerCommandContext) context).getConnection();
 
@@ -81,7 +81,7 @@ public class Ignore extends Command implements IntelligentCommand {
         }
     }
 
-    protected void executeView(final FrameContainer origin, final Connection connection,
+    protected void executeView(final WindowModel origin, final Connection connection,
             final boolean isSilent, final CommandArguments args, final boolean forceRegex) {
         final IgnoreList ignoreList = connection.getIgnoreList();
 
@@ -109,7 +109,7 @@ public class Ignore extends Command implements IntelligentCommand {
         }
     }
 
-    protected void executeAdd(final FrameContainer origin, final Connection connection,
+    protected void executeAdd(final WindowModel origin, final Connection connection,
             final boolean isSilent, final CommandArguments args) {
         final IgnoreList ignoreList = connection.getIgnoreList();
         final String target = args.getArgumentsAsString();
@@ -119,7 +119,7 @@ public class Ignore extends Command implements IntelligentCommand {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRegex(final FrameContainer origin, final Connection connection,
+    protected void executeRegex(final WindowModel origin, final Connection connection,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             executeView(origin, connection, args.isSilent(), args, true);
@@ -143,7 +143,7 @@ public class Ignore extends Command implements IntelligentCommand {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRemove(final FrameContainer origin, final Connection connection,
+    protected void executeRemove(final WindowModel origin, final Connection connection,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             showUsage(origin, args.isSilent(), "ignore", "--remove <host>");

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -35,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.events.ClientLineAddedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;
@@ -85,7 +86,7 @@ public class JoinChannelCommand 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 Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -36,6 +36,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -68,7 +69,7 @@ public class Message 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 Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length < 2) {

src/com/dmdirc/commandparser/commands/server/Nick.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;
@@ -34,6 +33,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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -62,7 +62,7 @@ public class Nick 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 Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length == 0) {

src/com/dmdirc/commandparser/commands/server/Notice.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;
@@ -34,6 +33,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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -62,7 +62,7 @@ public class Notice 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 Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length < 2) {

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -36,6 +36,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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
@@ -66,7 +67,7 @@ public class OpenQuery 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(), "query", "<target> <message>");

src/com/dmdirc/commandparser/commands/server/Raw.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;
@@ -33,6 +32,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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class Raw extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line = args.getArgumentsAsString();

src/com/dmdirc/commandparser/commands/server/RawServerCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 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 javax.annotation.Nonnull;
 
@@ -56,7 +56,7 @@ public class RawServerCommand extends Command implements CommandInfo {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         connection.getParser().get().sendRawMessage(myName.toUpperCase() + ' '

src/com/dmdirc/commandparser/commands/server/Reconnect.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;
@@ -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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -57,7 +57,7 @@ public class Reconnect extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line;

src/com/dmdirc/commandparser/commands/server/Umode.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -60,7 +60,7 @@ public class Umode extends Command {
     }
 
     @Override
-    public void execute(@Nonnull final FrameContainer origin,
+    public void execute(@Nonnull final WindowModel origin,
             final CommandArguments args, final CommandContext context) {
         final Connection connection = ((ServerCommandContext) context).getConnection();
         if (connection.getState() != ServerState.CONNECTED) {