Renamed CommandWindow to InputWindow and moved to UI

git-svn-id: http://svn.dmdirc.com/trunk@1539 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/commandparser/ChannelCommand.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a channel.
@@ -39,6 +40,6 @@ public abstract class ChannelCommand extends Command {
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
      */
-    public abstract void execute(CommandWindow origin, Server server, Channel channel,
+    public abstract void execute(InputWindow origin, Server server, Channel channel,
             boolean isSilent, String... args);
 }

src/com/dmdirc/commandparser/ChannelCommandParser.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * A command parser that is tailored for use in a channel environment. Handles
@@ -61,7 +62,7 @@ public final class ChannelCommandParser extends CommandParser {
     }
     
     /** {@inheritDoc} */
-    protected void executeCommand(final CommandWindow origin,
+    protected void executeCommand(final InputWindow origin,
             final boolean isSilent, final Command command, final String... args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, server, channel, isSilent, args);
@@ -78,7 +79,7 @@ public final class ChannelCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(final CommandWindow origin, final String line) {
+    protected void handleNonCommand(final InputWindow origin, final String line) {
         channel.sendLine(line);
     }
     

src/com/dmdirc/commandparser/Command.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandparser;
 
+import com.dmdirc.ui.InputWindow;
+
 /**
  * Represents a generic command.
  * @author chris
@@ -106,7 +108,7 @@ public abstract class Command implements Comparable<Command> {
      * @param type The type of message to send
      * @param args The arguments of the message
      */
-    protected final void sendLine(final CommandWindow target,
+    protected final void sendLine(final InputWindow target,
             final boolean isSilent, final String type, final Object ... args) {
         if (!isSilent && target != null) {
             target.addLine(type, args);

src/com/dmdirc/commandparser/CommandParser.java

@@ -26,6 +26,7 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.ui.InputWindow;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -75,7 +76,7 @@ public abstract class CommandParser {
      * @param parseChannel Whether or not to try and parse the first argument
      * as a channel name
      */
-    public final void parseCommand(final CommandWindow origin,
+    public final void parseCommand(final InputWindow origin,
             final String line, final boolean parseChannel) {
         if (line.length() == 0) {
             return;
@@ -93,7 +94,7 @@ public abstract class CommandParser {
             final String[] args = line.split(" ");
             final String command = args[0].substring(offset);
             String[] comargs;
-                        
+            
             assert args.length > 0;
             
             if (args.length >= 2 && parseChannel && origin != null
@@ -144,7 +145,7 @@ public abstract class CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommand(final CommandWindow origin,
+    public final void parseCommand(final InputWindow origin,
             final String line) {
         parseCommand(origin, line, true);
     }
@@ -154,7 +155,7 @@ public abstract class CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommandCtrl(final CommandWindow origin, final String line) {
+    public final void parseCommandCtrl(final InputWindow origin, final String line) {
         handleNonCommand(origin, line);
     }
     
@@ -165,7 +166,7 @@ public abstract class CommandParser {
      * @param command The command to be executed
      * @param args The arguments to the command
      */
-    protected abstract void executeCommand(final CommandWindow origin,
+    protected abstract void executeCommand(final InputWindow origin,
             final boolean isSilent, final Command command, final String... args);
     
     /**
@@ -176,7 +177,7 @@ public abstract class CommandParser {
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
      */
-    protected void handleInvalidCommand(final CommandWindow origin,
+    protected void handleInvalidCommand(final InputWindow origin,
             final String command, final String... args) {
         if (origin == null) {
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, null,
@@ -197,6 +198,6 @@ public abstract class CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected abstract void handleNonCommand(final CommandWindow origin,
+    protected abstract void handleNonCommand(final InputWindow origin,
             final String line);
 }

src/com/dmdirc/commandparser/CommandWindow.java

@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.commandparser;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
-import com.dmdirc.identities.ConfigManager;
-
-/**
- * A command window is a window that allows the user to input a command (that's
- * passed to a command parser). This interface includes methods that are required
- * to allow the commands to interact with the user via the window.
- * @author chris
- */
-public interface CommandWindow {
-    
-    /**
-     * Formats the arguments using the Formatter, then adds the result to the
-     * main text area.
-     * @param messageType The type of this message
-     * @param args The arguments for the message
-     */
-    void addLine(String messageType, Object... args);
-    
-    /**
-     * Formats the arguments using the Formatter, then adds the result to the
-     * main text area.
-     * @param messageType The type of this message
-     * @param args The arguments for the message
-     */
-    void addLine(StringBuffer messageType, Object... args);
-    
-    /**
-     * Clears the main text area of the command window.
-     */
-    void clear();
-    
-    /**
-     * Retrieves the config manager for this command window.
-     * @return This window's config manager
-     */
-    ConfigManager getConfigManager();
-    
-    /**
-     * Retrieves the command Parser for this command window.
-     * @return This window's command Parser
-     */
-    CommandParser getCommandParser();
-    
-    /**
-     * Retrieves the server associated with this command window.
-     * @return This window's associated server instance
-     * @deprecated No point proxying this - use getContainer().getServer()
-     */
-    @Deprecated
-    Server getServer();
-    
-    /**
-     * Retrieves the container that owns this command window.
-     * @return The container that owns this command window.
-     */
-    FrameContainer getContainer();
-    
-    /**
-     * Determines if the current frame is visible.
-     *
-     * @return boolean visibility
-     * @deprecated Visibility is of no concern to command windows
-     */
-    @Deprecated
-    boolean isVisible();
-    
-}

src/com/dmdirc/commandparser/GlobalCommand.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandparser;
 
+import com.dmdirc.ui.InputWindow;
+
 /**
  * Represents a generic global command. Global commands are associated with
  * no servers.
@@ -36,5 +38,5 @@ public abstract class GlobalCommand extends Command {
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
      */
-    public abstract void execute(CommandWindow origin, boolean isSilent, String ... args);
+    public abstract void execute(InputWindow origin, boolean isSilent, String ... args);
 }

src/com/dmdirc/commandparser/GlobalCommandParser.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The command parser used for global commands.
@@ -61,7 +62,7 @@ public final class GlobalCommandParser extends CommandParser {
     }
     
     /** {@inheritDoc} */
-    protected void executeCommand(final CommandWindow origin,
+    protected void executeCommand(final InputWindow origin,
             final boolean isSilent, final Command command, final String... args) {
         ((GlobalCommand) command).execute(origin, isSilent, args);
     }
@@ -72,7 +73,7 @@ public final class GlobalCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(final CommandWindow origin, final String line) {
+    protected void handleNonCommand(final InputWindow origin, final String line) {
         if (origin == null) {
             Logger.error(ErrorLevel.WARNING, "Invalid global command: " + line);
         } else {

src/com/dmdirc/commandparser/QueryCommand.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Query;
 import com.dmdirc.Server;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a query.
@@ -39,6 +40,6 @@ public abstract class QueryCommand extends Command {
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
      */
-    public abstract void execute(CommandWindow origin, Server server, Query query,
+    public abstract void execute(InputWindow origin, Server server, Query query,
             boolean isSilent, String... args);
 }

src/com/dmdirc/commandparser/QueryCommandParser.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Query;
 import com.dmdirc.Server;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * A command parser that is tailored for use in a query environment. Handles
@@ -61,7 +62,7 @@ public final class QueryCommandParser extends CommandParser {
     }
     
     /** {@inheritDoc} */
-    protected void executeCommand(final CommandWindow origin,
+    protected void executeCommand(final InputWindow origin,
             final boolean isSilent, final Command command, final String... args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, server, query, isSilent, args);
@@ -78,7 +79,7 @@ public final class QueryCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(final CommandWindow origin, final String line) {
+    protected void handleNonCommand(final InputWindow origin, final String line) {
         query.sendLine(line);
     }
     

src/com/dmdirc/commandparser/ServerCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.Server;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Represents a generic server command. Server commands are associated with
@@ -38,6 +39,6 @@ public abstract class ServerCommand extends Command {
      * @param isSilent Whether this command is silenced or not
      * @param args Arguments passed to this command
      */
-    public abstract void execute(CommandWindow origin, Server server,
+    public abstract void execute(InputWindow origin, Server server,
             boolean isSilent, String ... args);
 }

src/com/dmdirc/commandparser/ServerCommandParser.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.Server;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * A command parser used in the context of a server.
@@ -52,7 +53,7 @@ public final class ServerCommandParser extends CommandParser {
     }
     
     /** {@inheritDoc} */
-    protected void executeCommand(final CommandWindow origin,
+    protected void executeCommand(final InputWindow origin,
             final boolean isSilent, final Command command, final String... args) {
         if (command instanceof ServerCommand) {
             ((ServerCommand) command).execute(origin, server, isSilent, args);
@@ -67,7 +68,7 @@ public final class ServerCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(final CommandWindow origin, final String line) {
+    protected void handleNonCommand(final InputWindow origin, final String line) {
         server.getParser().sendLine(line);
     }
     

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

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The kick command bans a specified user or host from the channel.
@@ -51,7 +51,7 @@ public final class Ban extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         
         String host = args[0];

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The benchmark command allows us to fake a stream of channel messages for
@@ -50,7 +50,7 @@ public final class Benchmark extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final String[] strings = {
             "this is a test",

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
 
 /**
@@ -50,7 +50,7 @@ public final class ChannelSettings extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         new ChannelSettingsDialog(channel).setVisible(true);
     }

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
@@ -49,7 +49,7 @@ public final class Cycle extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         channel.part(origin.getConfigManager().getOption("general", "cyclemessage"));
         channel.join();

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The kick command kicks a specified user from the channel.
@@ -50,7 +50,7 @@ public final class Kick extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final String[] newArgs = new String[2];
         newArgs[0] = args[0]; // Nickname

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

@@ -27,7 +27,7 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The kick/0 command informs the user of the correct usage of /kick.
@@ -50,7 +50,7 @@ public final class KickEmpty extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         sendLine(origin, isSilent, "commandUsage", Config.getCommandChar(), "kick", "<user> [reason]");
     }

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

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The kick command kicks a specified user from the channel.
@@ -51,7 +51,7 @@ public final class KickReason extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         
         final ChannelClientInfo victim = channel.getChannelInfo().getUser(args[0]);

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The me command sends a CTCP action to the current channel.
@@ -49,7 +49,7 @@ public final class Me extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         channel.sendAction(implodeArgs(args));
     }

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

@@ -27,7 +27,7 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The me/0 command simply tells the user that the correct usage of /me requires
@@ -51,7 +51,7 @@ public final class MeEmpty extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         sendLine(origin, isSilent, "commandUsage", Config.getCommandChar(), "me", "<action>");
     }

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

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The mode command allows the user to inspect and change channel modes.
@@ -50,7 +50,7 @@ public final class Mode extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
         

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The part command parts the current channel with a specified part message.
@@ -49,7 +49,7 @@ public final class Part extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         channel.part(implodeArgs(args));
         channel.closeWindow();

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The PartDefault command (part/0) is used when the user does not specify a
@@ -51,7 +51,7 @@ public final class PartDefault extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final ChannelCommand com = CommandManager.getChannelCommand("part");
         com.execute(origin, server, channel, isSilent, origin.getConfigManager().getOption("general", "partmessage"));

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

@@ -28,9 +28,9 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.parser.ChannelClientInfo;
 import com.dmdirc.ui.ChannelFrame;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -57,7 +57,7 @@ public final class SetNickColour extends ChannelCommand {
      * @param args The user supplied arguments
      */
     @SuppressWarnings("unchecked")
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         
         int offset = 0;

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

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The set topic command allows the user to change the current topic.
@@ -50,7 +50,7 @@ public final class SetTopic extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
         final String newTopic = implodeArgs(args);

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

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The show topic command shows the user the current topic.
@@ -50,7 +50,7 @@ public final class ShowTopic extends ChannelCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final String... args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
         

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

@@ -23,8 +23,8 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.MainFrame;
 
 /**
@@ -43,11 +43,11 @@ public final class Active extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         final String command = implodeArgs(args);
         
-        final CommandWindow window = (CommandWindow) MainFrame.getMainFrame().getActiveFrame();
+        final InputWindow window = (InputWindow) MainFrame.getMainFrame().getActiveFrame();
         
         if (window != null) {
             window.getCommandParser().parseCommand(window, command);

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

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The AllServers command allows users to issue commands to all servers.
@@ -42,10 +42,10 @@ public final class AllServers extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         final String command = implodeArgs(args);
-        CommandWindow window;
+        InputWindow window;
         
         for (Server target : ServerManager.getServerManager().getServers()) {
             window = target.getFrame();

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The exit command allows the user to quit DMDirc with a custom quit message.
@@ -45,7 +45,7 @@ public final class Exit extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         Main.quit(implodeArgs(args));
     }

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Config;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Represents the exit/0 command (i.e., an exit with no arguments). Reads the
@@ -45,7 +45,7 @@ public final class ExitDefault extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         String def;
         

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

@@ -23,8 +23,8 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
 
 /**
@@ -43,7 +43,7 @@ public final class LoadFormatter extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (Formatter.loadFile(args[0])) {
             sendLine(origin, isSilent, "commandOutput", "Formatter loaded.");

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

@@ -23,10 +23,11 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.commandparser.IntelligentCommand;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.InputWindow;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -47,7 +48,7 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (PluginManager.getPluginManager().addPlugin(args[0])) {
             PluginManager.getPluginManager().getPlugin(args[0]).setActive(true);

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

@@ -25,9 +25,9 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.identities.IdentityManager;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The new server command allows users to open a new server window.
@@ -45,7 +45,7 @@ public final class NewServer extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (args.length == 0) {
             origin.addLine("commandUsage", Config.getCommandChar(), "newserver",

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.Config;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -54,7 +54,7 @@ public final class Notify extends GlobalCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         final Color colour = ColourManager.parseColour(args[0], null);
         

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to reload actions.
@@ -43,7 +43,7 @@ public final class ReloadActions extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         ActionManager.loadActions();
         sendLine(origin, isSilent, "commandOutput", "Actions reloaded.");

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

@@ -23,8 +23,8 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
 
 /**
@@ -43,7 +43,7 @@ public final class ReloadFormatter extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         Formatter.reload();
         sendLine(origin, isSilent, "commandOutput", "Formatter reloaded.");

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

@@ -23,10 +23,10 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to reload a plugin.
@@ -44,7 +44,7 @@ public final class ReloadPlugin extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         Plugin plugin = PluginManager.getPluginManager().getPlugin(args[0]);
         if (plugin == null) {

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

@@ -23,8 +23,8 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
 
 /**
@@ -43,7 +43,7 @@ public final class SaveFormatter extends GlobalCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         if (Formatter.saveAs(args[0])) {
             sendLine(origin, isSilent, "commandOutput", "Formatter saved.");

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

@@ -24,9 +24,10 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.Config;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.commandparser.IntelligentCommand;
+import com.dmdirc.ui.InputWindow;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,7 +47,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final boolean isSilent,
+    public void execute(final InputWindow origin, final boolean isSilent,
             final String... args) {
         switch (args.length) {
         case 0:
@@ -68,7 +69,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param origin The window the command was issued from
      * @param isSilent Whether or not the command is being silenced or not
      */
-    private void doDomainList(final CommandWindow origin, final boolean isSilent) {
+    private void doDomainList(final InputWindow origin, final boolean isSilent) {
         final StringBuffer output = new StringBuffer(67);
         
         output.append("Valid domains (use ");
@@ -89,7 +90,7 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether or not the command is being silenced or not
      * @param domain The domain to be inspected
      */
-    private void doOptionsList(final CommandWindow origin,
+    private void doOptionsList(final InputWindow origin,
             final boolean isSilent, final String domain) {
         final StringBuffer output = new StringBuffer(24);
         
@@ -119,7 +120,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 CommandWindow origin,
+    private void doShowOption(final InputWindow origin,
             final boolean isSilent, final String domain, final String option) {
         if (Config.hasOption(domain, option)) {
             sendLine(origin, isSilent, "commandOutput", "The current value of " + domain + "." + option
@@ -137,7 +138,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 CommandWindow origin,
+    private void doSetOption(final InputWindow origin,
             final boolean isSilent, final String domain, final String option,
             final String newvalue) {
         Config.setOption(domain, option, newvalue);

src/com/dmdirc/commandparser/commands/query/QueryMe.java

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.query;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.QueryCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Represents the /me command used in a query window.
@@ -42,7 +42,7 @@ public final class QueryMe extends QueryCommand {
     }
     
     /** {@inheritDoc}. */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Query query, final boolean isSilent, final String... args) {
         query.sendAction(implodeArgs(args));
     }

src/com/dmdirc/commandparser/commands/query/QueryMeEmpty.java

@@ -26,8 +26,8 @@ import com.dmdirc.Config;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.QueryCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Represents the /me command used in a query window, with no parameters.
@@ -44,7 +44,7 @@ public final class QueryMeEmpty extends QueryCommand {
     }
     
     /** {@inheritDoc}. */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final Query query, final boolean isSilent, final String... args) {
         sendLine(origin, isSilent, "commandUsage", Config.getCommandChar(), "me", "<action>");
     }

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The AllChannels command allows the user to issue a command to all channels
@@ -48,10 +48,10 @@ public final class AllChannels extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         final String command = implodeArgs(args);
-        CommandWindow window;
+        InputWindow window;
         
         for (String channel : server.getChannels()) {
             window = server.getChannel(channel).getFrame();

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The away command allows the user to set their away message.
@@ -49,7 +49,7 @@ public final class Away extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         final String line = implodeArgs(args);
         

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The back command allows the user to unset their away status.
@@ -49,7 +49,7 @@ public final class Back extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         //final String line = implodeArgs(args);
         

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

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The /server command allows the user to connect to a new server.
@@ -44,7 +44,7 @@ public final class ChangeServer extends ServerCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length == 0) {
             sendLine(origin, isSilent, "commandUsage", Config.getCommandChar(), "server",

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The clear command clears the main text area of the current window.
@@ -49,7 +49,7 @@ public final class Clear extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         origin.clear();
     }

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

@@ -24,9 +24,9 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.identities.ConfigSource;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Displays information about the origin's config manager.
@@ -50,7 +50,7 @@ public final class ConfigInfo extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         for (ConfigSource source : origin.getConfigManager().getSources()) {
             sendLine(origin, isSilent, "commandOutput", source.getTarget() + " - " + source);

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

@@ -25,9 +25,9 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.IntelligentCommand;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,7 +53,7 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length < 2) {
             sendLine(origin, isSilent, "CommandUsage", Config.getCommandChar(),

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The disconnect command disconnects from the current server.
@@ -49,7 +49,7 @@ public final class Disconnect extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         String line;
         

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.MainFrame;
 
 import javax.swing.JInternalFrame;
@@ -52,12 +52,12 @@ public final class Echo extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {        
         if (args.length > 0 && args[0].equalsIgnoreCase("--active")) {
             final JInternalFrame frame = MainFrame.getMainFrame().getActiveFrame();
-            if (frame instanceof CommandWindow) {
-                ((CommandWindow) frame).addLine("commandOutput", implodeArgs(1, args));
+            if (frame instanceof InputWindow) {
+                ((InputWindow) frame).addLine("commandOutput", implodeArgs(1, args));
             }
         } else {
             sendLine(origin, isSilent, "commandOutput", implodeArgs(args));

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

@@ -25,9 +25,9 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.ui.ChannelFrame;
+import com.dmdirc.ui.InputWindow;
 import com.dmdirc.ui.QueryFrame;
 
 import java.util.Collections;
@@ -57,7 +57,7 @@ public final class Help extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         sendLine(origin, isSilent, "commandOutput", "-- Server commands ----------------------------------");
         showCommands(CommandManager.getServerCommands(), origin, isSilent);
@@ -80,7 +80,7 @@ public final class Help extends ServerCommand {
      * @param isSilent Whether this command is silent or not
      */
     private void showCommands(final List<Command> commands,
-            final CommandWindow origin, final boolean isSilent) {
+            final InputWindow origin, final boolean isSilent) {
         Collections.sort(commands);
         for (Command com : commands) {
             if (com.showInHelp()) {

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

@@ -25,10 +25,10 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.identities.Identity;
 import com.dmdirc.identities.IdentityManager;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to add/view/delete ignores.
@@ -52,7 +52,7 @@ public final class Ignore extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         
         final Identity identity = IdentityManager.getNetworkConfig(server.getNetwork());

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The join command allows users to join a channel, or a comma-seperated list
@@ -50,7 +50,7 @@ public final class Join extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         server.getParser().joinChannel(args[0]);
     }

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

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to send privmsgs.
@@ -50,7 +50,7 @@ public final class Message extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length < 2) {
             sendLine(origin, isSilent, "commandUsage", Config.getCommandChar(), "msg",

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The MOTD command allows the user to retrieve the MOTD for the server.
@@ -49,7 +49,7 @@ public final class Motd extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         //final String line = implodeArgs(args);
         

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to change nickname.
@@ -49,7 +49,7 @@ public final class Nick extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         server.getParser().setNickname(args[0]);
     }

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

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to send notices.
@@ -50,7 +50,7 @@ public final class Notice extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         if (args.length < 2) {
             sendLine(origin, isSilent, "commandUsage", Config.getCommandChar(), "notice",

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * Allows the user to open a query dialog with another user.
@@ -44,7 +44,7 @@ public final class Query extends ServerCommand {
     }
     
     /** {@inheritDoc} */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         server.addQuery(args[0]);
         server.getQuery(args[0]).show();

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The raw command allows the user to send a raw line of text directly to the
@@ -50,7 +50,7 @@ public final class Raw extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         final String line = implodeArgs(args);
         

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The reconnect command reconnects to the current server.
@@ -49,7 +49,7 @@ public final class Reconnect extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         String line;
         

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

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandWindow;
 import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.InputWindow;
 
 /**
  * The whois command requests information about another user.
@@ -50,7 +50,7 @@ public final class Whois extends ServerCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args The user supplied arguments
      */
-    public void execute(final CommandWindow origin, final Server server,
+    public void execute(final InputWindow origin, final Server server,
             final boolean isSilent, final String... args) {
         server.getParser().sendLine("WHOIS :" + args[0]);
     }