Moved InputWindow interface into ui.interfaces

Deprecated sendLine() in frame container



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

src/com/dmdirc/Channel.java

@@ -48,7 +48,7 @@ import com.dmdirc.parser.callbacks.interfaces.IChannelQuit;
 import com.dmdirc.parser.callbacks.interfaces.IChannelTopic;
 import com.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
 import com.dmdirc.ui.ChannelFrame;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.ColourManager;

src/com/dmdirc/FrameContainer.java

@@ -25,7 +25,7 @@ package com.dmdirc;
 import com.dmdirc.identities.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 
 import java.awt.Color;
@@ -83,9 +83,12 @@ public abstract class FrameContainer implements InternalFrameListener {
     /**
      * Formats the specified arguments using the supplied message type, and
      * outputs to the main text area.
+     * 
      * @param messageType the message type to use
      * @param args the arguments to pass
+     * @deprecated Not sure why we're proxying this
      */
+    @Deprecated
     public void addLine(final String messageType, final Object... args) {
         getFrame().addLine(messageType, args);
     }

src/com/dmdirc/Query.java

@@ -34,7 +34,7 @@ import com.dmdirc.parser.callbacks.CallbackNotFound;
 import com.dmdirc.parser.callbacks.interfaces.INickChanged;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.QueryFrame;
 import com.dmdirc.ui.input.TabCompleter;

src/com/dmdirc/Raw.java

@@ -28,7 +28,7 @@ import com.dmdirc.parser.IRCParser;
 import com.dmdirc.parser.callbacks.CallbackNotFound;
 import com.dmdirc.parser.callbacks.interfaces.IDataIn;
 import com.dmdirc.parser.callbacks.interfaces.IDataOut;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.ServerFrame;
 

src/com/dmdirc/Server.java

@@ -58,7 +58,7 @@ import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
 import com.dmdirc.parser.callbacks.interfaces.IPrivateNotice;
 import com.dmdirc.parser.callbacks.interfaces.ISocketClosed;
 import com.dmdirc.parser.callbacks.interfaces.IUserModeChanged;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.ServerFrame;
 import com.dmdirc.ui.input.TabCompleter;

src/com/dmdirc/actions/Action.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.GlobalCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 
 import java.io.File;

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

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Enumeration;
 import java.util.Properties;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.osdplugin;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The osd command shows an on screen message.

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.systray;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The /popup command allows the user to show a popup message from the system

src/com/dmdirc/addons/timeplugin/TimedCommand.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.timeplugin;
 
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.GlobalCommandParser;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Timer;
 import java.util.TimerTask;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.timeplugin;
 import com.dmdirc.Config;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The timer command allows users to schedule commands to occur after a certain

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -44,7 +44,7 @@ import com.dmdirc.parser.ChannelInfo;
 import com.dmdirc.parser.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.EventPlugin;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.PreferencesInterface;
 import com.dmdirc.ui.components.PreferencesPanel;

src/com/dmdirc/commandparser/ChannelCommand.java

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a channel.

src/com/dmdirc/commandparser/ChannelCommandParser.java

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * A command parser that is tailored for use in a channel environment. Handles

src/com/dmdirc/commandparser/Command.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic command.

src/com/dmdirc/commandparser/CommandParser.java

@@ -26,7 +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 com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Hashtable;
 import java.util.Map;

src/com/dmdirc/commandparser/GlobalCommand.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic global command. Global commands are associated with

src/com/dmdirc/commandparser/GlobalCommandParser.java

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The command parser used for global commands.

src/com/dmdirc/commandparser/QueryCommand.java

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a command which can be performed only in the context of a query.

src/com/dmdirc/commandparser/QueryCommandParser.java

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * A command parser that is tailored for use in a query environment. Handles

src/com/dmdirc/commandparser/ServerCommand.java

@@ -23,7 +23,7 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.Server;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic server command. Server commands are associated with

src/com/dmdirc/commandparser/ServerCommandParser.java

@@ -23,7 +23,7 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.Server;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * A command parser used in the context of a server.

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick command bans a specified user or host from the channel.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The benchmark command allows us to fake a stream of channel messages for

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
 
 /**

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick command kicks a specified user from the channel.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick/0 command informs the user of the correct usage of /kick.

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The kick command kicks a specified user from the channel.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The me command sends a CTCP action to the current channel.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The me/0 command simply tells the user that the correct usage of /me requires

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The mode command allows the user to inspect and change channel modes.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The part command parts the current channel with a specified part message.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The PartDefault command (part/0) is used when the user does not specify a

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

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelClientInfo;
 import com.dmdirc.ui.ChannelFrame;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The set topic command allows the user to change the current topic.

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The show topic command shows the user the current topic.

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

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 
 /**

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

@@ -26,7 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The AllServers command allows users to issue commands to all servers.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The exit command allows the user to quit DMDirc with a custom quit message.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.Config;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents the exit/0 command (i.e., an exit with no arguments). Reads the

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

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
 
 /**

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

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.commandparser.IntelligentCommand;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.identities.IdentityManager;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The new server command allows users to open a new server window.

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.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to reload actions.

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

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
 
 /**

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

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to reload a plugin.

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

@@ -24,7 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
 
 /**

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

@@ -26,7 +26,7 @@ import com.dmdirc.Config;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.GlobalCommand;
 import com.dmdirc.commandparser.IntelligentCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -26,7 +26,7 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.QueryCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents the /me command used in a query window.

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

@@ -27,7 +27,7 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.QueryCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents the /me command used in a query window, with no parameters.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The AllChannels command allows the user to issue a command to all channels

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The away command allows the user to set their away message.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The back command allows the user to unset their away status.

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

@@ -26,7 +26,7 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The /server command allows the user to connect to a new server.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The clear command clears the main text area of the current window.

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

@@ -26,7 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.identities.ConfigSource;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Displays information about the origin's config manager.

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.IntelligentCommand;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The disconnect command disconnects from the current server.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 
 import javax.swing.JInternalFrame;

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

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.ui.ChannelFrame;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.QueryFrame;
 
 import java.util.Collections;

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

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
 import com.dmdirc.identities.Identity;
 import com.dmdirc.identities.IdentityManager;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to add/view/delete ignores.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The join command allows users to join a channel, or a comma-seperated list

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

@@ -26,7 +26,7 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to send privmsgs.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The MOTD command allows the user to retrieve the MOTD for the server.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to change nickname.

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

@@ -26,7 +26,7 @@ import com.dmdirc.Config;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to send notices.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to open a query dialog with another user.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The raw command allows the user to send a raw line of text directly to the

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The reconnect command reconnects to the current server.

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

@@ -25,7 +25,7 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.ServerCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The whois command requests information about another user.

src/com/dmdirc/ui/MainFrame.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui;
 
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;

src/com/dmdirc/ui/components/Frame.java

@@ -29,7 +29,7 @@ import com.dmdirc.Server;
 import com.dmdirc.identities.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.dialogs.PasteDialog;
 import com.dmdirc.ui.input.InputHandler;

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

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.Command;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.IntelligentCommand;
-import com.dmdirc.ui.InputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.components.ColourPickerDialog;
 import com.dmdirc.ui.messages.Styliser;
 

src/com/dmdirc/ui/InputWindow.java → src/com/dmdirc/ui/interfaces/InputWindow.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui;
+package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;