Repackaged: Logger, CommandParser, Actions, Identities

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

src/com/dmdirc/actions/Action.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,14 +30,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.ServerManager;
-import uk.org.ownage.dmdirc.commandparser.CommandParser;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommandParser;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.ServerManager;
+import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommandParser;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * Describes a single action.

src/com/dmdirc/actions/ActionComparison.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 /**
  * Describes the methods that must be implemented by an action comparison.

src/com/dmdirc/actions/ActionComponent.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 /**
  * The ActionComponent interface describes the methods that action components

src/com/dmdirc/actions/ActionCondition.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 /**
  * An action condition represents one condition within an action.

src/com/dmdirc/actions/ActionManager.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,13 +29,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.plugins.PluginManager;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.plugins.PluginManager;
 
 /**
  * Manages all actions for the client.

src/com/dmdirc/actions/ActionMetaType.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 /**
  * Encapsulates the methods that all action types are required to implement.

src/com/dmdirc/actions/ActionType.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 /**
  * Encapsulates the methods that all actions are required to implement.

src/com/dmdirc/actions/CoreActionComparison.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 import java.awt.Color;
 import java.util.regex.PatternSyntaxException;
 
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * A CoreActionComparison represents a possible comparison between two types of

src/com/dmdirc/actions/CoreActionComponent.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 import java.awt.Color;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.parser.ChannelClientInfo;
 
 /**
  * A CoreActionComponent represents a component of some object that the user can

src/com/dmdirc/actions/CoreActionMetaType.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
+import com.dmdirc.parser.ChannelClientInfo;
 
 /**
  * An enumeration of different types of actions (the type determines the

src/com/dmdirc/actions/CoreActionType.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.actions;
+package com.dmdirc.actions;
 
 /**
  * An enumeration of actions that are raised by the core.

src/com/dmdirc/commandparser/ChannelCommand.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
 
 /**
  * Represents a command which can be performed only in the context of a channel.

src/com/dmdirc/commandparser/ChannelCommandParser.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
 
 /**
  * A command parser that is tailored for use in a channel environment. Handles

src/com/dmdirc/commandparser/Command.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
 /**
  * Represents a generic command.

src/com/dmdirc/commandparser/CommandManager.java

@@ -20,20 +20,20 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.ServerManager;
-import uk.org.ownage.dmdirc.commandparser.commands.channel.*;
-import uk.org.ownage.dmdirc.commandparser.commands.global.*;
-import uk.org.ownage.dmdirc.commandparser.commands.query.*;
-import uk.org.ownage.dmdirc.commandparser.commands.server.*;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
+import com.dmdirc.commandparser.commands.channel.*;
+import com.dmdirc.commandparser.commands.global.*;
+import com.dmdirc.commandparser.commands.query.*;
+import com.dmdirc.commandparser.commands.server.*;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The command manager creates and manages a single instance of all commands,

src/com/dmdirc/commandparser/CommandParser.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
 import java.util.Hashtable;
 import java.util.Map;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
+import com.dmdirc.Config;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
 
 /**
  * Represents a generic command parser. A command parser takes a line of input

src/com/dmdirc/commandparser/CommandWindow.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
+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

src/com/dmdirc/commandparser/GlobalCommand.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
 /**
  * Represents a generic global command. Global commands are associated with

src/com/dmdirc/commandparser/GlobalCommandParser.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.Server;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The command parser used for global commands.

src/com/dmdirc/commandparser/QueryCommand.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
 
 /**
  * Represents a command which can be performed only in the context of a query.

src/com/dmdirc/commandparser/QueryCommandParser.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
 
 /**
  * A command parser that is tailored for use in a query environment. Handles

src/com/dmdirc/commandparser/ServerCommand.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Server;
 
 /**
  * Represents a generic server command. Server commands are associated with

src/com/dmdirc/commandparser/ServerCommandParser.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;
 
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Server;
 
 /**
  * A command parser used in the context of a server.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
+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;
 
 /**
  * The kick command bans a specified user or host from the channel.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The benchmark command allows us to fake a stream of channel messages for

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
+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.dialogs.channelsetting.ChannelSettingsDialog;
 
 /**
  * Opens the channel settings window for the channel.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The kick command kicks a specified user from the channel.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The kick/0 command informs the user of the correct usage of /kick.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
+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;
 
 /**
  * The kick command kicks a specified user from the channel.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The me command sends a CTCP action to the current channel.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The me/0 command simply tells the user that the correct usage of /me requires

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
+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;
 
 /**
  * The mode command allows the user to inspect and change channel modes.

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

@@ -20,17 +20,17 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
 import java.awt.Color;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.Channel;
+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.messages.ColourManager;
 
 /**
  * The notify command allows the user to set the notification colour for a

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The part command parts the current channel with a specified part message.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
 
 /**
  * The PartDefault command (part/0) is used when the user does not specify a

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

@@ -20,21 +20,21 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
 import java.awt.Color;
 import java.util.Map;
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.ChannelClientProperty;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.ui.ChannelFrame;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.Channel;
+import com.dmdirc.ChannelClientProperty;
+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.parser.ChannelInfo;
+import com.dmdirc.ui.ChannelFrame;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * Allows the user to set a nickname on the channel to use a custom colour.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
+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;
 
 /**
  * The set topic command allows the user to change the current topic.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
+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;
 
 /**
  * The show topic command shows the user the current topic.

src/com/dmdirc/commandparser/commands/channel/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Commands related to or associated with a channel.
  */
