A whole bunch of non-commited changes.

I think these are all from the command refactoring

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

src/com/dmdirc/GlobalWindow.java

@@ -23,7 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.GlobalCommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.TabCompleter;

src/com/dmdirc/actions/Action.java

@@ -25,8 +25,8 @@ package com.dmdirc.actions;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.GlobalCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.audio;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.interfaces.InputWindow;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.dcop;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.List;

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.dns;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Timer;

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

@@ -24,8 +24,8 @@ package com.dmdirc.addons.logging;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.IntelligentCommand;
-import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;

src/com/dmdirc/addons/nowplaying/plugin/NowPlayingCommand.java

@@ -25,9 +25,9 @@ package com.dmdirc.addons.nowplaying.plugin;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
 import com.dmdirc.addons.nowplaying.MediaSource;
-import com.dmdirc.commandparser.ChatCommand;
+import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.IntelligentCommand;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.osdplugin;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

src/com/dmdirc/addons/redirectplugin/FakeInputWindow.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.redirectplugin;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.util.StringTranscoder;
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/addons/redirectplugin/RedirectCommand.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.redirectplugin;
 
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
-import com.dmdirc.commandparser.ChatCommand;
+import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.systray;
 
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.timeplugin;
 
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.GlobalCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Timer;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.timeplugin;
 
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

src/com/dmdirc/ui/dummy/DummyChannelWindow.java

@@ -25,8 +25,8 @@ package com.dmdirc.ui.dummy;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.util.StringTranscoder;
-import com.dmdirc.commandparser.ChannelCommandParser;
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.ChannelCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.parser.ChannelClientInfo;
 import com.dmdirc.ui.input.InputHandler;

src/com/dmdirc/ui/dummy/DummyController.java

@@ -27,7 +27,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/ui/dummy/DummyInputWindow.java

@@ -25,8 +25,8 @@ package com.dmdirc.ui.dummy;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.util.StringTranscoder;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.GlobalCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/ui/dummy/DummyServerWindow.java

@@ -25,8 +25,8 @@ package com.dmdirc.ui.dummy;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.util.StringTranscoder;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.ServerCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ServerWindow;

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

@@ -24,10 +24,10 @@ package com.dmdirc.ui.input;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandparser.Command;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.IntelligentCommand;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.interfaces;
 
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 
 /**

src/com/dmdirc/ui/interfaces/UIController.java

@@ -27,7 +27,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.updater.Update;
 
 import java.util.List;

src/com/dmdirc/ui/swing/ChannelFrame.java

@@ -24,11 +24,11 @@ package com.dmdirc.ui.swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Main;
-import com.dmdirc.commandparser.ChannelCommand;
-import com.dmdirc.commandparser.ChannelCommandParser;
-import com.dmdirc.commandparser.Command;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.commandparser.commands.ChannelCommand;
+import com.dmdirc.commandparser.parsers.ChannelCommandParser;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.parser.ChannelClientInfo;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ChannelWindow;

src/com/dmdirc/ui/swing/CustomInputFrame.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.swing;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.swing.components.InputFrame;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;

src/com/dmdirc/ui/swing/QueryFrame.java

@@ -23,8 +23,8 @@
 package com.dmdirc.ui.swing;
 
 import com.dmdirc.Query;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.QueryCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.QueryWindow;
 import com.dmdirc.ui.swing.components.InputFrame;

src/com/dmdirc/ui/swing/ServerFrame.java

@@ -24,8 +24,8 @@ package com.dmdirc.ui.swing;
 
 
 import com.dmdirc.Server;
-import com.dmdirc.commandparser.CommandParser;
-import com.dmdirc.commandparser.ServerCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ServerWindow;

src/com/dmdirc/ui/swing/SwingController.java

@@ -29,7 +29,7 @@ import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

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

@@ -26,10 +26,10 @@ import com.dmdirc.util.BrowserLauncher;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.util.StringTranscoder;
-import com.dmdirc.commandparser.ChannelCommand;
-import com.dmdirc.commandparser.Command;
+import com.dmdirc.commandparser.commands.ChannelCommand;
+import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.config.ConfigChangeListener;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;