Commands now use containers not windows

Fixes issue 3998

Change-Id: I901ed80272a445f2bd303a01e842e6f50cc5ae04
Reviewed-on: http://gerrit.dmdirc.com/1116
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/GlobalWindow.java

@@ -108,7 +108,7 @@ public class GlobalWindow extends WritableFrameContainer {
     @Override
     public void sendLine(final String line) {
         if (!line.isEmpty()) {
-            GlobalCommandParser.getGlobalCommandParser().parseCommand(window,
+            GlobalCommandParser.getGlobalCommandParser().parseCommand(this,
                     CommandManager.getCommandChar() + line);
         }
     }

src/com/dmdirc/actions/ActionModel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
@@ -29,8 +30,6 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -132,22 +131,22 @@ public class ActionModel {
             return true;
         }
 
-        final Window active = WindowManager.getActiveWindow().getFrame();
-        InputWindow cw = null;
+        final FrameContainer active = WindowManager.getActiveWindow();
+        WritableFrameContainer cw = null;
         CommandParser cp = null;
 
         if (arguments.length > 0 && arguments[0] instanceof WritableFrameContainer) {
-            cw = ((WritableFrameContainer) arguments[0]).getFrame();
-        } else if (active instanceof InputWindow) {
-            cw = (InputWindow) active;
+            cw = (WritableFrameContainer) arguments[0];
+        } else if (active instanceof WritableFrameContainer) {
+            cw = (WritableFrameContainer) active;
         } else if (ServerManager.getServerManager().numServers() > 0) {
-            cw = ServerManager.getServerManager().getServers().get(0).getFrame();
+            cw = ServerManager.getServerManager().getServers().get(0);
         }
 
         if (cw == null) {
             cp = GlobalCommandParser.getGlobalCommandParser();
         } else {
-            cp = cw.getCommandParser();
+            cp = cw.getFrame().getCommandParser();
         }
 
         for (String command : response) {

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -45,7 +46,7 @@ public abstract class ChannelCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(InputWindow origin, Server server, Channel channel,
+    public abstract void execute(FrameContainer origin, Server server, Channel channel,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a command that can be performed in the context of a "chat" window
@@ -47,7 +47,7 @@ public abstract class ChatCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(InputWindow origin, Server server, MessageTarget target,
+    public abstract void execute(FrameContainer origin, Server server, MessageTarget target,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 
 /**
@@ -46,7 +46,7 @@ public abstract class Command {
      * @param type The type of message to send
      * @param args The arguments of the message
      */
-    protected final void sendLine(final InputWindow target,
+    protected final void sendLine(final FrameContainer target,
             final boolean isSilent, final String type, final Object ... args) {
         if (!isSilent && target != null) {
             target.addLine(type, args);
@@ -61,7 +61,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(final InputWindow target,
+    protected final void showUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
         sendLine(target, isSilent, "commandUsage", CommandManager.getCommandChar(),
                 name, args);

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

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * An external command is a channel command that can be executed from outside
@@ -43,7 +43,7 @@ public interface ExternalCommand {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    void execute(InputWindow origin, Server server, String channel,
+    void execute(FrameContainer origin, Server server, String channel,
             boolean isSilent, CommandArguments args);
 
 }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -44,7 +45,7 @@ public abstract class GlobalCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(InputWindow origin, boolean isSilent, CommandArguments args);
+    public abstract void execute(FrameContainer origin, boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */
     @Override

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a query.
@@ -46,7 +46,7 @@ public abstract class QueryCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(InputWindow origin, Server server, Query query,
+    public abstract void execute(FrameContainer origin, Server server, Query query,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic server command. Server commands are associated with
@@ -45,7 +45,7 @@ public abstract class ServerCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(InputWindow origin, Server server,
+    public abstract void execute(FrameContainer origin, Server server,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
@@ -31,7 +32,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick command bans a specified user or host from the channel.
@@ -49,7 +49,7 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "ban", "<user|host>");

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -31,7 +32,6 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Opens the channel settings window for the channel.
@@ -49,7 +49,7 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         Main.getUI().showChannelSettingsDialog(channel);
     }

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

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
@@ -47,7 +47,7 @@ public final class Cycle extends ChannelCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "cyclemessage"));

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
@@ -32,7 +33,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick command kicks a specified user from the channel.
@@ -51,7 +51,7 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "kick", "<user> [reason]");

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
@@ -33,7 +34,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The mode command allows the user to inspect and change channel modes.
@@ -52,7 +52,7 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
 
@@ -65,7 +65,7 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             server.getParser().sendRawMessage("MODE " + channel);

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -31,7 +32,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Sends a names request.
@@ -52,7 +52,7 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server, 
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage("NAMES " + channel.getChannelInfo().getName());
     }
@@ -60,7 +60,7 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage("NAMES " + channel);
     }    

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

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The part command parts the current channel with a specified part message.
@@ -46,7 +46,7 @@ public final class Part extends ChannelCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "partmessage"));

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.ChannelClientProperty;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -33,7 +34,6 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -53,17 +53,19 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
     
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked") @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         
         int offset = 0;
         boolean nicklist = true;
         boolean text = true;
         
-        if (args.getArguments().length > offset && args.getArguments()[offset].equalsIgnoreCase("--nicklist")) {
+        if (args.getArguments().length > offset && args.getArguments()[offset]
+                .equalsIgnoreCase("--nicklist")) {
             text = false;
             offset++;
-        } else if (args.getArguments().length > offset && args.getArguments()[offset].equalsIgnoreCase("--text")) {
+        } else if (args.getArguments().length > offset && args.getArguments()[offset]
+                .equalsIgnoreCase("--text")) {
             nicklist = false;
             offset++;
         }
@@ -73,11 +75,13 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
             return;
         }
         
-        final ChannelClientInfo target = channel.getChannelInfo().getChannelClient(args.getArguments()[offset]);
+        final ChannelClientInfo target = channel.getChannelInfo()
+                .getChannelClient(args.getArguments()[offset]);
         offset++;
         
         if (target == null) {
-            sendLine(origin, isSilent, FORMAT_ERROR, "No such nickname (" + args.getArguments()[offset - 1] + ")!");
+            sendLine(origin, isSilent, FORMAT_ERROR, "No such nickname ("
+                    + args.getArguments()[offset - 1] + ")!");
         } else if (args.getArguments().length <= offset) {
             // We're removing the colour
             if (nicklist) {

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The show topic command shows the user the current topic.
@@ -48,7 +48,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             final ChannelInfo cChannel = channel.getChannelInfo();
@@ -69,7 +69,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             server.getParser().sendRawMessage("TOPIC " + channel);

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -46,7 +47,7 @@ public final class Me extends ChatCommand implements ValidatingCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final MessageTarget target, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "me", "<action>");

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -29,7 +31,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The Active command issues a command to the active window.
@@ -48,14 +49,15 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         final String command = args.getArgumentsAsString();
         
-        final InputWindow window = (InputWindow) WindowManager.getActiveWindow();
+        final FrameContainer window = WindowManager.getActiveWindow();
         
-        if (window != null) {
-            window.getCommandParser().parseCommand(window, command);
+        if (window != null && window instanceof WritableFrameContainer) {
+            ((WritableFrameContainer) window).getFrame()
+                    .getCommandParser().parseCommand(window, command);
         }
     }
     

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.wrappers.Alias;
@@ -32,7 +33,6 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The alias command allows users to create aliases on-the-fly.
@@ -53,7 +53,7 @@ public final class AliasCommand extends GlobalCommand implements
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
                         final CommandArguments args) {
         if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "alias", "[--remove] <name> [command]");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.CommandArguments;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The AllServers command allows users to issue commands to all servers.
@@ -47,14 +47,12 @@ public final class AllServers extends GlobalCommand implements IntelligentComman
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         final String command = args.getArgumentsAsString();
-        InputWindow window;
         
         for (Server target : ServerManager.getServerManager().getServers()) {
-            window = target.getFrame();
-            window.getCommandParser().parseCommand(window, command);
+            target.getFrame().getCommandParser().parseCommand(target, command);
         }
     }
     

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The clear command clears the main text area of the current window.
@@ -47,9 +47,9 @@ public final class Clear extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent, 
+    public void execute(final FrameContainer origin, final boolean isSilent, 
             final CommandArguments args) {
-        origin.clear();
+        origin.getDocument().clear();
     }
     
     

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -37,7 +38,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.updater.UpdateChecker;
 
@@ -64,7 +64,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "debug", "<debug command> [options]");
@@ -102,7 +102,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
             Main.getUI().showMigrationWizard();
         } else if ("notify".equals(args.getArguments()[0])) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Current notification colour is: "
-                    + origin.getContainer().getNotification());
+                    + origin.getNotification());
         } else {
             sendLine(origin, isSilent, FORMAT_ERROR, "Unknown debug action.");
         }
@@ -142,12 +142,11 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doShowRaw(final InputWindow origin, final boolean isSilent) {
-        if (origin == null || origin.getContainer() == null
-                || origin.getContainer().getServer() == null) {
+    private void doShowRaw(final FrameContainer origin, final boolean isSilent) {
+        if (origin == null || origin.getServer() == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Cannot show raw window here.");
         } else {
-            origin.getContainer().getServer().addRaw();
+            origin.getServer().addRaw();
         }
     }
     
@@ -158,7 +157,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param args Arguments array for the command
      */
-    private void doConfigStats(final InputWindow origin, final boolean isSilent,
+    private void doConfigStats(final FrameContainer origin, final boolean isSilent,
             final String[] args) {
         int arg = -1;
         if (args.length == 2) {
@@ -192,7 +191,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param regex Regex to match options against
      */
-    private void doConfigStatsOption(final InputWindow origin,
+    private void doConfigStatsOption(final FrameContainer origin,
             final boolean isSilent, final String regex) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         boolean found = false;
@@ -216,7 +215,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param top Top number of entries to show
      */
-    private void doConfigStatsTop(final InputWindow origin,
+    private void doConfigStatsTop(final FrameContainer origin,
             final boolean isSilent, final int top) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         int i = 0;
@@ -238,7 +237,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param cutoff Cut off value for stats
      */
-    private void doConfigStatsCutOff(final InputWindow origin,
+    private void doConfigStatsCutOff(final FrameContainer origin,
             final boolean isSilent, final int cutoff) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         for (Map.Entry<String, Integer> entry : sortedStats) {
@@ -269,7 +268,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doMemInfo(final InputWindow origin, final boolean isSilent) {
+    private void doMemInfo(final FrameContainer origin, final boolean isSilent) {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Total Memory: "
                 + Runtime.getRuntime().totalMemory());
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Free Memory: "
@@ -284,7 +283,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doColourSpam(final InputWindow origin, final boolean isSilent) {
+    private void doColourSpam(final FrameContainer origin, final boolean isSilent) {
         for (int i = 0; i < 100; i++) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, ((char) 3) + "5Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "
@@ -300,7 +299,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doGarbage(final InputWindow origin, final boolean isSilent) {
+    private void doGarbage(final FrameContainer origin, final boolean isSilent) {
         System.gc();
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Invoked garbage collector.");
     }
@@ -311,7 +310,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doConfigInfo(final InputWindow origin, final boolean isSilent) {
+    private void doConfigInfo(final FrameContainer origin, final boolean isSilent) {
         for (Identity source : origin.getConfigManager().getSources()) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, source.getTarget() + " - "
                     + source + "(" + source.getTarget().getOrder() + ")");
@@ -324,7 +323,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doGlobalConfigInfo(final InputWindow origin, final boolean isSilent) {
+    private void doGlobalConfigInfo(final FrameContainer origin, final boolean isSilent) {
         for (Identity source : IdentityManager.getGlobalConfig().getSources()) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, source.getTarget() + " - "
                     + source + "(" + source.getTarget().getOrder() + ")");
@@ -337,7 +336,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doForceUpdate(final InputWindow origin, final boolean isSilent) {
+    private void doForceUpdate(final FrameContainer origin, final boolean isSilent) {
         if (IdentityManager.getGlobalConfig().getOptionBool("updater", "enable")) {
             new Thread(new UpdateChecker(), "Forced update checker").start();
         } else {
@@ -354,7 +353,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doThreads(final InputWindow origin, final boolean isSilent) {
+    private void doThreads(final FrameContainer origin, final boolean isSilent) {
         for (Entry<Thread, StackTraceElement[]> thread: Thread.getAllStackTraces().entrySet()) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_BOLD
                     + thread.getKey().getName());
@@ -372,11 +371,11 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doServerState(final InputWindow origin, final boolean isSilent) {
-        if (origin.getContainer().getServer() == null) {
+    private void doServerState(final FrameContainer origin, final boolean isSilent) {
+        if (origin.getServer() == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "This window isn't connected to a server");
         } else {
-            final Server server = origin.getContainer().getServer();
+            final Server server = origin.getServer();
             sendLine(origin, isSilent, FORMAT_OUTPUT, server.getStatus().getTransitionHistory());
         }
     }
@@ -387,11 +386,11 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doServerInfo(final InputWindow origin, final boolean isSilent) {
-        if (origin.getContainer().getServer() == null) {
+    private void doServerInfo(final FrameContainer origin, final boolean isSilent) {
+        if (origin.getServer() == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "This window isn't connected to a server");
         } else {
-            final Server server = origin.getContainer().getServer();
+            final Server server = origin.getServer();
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Server name: " + server.getName());
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Actual name: "
                     + server.getParser().getServerName());
@@ -412,7 +411,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * 
      * @param origin The window this command was executed in
      */
-    private void doBenchmark(final InputWindow origin) {
+    private void doBenchmark(final FrameContainer origin) {
         long[] results = new long[10];
         
         for (int i = 0; i < results.length; i++) {
@@ -440,7 +439,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param args The arguments that were passed to the command
      */
-    private void doServices(final InputWindow origin, final boolean isSilent,
+    private void doServices(final FrameContainer origin, final boolean isSilent,
             final String[] args) {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Available Services:");
         for (Service service : PluginManager.getPluginManager().getAllServices()) {

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

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,7 +54,7 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length > 0
                 && args.getArguments()[0].equalsIgnoreCase("--active")) {
@@ -64,11 +63,10 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
         } else if (args.getArguments().length > 1
                 && args.getArguments()[0].equalsIgnoreCase("--target")) {
             FrameContainer frame = null;
-            FrameContainer target = origin.getContainer();
+            FrameContainer target = origin;
 
             while (frame == null && target != null) {
                 frame = WindowManager.findCustomWindow(target, args.getArguments()[1]);
-                target = WindowManager.getParent(target);
             }
 
             if (frame == null) {
@@ -122,13 +120,11 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
                     .getServer();
 
             //Active window's Children
-            windowList.addAll(Arrays.asList(WindowManager.getChildren(context
-                    .getWindow().getContainer())));
+            windowList.addAll(context.getWindow().getContainer().getChildren());
 
             //Children of Current Window's server
             if (currentServer != null) {
-                windowList.addAll(Arrays.asList(WindowManager.getChildren(
-                        currentServer)));
+                windowList.addAll(currentServer.getChildren());
             }
 
             //Global Windows

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The exit command allows the user to quit DMDirc with a custom quit message.
@@ -47,7 +47,7 @@ public final class Exit extends GlobalCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         Main.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
@@ -30,7 +32,6 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.util.ArrayList;
@@ -57,7 +58,7 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showAllCommands(origin, isSilent);
@@ -72,9 +73,9 @@ public final class Help extends GlobalCommand 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 InputWindow origin, final boolean isSilent) {
-        final List<String> commands = new ArrayList<String>(origin.getCommandParser()
-                .getCommands().keySet());
+    private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
+        final List<String> commands = new ArrayList<String>(((WritableFrameContainer) origin)
+                .getFrame().getCommandParser().getCommands().keySet());
 
         Collections.sort(commands);
         
@@ -109,7 +110,7 @@ public final class Help extends GlobalCommand 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 InputWindow origin, final boolean isSilent,
+    private void showCommand(final FrameContainer origin, final boolean isSilent,
             final String name) {
         Map.Entry<CommandInfo, Command> command = null;
 

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -31,7 +33,6 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The if plugin command allows the user to execute commands based on whether
@@ -52,7 +53,7 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length <= 1) {
             showUsage(origin, isSilent, "ifplugin", "<[!]plugin> <command>");
@@ -76,7 +77,8 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
                 GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
                         args.getArgumentsAsString(1));
             } else {
-                origin.getCommandParser().parseCommand(origin, args.getArgumentsAsString(1));
+                ((WritableFrameContainer) origin).getFrame().getCommandParser()
+                        .parseCommand(origin, args.getArgumentsAsString(1));
             }
         }
     }

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

@@ -23,12 +23,13 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The input command allows you to maniplulate text in a windows inputField.
@@ -49,7 +50,7 @@ public class Input extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
 
         if (args.getArguments().length == 0) {
@@ -58,9 +59,11 @@ public class Input extends GlobalCommand implements IntelligentCommand {
             return;
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
-            origin.getInputHandler().clearInputField();
+            ((WritableFrameContainer) origin).getFrame()
+                    .getInputHandler().clearInputField();
         } else {
-            origin.getInputHandler().addToInputField(args.getArgumentsAsString());
+            ((WritableFrameContainer) origin).getFrame()
+                    .getInputHandler().addToInputField(args.getArgumentsAsString());
         }
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -29,7 +30,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to load a plugin.
@@ -48,7 +48,7 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "loadplugin", "<plugin>");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -33,7 +34,7 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.regex.Matcher;
@@ -57,7 +58,7 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         URI address = null;
 
@@ -135,7 +136,7 @@ public final class NewServer extends GlobalCommand implements IntelligentCommand
      *
      * @return URI is input was valid
      */
-    public static URI parseInput(final InputWindow origin, final boolean isSilent,
+    public static URI parseInput(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
 
         boolean ssl = false;

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -51,7 +51,7 @@ public final class Notify extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "notify", "<colour>");
@@ -67,7 +67,7 @@ public final class Notify extends GlobalCommand implements IntelligentCommand {
         } else if (origin != null) {            
             // There's not much point echoing an error if the origin isn't
             // valid, as errors go to the origin!
-            origin.getContainer().sendNotification(colour);
+            origin.sendNotification(colour);
         }
     }
     

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Opens a new window.
@@ -48,22 +47,22 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         int start = 0;
         FrameContainer parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
-            if (origin.getContainer().getServer() == null) {
+            if (origin.getServer() == null) {
                 sendLine(origin, isSilent, FORMAT_ERROR,
                         "This window doesn't have an associated server.");
                 return;
             }
 
-            parent = origin.getContainer().getServer();
+            parent = origin.getServer();
             start = 1;
         } else if (args.getArguments().length > 0 && "--child".equals(args.getArguments()[0])) {
-            parent = origin.getContainer();
+            parent = origin;
             start = 1;
         }
 

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to reload actions.
@@ -48,7 +48,7 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         ActionManager.loadActions();
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Actions reloaded.");

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to reload identities.
@@ -46,7 +46,7 @@ public class ReloadIdentities extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override    
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         IdentityManager.loadUser();
         

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -29,7 +30,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to reload a plugin.
@@ -49,7 +49,7 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "reloadplugin", "<plugin>");

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to save the config file.
@@ -48,7 +48,7 @@ public final class SaveConfig extends GlobalCommand implements IntelligentComman
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         IdentityManager.save();
         

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -30,7 +31,6 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.List;
 
@@ -52,7 +52,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         int i = 0;
         
@@ -61,10 +61,10 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
         
         if (args.getArguments().length > 0
                 && "--server".equalsIgnoreCase(args.getArguments()[0]) && origin != null
-                && origin.getContainer().getServer() != null) {
+                && origin.getServer() != null) {
             i = 1;
-            identity = origin.getContainer().getServer().getServerIdentity();
-            manager = origin.getContainer().getServer().getConfigManager();
+            identity = origin.getServer().getServerIdentity();
+            manager = origin.getServer().getConfigManager();
         }
         
         switch (args.getArguments().length - i) {
@@ -101,7 +101,7 @@ public final class Set extends GlobalCommand 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 InputWindow origin, final boolean isSilent,
+    private void doDomainList(final FrameContainer origin, final boolean isSilent,
             final ConfigManager manager) {
         final StringBuffer output = new StringBuffer(67);
         
@@ -125,7 +125,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param manager The config manager to use to retrieve data
      * @param domain The domain to be inspected
      */
-    private void doOptionsList(final InputWindow origin,
+    private void doOptionsList(final FrameContainer origin,
             final boolean isSilent, final ConfigManager manager, final String domain) {
         final StringBuffer output = new StringBuffer(24);
         
@@ -158,7 +158,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param domain The domain of the option
      * @param option The name of the option
      */
-    private void doShowOption(final InputWindow origin,
+    private void doShowOption(final FrameContainer origin,
             final boolean isSilent, final ConfigManager manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
@@ -179,7 +179,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param option The name of the option
      * @param newvalue The value the option should be set to
      */
-    private void doSetOption(final InputWindow origin,
+    private void doSetOption(final FrameContainer origin,
             final boolean isSilent, final Identity identity,
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
@@ -199,7 +199,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param option The name of the option
      * @param data The data to be appended
      */
-    private void doAppendOption(final InputWindow origin,
+    private void doAppendOption(final FrameContainer origin,
             final boolean isSilent, final Identity identity, final ConfigManager manager,
             final String domain,final String option, final String data) {
         doSetOption(origin, isSilent, identity, domain, option,
@@ -216,7 +216,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param domain The domain of the option
      * @param option The name of the option
      */
-    private void doUnsetOption(final InputWindow origin,
+    private void doUnsetOption(final FrameContainer origin,
             final boolean isSilent, final Identity identity, final String domain,
             final String option) {
         identity.unsetOption(domain, option);

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -29,7 +30,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to unload a plugin.
@@ -49,7 +49,7 @@ public final class UnloadPlugin extends GlobalCommand implements IntelligentComm
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "unloadplugin", "<plugin>");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -47,14 +48,14 @@ public final class AllChannels extends ServerCommand implements IntelligentComma
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         final String command = args.getArgumentsAsString();
         InputWindow window;
         
         for (String channel : server.getChannels()) {
             window = server.getChannel(channel).getFrame();
-            window.getCommandParser().parseCommand(window, command);
+            window.getCommandParser().parseCommand(server.getChannel(channel), command);
         }
     }
     

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The away command allows the user to set their away message.
@@ -47,7 +47,7 @@ public final class Away extends ServerCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         final String line = args.getArgumentsAsString();
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -29,7 +30,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The back command allows the user to unset their away status.
@@ -55,7 +55,7 @@ public final class Back extends ServerCommand implements IntelligentCommand {
      * @param args The user supplied arguments
      */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {        
         server.getParser().getLocalClient().setBack();
     }

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.commandparser.commands.global.NewServer;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -50,7 +50,7 @@ public final class ChangeServer extends ServerCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin,  final Server server,
+    public void execute(final FrameContainer origin,  final Server server,
             final boolean isSilent, final CommandArguments args) {
         URI address = null;
         if (args.getArguments().length == 0) {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to send CTCP messages.
@@ -56,7 +56,7 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
      * @param args The user supplied arguments
      */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "ctcp", "<target> <type> [arguments]");

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The disconnect command disconnects from the current server.
@@ -51,7 +51,7 @@ public final class Disconnect extends ServerCommand {
      * @param args The user supplied arguments
      */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         String line;
         

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -59,7 +59,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
      * @param args The user supplied arguments
      */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
 
         if (args.getArguments().length == 0) {
@@ -73,7 +73,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         }
     }
 
-    protected void executeView(final InputWindow origin, final Server server,
+    protected void executeView(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args, final boolean forceRegex) {
         final IgnoreList ignoreList = server.getIgnoreList();
 
@@ -100,7 +100,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         }
     }
 
-    protected void executeAdd(final InputWindow origin, final Server server,
+    protected void executeAdd(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         final IgnoreList ignoreList = server.getIgnoreList();
         final String target = args.getArgumentsAsString();
@@ -110,7 +110,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRegex(final InputWindow origin, final Server server,
+    protected void executeRegex(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             executeView(origin, server, isSilent, args, true);
@@ -133,7 +133,7 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRemove(final InputWindow origin, final Server server,
+    protected void executeRemove(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             showUsage(origin, isSilent, "ignore", "--remove <host>");

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
@@ -34,7 +35,6 @@ import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +61,7 @@ public final class JoinChannelCommand extends ServerCommand implements
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "join", "join <channel [key]>[,channel [key]...]");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -52,7 +53,7 @@ public final class Message extends ServerCommand implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "msg", "<target> <message>");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to change nickname.
@@ -50,7 +50,7 @@ public final class Nick extends ServerCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "nick", "<new nickname>");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to send notices.
@@ -50,7 +50,7 @@ public final class Notice extends ServerCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length < 2) {
             showUsage(origin, isSilent, "notice", "<target> <message>");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -51,7 +52,7 @@ public final class OpenQuery extends ServerCommand implements
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "query", "<target> <message>");

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The raw command allows the user to send a raw line of text directly to the
@@ -48,7 +48,7 @@ public final class Raw extends ServerCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         final String line = args.getArgumentsAsString();
         

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Implements a raw server command (i.e., a command that is sent to the server
@@ -56,7 +56,7 @@ public final class RawServerCommand extends ServerCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());
     }

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The reconnect command reconnects to the current server.
@@ -45,7 +45,7 @@ public final class Reconnect extends ServerCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         String line;
         

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to change user modes.
@@ -49,7 +49,7 @@ public class Umode extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server, 
+    public void execute(final FrameContainer origin, final Server server, 
             final boolean isSilent, final CommandArguments args) {
         if (server.getState() != ServerState.CONNECTED) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Not connected");

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -32,7 +33,6 @@ import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * A command parser that is tailored for use in a channel environment. Handles
@@ -78,7 +78,7 @@ public final class ChannelCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final InputWindow origin,
+    protected void executeCommand(final FrameContainer origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, server, channel, isSilent, args);
@@ -99,7 +99,7 @@ public final class ChannelCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final InputWindow origin, final String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         channel.sendLine(line);
     }
     

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
@@ -34,7 +35,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.util.RollingList;
 
 import java.io.Serializable;
@@ -119,7 +119,7 @@ public abstract class CommandParser implements Serializable {
      * @param parseChannel Whether or not to try and parse the first argument
      * as a channel name
      */
-    public final void parseCommand(final InputWindow origin,
+    public final void parseCommand(final FrameContainer origin,
             final String line, final boolean parseChannel) {
         final CommandArguments args = new CommandArguments(line);
 
@@ -153,20 +153,19 @@ public abstract class CommandParser implements Serializable {
      * @param parseChannel Whether or not to try parsing channel names
      * @return True iff the command was handled, false otherwise
      */
-    protected boolean handleChannelCommand(final InputWindow origin,
+    protected boolean handleChannelCommand(final FrameContainer origin,
             final CommandArguments args, final boolean parseChannel) {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
         final String[] cargs = args.getArguments();
 
         if (cargs.length == 0 || !parseChannel || origin == null
-                || origin.getContainer() == null
-                || origin.getContainer().getServer() == null
+                || origin.getServer() == null
                 || !CommandManager.isChannelCommand(command)) {
             return false;
         }
 
-        final Server server = origin.getContainer().getServer();
+        final Server server = origin.getServer();
         final String[] parts = cargs[0].split(",");
         boolean someValid = false;
         for (String part : parts) {
@@ -243,7 +242,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommand(final InputWindow origin,
+    public final void parseCommand(final FrameContainer origin,
             final String line) {
         parseCommand(origin, line, true);
     }
@@ -254,7 +253,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommandCtrl(final InputWindow origin, final String line) {
+    public final void parseCommandCtrl(final FrameContainer origin, final String line) {
         handleNonCommand(origin, line);
     }
 
@@ -267,7 +266,7 @@ public abstract class CommandParser implements Serializable {
      * @param args The arguments to the command
      * @since 0.6.3m1
      */
-    protected abstract void executeCommand(final InputWindow origin,
+    protected abstract void executeCommand(final FrameContainer origin,
             final boolean isSilent, final Command command, final CommandArguments args);
 
     /**
@@ -279,7 +278,7 @@ public abstract class CommandParser implements Serializable {
      * @param args The arguments passed to the command
      * @since 0.6.3m1
      */
-    protected void handleInvalidCommand(final InputWindow origin,
+    protected void handleInvalidCommand(final FrameContainer origin,
             final CommandArguments args) {
         if (origin == null) {
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, null,
@@ -288,7 +287,7 @@ public abstract class CommandParser implements Serializable {
             final StringBuffer buff = new StringBuffer("unknownCommand");
 
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, buff,
-                    origin.getContainer(), args.getCommandName(), args.getArguments());
+                    origin, args.getCommandName(), args.getArguments());
 
             origin.addLine(buff, args.getCommandName());
         }
@@ -301,7 +300,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected abstract void handleNonCommand(final InputWindow origin,
+    protected abstract void handleNonCommand(final FrameContainer origin,
             final String line);
 
     /**

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
@@ -29,7 +30,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The command parser used for global commands.
@@ -76,7 +76,7 @@ public final class GlobalCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final InputWindow origin,
+    protected void executeCommand(final FrameContainer origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         ((GlobalCommand) command).execute(origin, isSilent, args);
     }
@@ -88,7 +88,7 @@ public final class GlobalCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final InputWindow origin, final String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         if (origin == null) {
             Logger.userError(ErrorLevel.MEDIUM, "Invalid global command: " + line);
         } else {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -32,7 +33,6 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.QueryCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * A command parser that is tailored for use in a query environment. Handles
@@ -78,7 +78,7 @@ public final class QueryCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final InputWindow origin,
+    protected void executeCommand(final FrameContainer origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, server, query, isSilent, args);
@@ -98,7 +98,7 @@ public final class QueryCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final InputWindow origin, final String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         query.sendLine(line);
     }
     

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

@@ -23,6 +23,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ui.interfaces.InputWindow;
 
@@ -53,7 +54,7 @@ public class RawCommandParser extends ServerCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    protected void handleNonCommand(final InputWindow origin, final String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         server.getParser().sendRawMessage(line);
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
@@ -30,7 +31,6 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * A command parser used in the context of a server.
@@ -68,7 +68,7 @@ public class ServerCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final InputWindow origin,
+    protected void executeCommand(final FrameContainer origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof ServerCommand) {
             if (hasCommandOptions(command) && !getCommandOptions(command).allowOffline()
@@ -93,7 +93,7 @@ public class ServerCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final InputWindow origin, final String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         server.sendLine(line);
     }
     

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

@@ -331,7 +331,7 @@ public abstract class InputHandler implements ConfigChangeListener {
 
             case KeyEvent.VK_ENTER:
                 if ((flags & HANDLE_RETURN) != 0 && !line.isEmpty()) {
-                    commandParser.parseCommandCtrl(parentWindow, line);
+                    commandParser.parseCommandCtrl(parentWindow.getContainer(), line);
                     addToBuffer(line);
                 }
                 break;
@@ -498,7 +498,7 @@ public abstract class InputHandler implements ConfigChangeListener {
 
             addToBuffer(thisBuffer.toString());
 
-            commandParser.parseCommand(parentWindow, thisBuffer.toString());
+            commandParser.parseCommand(parentWindow.getContainer(), thisBuffer.toString());
         }
         fireLineWrap(0);
         fireCommandPassed();

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -41,7 +41,7 @@ public class BanTest {
 
     @Test
     public void testUsage() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/ban"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

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

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -45,7 +45,7 @@ public class KickReasonTest {
 
     @Test
     public void testUsage() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/kick"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -53,7 +53,7 @@ public class KickReasonTest {
 
     @Test
     public void testUnknown() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
 
@@ -67,7 +67,7 @@ public class KickReasonTest {
 
     @Test
     public void testWithReason() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
         final IRCChannelClientInfo cci = mock(IRCChannelClientInfo.class);
@@ -82,7 +82,7 @@ public class KickReasonTest {
 
     @Test
     public void testWithoutReason() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final ConfigManager manager = mock(ConfigManager.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);

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

@@ -23,13 +23,13 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -66,7 +66,7 @@ public class ModeTest {
 
     @Test
     public void testWithoutArgs() {
-        final InputWindow origin = mock(InputWindow.class);
+        final FrameContainer origin = mock(FrameContainer.class);
         
         command.execute(origin, server, channel, false, new CommandArguments("/mode"));
 
@@ -75,7 +75,7 @@ public class ModeTest {
 
     @Test
     public void testWithArgs() {
-        final InputWindow origin = mock(InputWindow.class);
+        final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, server, channel, false, new CommandArguments("/mode +hello -bye"));
 
@@ -84,7 +84,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithArgs() {
-        final InputWindow origin = mock(InputWindow.class);
+        final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, server, "#chan", false,
                 new CommandArguments("/mode +hello -bye"));
@@ -94,7 +94,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithoutArgs() {
-        final InputWindow origin = mock(InputWindow.class);
+        final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, server, "#chan", false,
                 new CommandArguments("/mode"));

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

@@ -23,14 +23,11 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.Server;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -41,7 +38,7 @@ public class PartTest {
 
     private final Part command = new Part();
     private Channel channel;
-    private InputWindow origin;
+    private FrameContainer origin;
     private ConfigManager manager;
 
     @BeforeClass
@@ -54,7 +51,7 @@ public class PartTest {
         IdentityManager.load();
         
         channel = mock(Channel.class);
-        origin = mock(InputWindow.class);
+        origin = mock(FrameContainer.class);
         manager = mock(ConfigManager.class);
         
         when(origin.getConfigManager()).thenReturn(manager);

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

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNoArgs() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -48,7 +48,7 @@ public class SetNickColourTest {
     
     @Test
     public void testUsageNicklist() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo --nicklist"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -56,7 +56,7 @@ public class SetNickColourTest {
     
     @Test
     public void testUsageText() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo --text"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

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

@@ -21,10 +21,10 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -41,7 +41,7 @@ public class MeTest {
 
     @Test
     public void testUsage() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

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

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class AliasCommandTest {
 
     @Test
     public void testUsageNoArgs() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
 
         command.execute(tiw, false, new CommandArguments("/foo"));
         
@@ -49,7 +49,7 @@ public class AliasCommandTest {
     
     @Test
     public void testUsageOneArg() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         
         command.execute(tiw, false, new CommandArguments("/foo --remove"));
         

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

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
@@ -39,7 +39,7 @@ public class DebugTest {
 
     @Test
     public void testUsage() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
 
         command.execute(tiw, false, new CommandArguments("/foo"));
         
@@ -48,7 +48,7 @@ public class DebugTest {
     
     @Test
     public void testInvalidArg() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
 
         command.execute(tiw, false, new CommandArguments("/foo flubadee"));
         

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

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class IfpluginTest {
 
     @Test
     public void testUsageNoArgs() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -48,7 +48,7 @@ public class IfpluginTest {
     
     @Test
     public void testUsageOneArg() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo bar"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

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

@@ -21,9 +21,9 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class NewServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -48,7 +48,7 @@ public class NewServerTest {
     
     @Test
     public void testInvalidPort() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:abc"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -56,7 +56,7 @@ public class NewServerTest {
     
     @Test
     public void testOutOfRangePort1() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:0"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -64,7 +64,7 @@ public class NewServerTest {
     
     @Test
     public void testOutOfRangePort2() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:65537"));
         
         verify(tiw).addLine(eq("commandError"), anyString());

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

@@ -21,11 +21,11 @@
  */
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -44,7 +44,7 @@ public class ChangeServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -52,7 +52,7 @@ public class ChangeServerTest {
     
     @Test
     public void testInvalidPort() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:abc"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -60,7 +60,7 @@ public class ChangeServerTest {
     
     @Test
     public void testOutOfRangePort1() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:0"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -68,7 +68,7 @@ public class ChangeServerTest {
     
     @Test
     public void testOutOfRangePort2() {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:65537"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -76,7 +76,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteBasic() throws URISyntaxException {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
@@ -88,7 +88,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
@@ -100,7 +100,7 @@ public class ChangeServerTest {
 
     @Test
     public void testDeprecatedSSL() throws URISyntaxException {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
@@ -112,7 +112,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteComplex() throws URISyntaxException {
-        final InputWindow tiw = mock(InputWindow.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);

test/com/dmdirc/harness/TestCommandParser.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.harness;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.parsers.*;
 import com.dmdirc.commandparser.CommandManager;
@@ -48,7 +49,7 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(InputWindow origin, boolean isSilent,
+    protected void executeCommand(FrameContainer origin, boolean isSilent,
                                   Command command, CommandArguments args) {
         executedCommand = command;
         wasSilent = isSilent;
@@ -56,12 +57,12 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void handleNonCommand(InputWindow origin, String line) {
+    protected void handleNonCommand(FrameContainer origin, String line) {
         nonCommandLine = line;
     }
 
     @Override
-    protected void handleInvalidCommand(InputWindow origin,
+    protected void handleInvalidCommand(FrameContainer origin,
                                         CommandArguments args) {
         invalidCommand = args.getCommandName();
     }