-package uk.org.ownage.dmdirc.commandparser.commands.channel;
+package com.dmdirc.commandparser.commands.channel;

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.ServerManager;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
 
 /**
  * The AllServers command allows users to issue commands to all servers.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Main;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.Main;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
 
 /**
  * The exit command allows the user to quit DMDirc with a custom quit message.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.Config;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
 
 /**
  * Represents the exit/0 command (i.e., an exit with no arguments). Reads the

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to load a message formatter from a file.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
-import uk.org.ownage.dmdirc.plugins.PluginManager;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.plugins.PluginManager;
 
 /**
  * Allows the user to load a plugin.

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

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Main;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
-import uk.org.ownage.dmdirc.identities.IdentityManager;
+import com.dmdirc.Config;
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.identities.IdentityManager;
 
 /**
  * The new server command allows users to open a new server window.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
 
 /**
  * Allows the user to reload actions.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to reload the message formatter.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
-import uk.org.ownage.dmdirc.plugins.PluginManager;
-import uk.org.ownage.dmdirc.plugins.Plugin;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.Plugin;
 
 /**
  * Allows the user to reload a plugin.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.ui.messages.Formatter;
 
 /**
  * Allows the user to save the message formatter to a file.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.global;
+package com.dmdirc.commandparser.commands.global;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.GlobalCommand;
+import com.dmdirc.Config;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.GlobalCommand;
 
 /**
  * The set command allows the user to inspect and change global config settings.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.query;
+package com.dmdirc.commandparser.commands.query;
 
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.QueryCommand;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.QueryCommand;
 
 /**
  * Represents the /me command used in a query window.

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

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.query;
+package com.dmdirc.commandparser.commands.query;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.QueryCommand;
+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;
 
 /**
  * Represents the /me command used in a query window, with no parameters.

src/com/dmdirc/commandparser/commands/query/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Commands related to or associated with a query.
  */
-package uk.org.ownage.dmdirc.commandparser.commands.query;
+package com.dmdirc.commandparser.commands.query;

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The AllChannels command allows the user to issue a command to all channels

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The away command allows the user to set their away message.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The back command allows the user to unset their away status.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The /server command allows the user to connect to a new server.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The clear command clears the main text area of the current window.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
-import uk.org.ownage.dmdirc.identities.ConfigSource;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.identities.ConfigSource;
 
 /**
  * Displays information about the origin's config manager.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * Allows the user to send CTCP messages.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The disconnect command disconnects from the current server.

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

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
 import javax.swing.JInternalFrame;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * The echo commands simply echos text to the current window.

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

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
 import java.util.Collections;
 import java.util.List;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.Command;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
-import uk.org.ownage.dmdirc.ui.ChannelFrame;
-import uk.org.ownage.dmdirc.ui.QueryFrame;
+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.QueryFrame;
 
 /**
  * The help command shows the user a list of available commands, along with

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

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
-import uk.org.ownage.dmdirc.identities.Identity;
-import uk.org.ownage.dmdirc.identities.IdentityManager;
+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;
 
 /**
  * Allows the user to add/view/delete ignores.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The join command allows users to join a channel, or a comma-seperated list

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * Allows the user to send privmsgs.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The MOTD command allows the user to retrieve the MOTD for the server.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * Allows the user to change nickname.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * Allows the user to send notices.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * Allows the user to open a query dialog with another user.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The raw command allows the user to send a raw line of text directly to the

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The reconnect command reconnects to the current server.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
 
 /**
  * The whois command requests information about another user.

src/com/dmdirc/commandparser/commands/server/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Commands related to or associated with a server.
  */
-package uk.org.ownage.dmdirc.commandparser.commands.server;
+package com.dmdirc.commandparser.commands.server;

src/com/dmdirc/commandparser/package-info.java

@@ -24,4 +24,4 @@
  * Command parser, proceses and handles commands for the client.
  */
 
-package uk.org.ownage.dmdirc.commandparser;
+package com.dmdirc.commandparser;

src/com/dmdirc/identities/ConfigManager.java

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
 import java.awt.Color;
 import java.util.Collections;
 import java.util.List;
 
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * The config manager manages the various config sources for each entity.

src/com/dmdirc/identities/ConfigSource.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
 /**
  * A Config source is an object that can provide configuration details.

src/com/dmdirc/identities/ConfigTarget.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
 /**
  * Represents the target of a particular config source.

src/com/dmdirc/identities/GlobalConfig.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
-import uk.org.ownage.dmdirc.Config;
+import com.dmdirc.Config;
 
 /**
  * Implements a non-static wrapper of the global Config class.

src/com/dmdirc/identities/Identity.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,9 +33,9 @@ import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.util.Properties;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.Config;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * An identity is a group of settings that are applied to a connection, server,
@@ -60,7 +60,7 @@ public final class Identity implements ConfigSource {
     /**
      * Creates a new instance of Identity.
      * @param file The file to load this identity from.
-     * @throws uk.org.ownage.dmdirc.identities.InvalidIdentityFileException
+     * @throws com.dmdirc.identities.InvalidIdentityFileException
      * Missing required properties
      * @throws IOException Input/output exception
      */
@@ -73,7 +73,7 @@ public final class Identity implements ConfigSource {
     /**
      * Creates a new read-only identity.
      * @param stream The input stream to read the identity from
-     * @throws uk.org.ownage.dmdirc.identities.InvalidIdentityFileException
+     * @throws com.dmdirc.identities.InvalidIdentityFileException
      * Missing required properties
      * @throws IOException Input/output exception
      */

src/com/dmdirc/identities/IdentityManager.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,9 +29,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.Config;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The identity manager manages all known identities, providing easy methods

src/com/dmdirc/identities/InvalidIdentityFileException.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;
 
 /**
  * Thrown when an identity file is read that does not contain the required

src/com/dmdirc/identities/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Identity related classes.
  */
-package uk.org.ownage.dmdirc.identities;
+package com.dmdirc.identities;

src/com/dmdirc/logger/ErrorLevel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.logger;
+package com.dmdirc.logger;
 
 /**
  * Specific error levels allowed by Logger.

src/com/dmdirc/logger/Logger.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.logger;
+package com.dmdirc.logger;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -31,9 +31,9 @@ import java.util.Locale;
 
 import javax.swing.ImageIcon;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.dialogs.ErrorDialog;
+import com.dmdirc.Config;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.dialogs.ErrorDialog;
 
 /**
  * Logger class for an applications, provides logging, error logging and debug

src/com/dmdirc/logger/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Logger class and associated enums.
  */
-package uk.org.ownage.dmdirc.logger;
+package com.dmdirc.logger;