Repackaged: Core, Ui, Plugins

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

src/com/dmdirc/BrowserLauncher.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.awt.Desktop;
 import java.io.IOException;
@@ -29,8 +29,8 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Date;
 
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The BrowserLauncher handles the opening of the user's web browser when

src/com/dmdirc/Channel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.awt.Color;
 import java.lang.reflect.InvocationTargetException;
@@ -32,38 +32,38 @@ import java.util.Map;
 import javax.swing.ImageIcon;
 import javax.swing.SwingUtilities;
 
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-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.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackManager;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackNotFound;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelAction;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelJoin;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelKick;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelPart;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelQuit;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelTopic;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
-import uk.org.ownage.dmdirc.ui.ChannelFrame;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.input.TabCompleter;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
-import uk.org.ownage.dmdirc.ui.messages.Styliser;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.callbacks.CallbackManager;
+import com.dmdirc.parser.callbacks.CallbackNotFound;
+import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
+import com.dmdirc.parser.callbacks.interfaces.IChannelAction;
+import com.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
+import com.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
+import com.dmdirc.parser.callbacks.interfaces.IChannelJoin;
+import com.dmdirc.parser.callbacks.interfaces.IChannelKick;
+import com.dmdirc.parser.callbacks.interfaces.IChannelMessage;
+import com.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelPart;
+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.MainFrame;
+import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.ui.messages.Styliser;
 
 /**
  * The Channel class represents the client's view of the channel. It handles

src/com/dmdirc/ChannelClientProperty.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 /**
  * Represents the properties that can be set on a channel client.

src/com/dmdirc/CipherUtils.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -37,8 +37,8 @@ import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
 import javax.swing.JOptionPane;
 
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * Helper class to encrypt and decrypt strings, requests passwords if needed.

src/com/dmdirc/Config.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.awt.Color;
 import java.io.File;
@@ -36,10 +36,10 @@ import java.util.Properties;
 
 import javax.swing.UIManager;
 
-import uk.org.ownage.dmdirc.identities.IdentityManager;
-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.identities.IdentityManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * Reads/writes the application's config file.

src/com/dmdirc/Error.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.util.Date;
 
 import javax.swing.Icon;
 
-import uk.org.ownage.dmdirc.ui.interfaces.StatusErrorNotifier;
+import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 
 /**
  * Stores a program error and dialog.

src/com/dmdirc/FrameContainer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.awt.Color;
 import java.beans.PropertyVetoException;
@@ -30,11 +30,11 @@ import javax.swing.JInternalFrame;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
 
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * Standard interface for all objects that contain an innerframe. Provides

src/com/dmdirc/Main.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.identities.IdentityManager;
-import uk.org.ownage.dmdirc.plugins.PluginManager;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.identities.IdentityManager;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * Main class, handles initialisation.

src/com/dmdirc/Query.java

@@ -20,27 +20,27 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.net.URL;
 
 import javax.swing.ImageIcon;
 
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackNotFound;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateAction;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.QueryFrame;
-import uk.org.ownage.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+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.MainFrame;
+import com.dmdirc.ui.QueryFrame;
+import com.dmdirc.ui.input.TabCompleter;
 
 /**
  * The Query class represents the client's view of a query with another user.

src/com/dmdirc/Raw.java

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.net.URL;
 
 import javax.swing.ImageIcon;
 
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataIn;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataOut;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.ServerFrame;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.callbacks.interfaces.IDataIn;
+import com.dmdirc.parser.callbacks.interfaces.IDataOut;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.ServerFrame;
 
 /**
  * Handles the raw window (which shows the user raw data being sent and

src/com/dmdirc/Server.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -35,44 +35,44 @@ import javax.swing.ImageIcon;
 import javax.swing.JInternalFrame;
 import javax.swing.SwingUtilities;
 
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.identities.ConfigSource;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.MyInfo;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.ServerInfo;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackNotFound;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayState;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IConnectError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IErrorInfo;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IGotNetwork;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IMOTDEnd;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IMOTDLine;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IMOTDStart;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickInUse;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INumeric;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPingFailed;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPingSuccess;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateAction;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateCTCP;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateCTCPReply;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateNotice;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.ISocketClosed;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.ServerFrame;
-import uk.org.ownage.dmdirc.ui.input.TabCompleter;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.identities.ConfigSource;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.MyInfo;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.ServerInfo;
+import com.dmdirc.parser.callbacks.CallbackNotFound;
+import com.dmdirc.parser.callbacks.interfaces.IAwayState;
+import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
+import com.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
+import com.dmdirc.parser.callbacks.interfaces.IConnectError;
+import com.dmdirc.parser.callbacks.interfaces.IErrorInfo;
+import com.dmdirc.parser.callbacks.interfaces.IGotNetwork;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDEnd;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDLine;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDStart;
+import com.dmdirc.parser.callbacks.interfaces.INickInUse;
+import com.dmdirc.parser.callbacks.interfaces.INumeric;
+import com.dmdirc.parser.callbacks.interfaces.IPingFailed;
+import com.dmdirc.parser.callbacks.interfaces.IPingSuccess;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateCTCP;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateCTCPReply;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateNotice;
+import com.dmdirc.parser.callbacks.interfaces.ISocketClosed;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.ServerFrame;
+import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.Formatter;
 
 /**
  * The Server class represents the client's view of a server. It maintains

src/com/dmdirc/ServerManager.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package com.dmdirc;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.JInternalFrame;
 
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * The ServerManager maintains a list of all servers, and provides methods to

src/com/dmdirc/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Core classes for DMDirc.  Used to interact between the parser and UI.
  */
-package uk.org.ownage.dmdirc;
+package com.dmdirc;

src/com/dmdirc/plugins/EventPlugin.java

@@ -21,9 +21,9 @@
  *
  * SVN: $Id$
  */
-package uk.org.ownage.dmdirc.plugins;
+package com.dmdirc.plugins;
 
-import uk.org.ownage.dmdirc.actions.ActionType;
+import com.dmdirc.actions.ActionType;
 
 /**
  * Defines the additional methods that should be implemented by plugins that require events.

src/com/dmdirc/plugins/Plugin.java

@@ -21,7 +21,7 @@
  *
  * SVN: $Id$
  */
-package uk.org.ownage.dmdirc.plugins;
+package com.dmdirc.plugins;
 
 /**
  * Defines the standard methods that should be implemented by plugins.

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -21,7 +21,7 @@
  *
  * SVN: $Id$
  */
-package uk.org.ownage.dmdirc.plugins;
+package com.dmdirc.plugins;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;

src/com/dmdirc/plugins/PluginManager.java

@@ -21,7 +21,7 @@
  *
  * SVN: $Id$
  */
-package uk.org.ownage.dmdirc.plugins;
+package com.dmdirc.plugins;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -31,10 +31,10 @@ import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
+import com.dmdirc.Config;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
 
 public class PluginManager {
 	/**

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

@@ -24,4 +24,4 @@
 /**
  * Plugin manager and interfaces.
  */
-package uk.org.ownage.dmdirc.plugins;
+package com.dmdirc.plugins;

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

@@ -20,17 +20,17 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.dcop;
+package com.dmdirc.plugins.plugins.dcop;
 
 import java.io.IOException;
 import java.util.List;
 
-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.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The dcop command retrieves information from a dcop application.

src/com/dmdirc/plugins/plugins/dcop/DcopPlugin.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.dcop;
+package com.dmdirc.plugins.plugins.dcop;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,7 +28,7 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import uk.org.ownage.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.Plugin;
 
 /**
  * Allows the user to execute dcop commands (and read the results).

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

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.dcop;
+package com.dmdirc.plugins.plugins.dcop;
 
 import java.io.IOException;
 import java.util.List;
 
-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.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+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.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The now playing command retrieves the currently playing song from a

src/com/dmdirc/plugins/plugins/lagdisplay/LagDisplayPlugin.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.lagdisplay;
+package com.dmdirc.plugins.plugins.lagdisplay;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -30,14 +30,14 @@ import javax.swing.JInternalFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import uk.org.ownage.dmdirc.FrameContainer;
+import com.dmdirc.FrameContainer;
 
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.plugins.EventPlugin;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.Server;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.EventPlugin;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * Displays the current server's lag in the status bar.

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

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.logging;
+package com.dmdirc.plugins.plugins.logging;
 
 import java.util.Enumeration;
 import java.util.Properties;
 
-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.plugins.Plugin;
-import uk.org.ownage.dmdirc.plugins.PluginManager;
+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.plugins.Plugin;
+import com.dmdirc.plugins.PluginManager;
 
 /**
  * The dcop command retrieves information from a dcop application.
@@ -56,7 +56,7 @@ public final class LoggingCommand extends ServerCommand {
 	 * @param args The user supplied arguments
 	 */
 	public void execute(final CommandWindow origin, final Server server, final String... args) {
-		final Plugin gotPlugin = PluginManager.getPluginManager().getPlugin("uk.org.ownage.dmdirc.plugins.plugins.logging.LoggingPlugin");
+		final Plugin gotPlugin = PluginManager.getPluginManager().getPlugin("com.dmdirc.plugins.plugins.logging.LoggingPlugin");
 		
 		if (gotPlugin == null || !(gotPlugin instanceof LoggingPlugin)) {
 			origin.addLine("commandError", "Logging Plugin is not loaded.");
@@ -69,7 +69,7 @@ public final class LoggingCommand extends ServerCommand {
 			if (args[0].equalsIgnoreCase("config")) {
 				plugin.showConfig();
 			} else if (args[0].equalsIgnoreCase("reload")) {
-				if (PluginManager.getPluginManager().reloadPlugin("uk.org.ownage.dmdirc.plugins.plugins.logging.LoggingPlugin")) {
+				if (PluginManager.getPluginManager().reloadPlugin("com.dmdirc.plugins.plugins.logging.LoggingPlugin")) {
 					origin.addLine("commandOutput", "Plugin reloaded.");
 				} else {
 					origin.addLine("commandOutput", "Plugin failed to reload.");

src/com/dmdirc/plugins/plugins/logging/LoggingPlugin.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.logging;
+package com.dmdirc.plugins.plugins.logging;
 
 import java.awt.Color;
 import java.io.BufferedWriter;
@@ -37,25 +37,25 @@ import java.util.Stack;
 import java.util.Properties;
 import java.util.Hashtable;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-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.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.plugins.EventPlugin;
-import uk.org.ownage.dmdirc.ui.components.Frame;
-import uk.org.ownage.dmdirc.ui.components.PreferencesInterface;
-import uk.org.ownage.dmdirc.ui.components.PreferencesPanel;
-import uk.org.ownage.dmdirc.ui.messages.Styliser;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.Query;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.EventPlugin;
+import com.dmdirc.ui.components.Frame;
+import com.dmdirc.ui.components.PreferencesInterface;
+import com.dmdirc.ui.components.PreferencesPanel;
+import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * Adds logging facility to client.

src/com/dmdirc/plugins/plugins/logging/ReverseFileReader.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.logging;
+package com.dmdirc.plugins.plugins.logging;
 
 import java.io.File;
 import java.io.FileNotFoundException;

src/com/dmdirc/plugins/plugins/nickcolours/NickColourPlugin.java

@@ -20,25 +20,25 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.nickcolours;
+package com.dmdirc.plugins.plugins.nickcolours;
 
 import java.awt.Color;
 import java.util.Map;
 import java.util.Properties;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.ChannelClientProperty;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.plugins.EventPlugin;
-import uk.org.ownage.dmdirc.ui.components.PreferencesInterface;
-import uk.org.ownage.dmdirc.ui.components.PreferencesPanel;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.Channel;
+import com.dmdirc.ChannelClientProperty;
+import com.dmdirc.Config;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.EventPlugin;
+import com.dmdirc.ui.components.PreferencesInterface;
+import com.dmdirc.ui.components.PreferencesPanel;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * Provides various features related to nickname colouring.

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

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.systray;
+package com.dmdirc.plugins.plugins.systray;
 
-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 /popup command allows the user to show a popup message from the system

src/com/dmdirc/plugins/plugins/systray/SystrayPlugin.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.systray;
+package com.dmdirc.plugins.plugins.systray;
 
 import java.awt.AWTException;
 import java.awt.MenuItem;
@@ -35,9 +35,9 @@ import java.net.URL;
 
 import javax.swing.ImageIcon;
 
-import uk.org.ownage.dmdirc.Main;
-import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * The Systray plugin shows DMDirc in the user's system tray, and allows

src/com/dmdirc/plugins/plugins/timeplugin/TimeActionMetaType.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.timeplugin;
+package com.dmdirc.plugins.plugins.timeplugin;
 
 import java.util.Calendar;
 
-import uk.org.ownage.dmdirc.actions.ActionMetaType;
+import com.dmdirc.actions.ActionMetaType;
 
 /**
  * Encapsulates the meta types used by the various time actions.

src/com/dmdirc/plugins/plugins/timeplugin/TimeActionType.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.timeplugin;
+package com.dmdirc.plugins.plugins.timeplugin;
 
-import uk.org.ownage.dmdirc.actions.ActionMetaType;
-import uk.org.ownage.dmdirc.actions.ActionType;
+import com.dmdirc.actions.ActionMetaType;
+import com.dmdirc.actions.ActionType;
 
 /**
  * Lists the actions that the time plugin will raise.

src/com/dmdirc/plugins/plugins/timeplugin/TimePlugin.java

@@ -20,15 +20,15 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.timeplugin;
+package com.dmdirc.plugins.plugins.timeplugin;
 
 import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.plugins.Plugin;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.plugins.Plugin;
 
 /**
  * Provides various time-related features

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.plugins.plugins.windowstatus;
+package com.dmdirc.plugins.plugins.windowstatus;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -33,24 +33,24 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.plugins.EventPlugin;
-import uk.org.ownage.dmdirc.ui.ChannelFrame;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.QueryFrame;
-import uk.org.ownage.dmdirc.ui.ServerFrame;
-import uk.org.ownage.dmdirc.ui.components.PreferencesInterface;
-import uk.org.ownage.dmdirc.ui.components.PreferencesPanel;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.EventPlugin;
+import com.dmdirc.ui.ChannelFrame;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.QueryFrame;
+import com.dmdirc.ui.ServerFrame;
+import com.dmdirc.ui.components.PreferencesInterface;
+import com.dmdirc.ui.components.PreferencesPanel;
 
 /**
  * Displays information related to the current window in the status bar.

src/com/dmdirc/ui/ChannelFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.awt.Color;
 import java.awt.GridBagConstraints;
@@ -47,23 +47,23 @@ import javax.swing.SwingUtilities;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.ChannelCommandParser;
-import uk.org.ownage.dmdirc.commandparser.Command;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
-import uk.org.ownage.dmdirc.commandparser.CommandParser;
-import uk.org.ownage.dmdirc.commandparser.ServerCommand;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.ui.components.Frame;
-import uk.org.ownage.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
-import uk.org.ownage.dmdirc.ui.input.InputHandler;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.ChannelCommand;
+import com.dmdirc.commandparser.ChannelCommandParser;
+import com.dmdirc.commandparser.Command;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.ServerCommand;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.ui.components.Frame;
+import com.dmdirc.ui.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.ui.input.InputHandler;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * The channel frame is the GUI component that represents a channel to the user.

src/com/dmdirc/ui/MainFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -57,25 +57,25 @@ import javax.swing.WindowConstants;
 import javax.swing.border.EtchedBorder;
 import javax.swing.plaf.FontUIResource;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Main;
-import uk.org.ownage.dmdirc.ServerManager;
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.CoreActionType;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.components.StatusBar;
-import uk.org.ownage.dmdirc.ui.dialogs.AboutDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.ActionsManagerDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.NewServerDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.PluginDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.PreferencesDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.ProfileEditorDialog;
-import uk.org.ownage.dmdirc.ui.framemanager.FrameManager;
-import uk.org.ownage.dmdirc.ui.framemanager.tree.TreeFrameManager;
+import com.dmdirc.Config;
+import com.dmdirc.Main;
+import com.dmdirc.ServerManager;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.components.StatusBar;
+import com.dmdirc.ui.dialogs.AboutDialog;
+import com.dmdirc.ui.dialogs.ActionsManagerDialog;
+import com.dmdirc.ui.dialogs.NewServerDialog;
+import com.dmdirc.ui.dialogs.PluginDialog;
+import com.dmdirc.ui.dialogs.PreferencesDialog;
+import com.dmdirc.ui.dialogs.ProfileEditorDialog;
+import com.dmdirc.ui.framemanager.FrameManager;
+import com.dmdirc.ui.framemanager.tree.TreeFrameManager;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.*;
+import static com.dmdirc.ui.UIUtilities.*;
 
 /**
  * The main application frame.

src/com/dmdirc/ui/NicklistComparator.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
 
 /**
  * Compares nicklist entries to each other, for sorting purposes.

src/com/dmdirc/ui/NicklistListModel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,8 +28,8 @@ import java.util.List;
 
 import javax.swing.AbstractListModel;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.Config;
+import com.dmdirc.parser.ChannelClientInfo;
 
 /**
  * Stores and provides means to modify nicklist data for a channel.

src/com/dmdirc/ui/NicklistRenderer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -30,10 +30,10 @@ import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JList;
 
-import uk.org.ownage.dmdirc.ChannelClientProperty;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ChannelClientProperty;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * Renders the nicklist.

src/com/dmdirc/ui/QueryFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -28,16 +28,16 @@ import java.awt.Insets;
 
 import javax.swing.ScrollPaneConstants;
 
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandParser;
-import uk.org.ownage.dmdirc.commandparser.QueryCommandParser;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.ui.components.Frame;
-import uk.org.ownage.dmdirc.ui.input.InputHandler;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Query;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.QueryCommandParser;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.ui.components.Frame;
+import com.dmdirc.ui.input.InputHandler;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * The QueryFrame is the MDI window that shows query messages to the user.

src/com/dmdirc/ui/ServerFrame.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -28,16 +28,16 @@ import java.awt.Insets;
 
 import javax.swing.ScrollPaneConstants;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.CommandParser;
-import uk.org.ownage.dmdirc.commandparser.ServerCommandParser;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.ui.components.Frame;
-import uk.org.ownage.dmdirc.ui.input.InputHandler;
+import com.dmdirc.Config;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.ServerCommandParser;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.ui.components.Frame;
+import com.dmdirc.ui.input.InputHandler;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * The ServerFrame is the MDI window that shows server messages to the user.

src/com/dmdirc/ui/UIUtilities.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;
 
 import java.awt.Component;
 import java.awt.Container;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.BorderLayout;
 import java.util.List;
@@ -33,11 +33,11 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import uk.org.ownage.dmdirc.actions.Action;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.ui.dialogs.ActionsManagerDialog;
+import com.dmdirc.actions.Action;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.ui.dialogs.ActionsManagerDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * The actions group panel is the control displayed within the tabbed control

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -33,9 +33,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManager;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Colour chooser widget.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.event.ActionListener;
 
 import javax.swing.JDialog;
 
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * Colour picker dialog.

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -37,7 +37,7 @@ import java.util.List;
 
 import javax.swing.JPanel;
 
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 /**
  * The ColourPickerPanel allows users to pick either an IRC colour or a hex

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.AWTException;
 import java.awt.BorderLayout;
@@ -67,21 +67,21 @@ import javax.swing.plaf.synth.SynthLookAndFeel;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 
-import uk.org.ownage.dmdirc.BrowserLauncher;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.dialogs.PasteDialog;
-import uk.org.ownage.dmdirc.ui.input.InputHandler;
-import uk.org.ownage.dmdirc.ui.input.TabCompleter;
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
-import uk.org.ownage.dmdirc.ui.messages.Styliser;
+import com.dmdirc.BrowserLauncher;
+import com.dmdirc.Config;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.identities.ConfigManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.dialogs.PasteDialog;
+import com.dmdirc.ui.input.InputHandler;
+import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.ui.messages.Styliser;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Frame component.

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -33,10 +33,10 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SpringLayout;
 
-import uk.org.ownage.dmdirc.identities.ConfigManager;
+import com.dmdirc.identities.ConfigManager;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * A component to encapsulate one parameter-requiring channel mode, displaying

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -35,9 +35,9 @@ import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.ListCellRenderer;
 
-import uk.org.ownage.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.Plugin;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Handles the rendering of the JList used for plugin management.

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.util.Properties;
 

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -61,14 +61,14 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.Config;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.MainFrame;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * Allows the user to modify global client preferences.

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.Dimension;
 import java.awt.Insets;
@@ -39,8 +39,8 @@ import javax.swing.SpringLayout;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * Status bar, shows message and info on the gui.

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.Dimension;
 import java.awt.Frame;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;
 
 import java.awt.Component;
 import java.awt.Dimension;
@@ -45,12 +45,12 @@ import javax.swing.JPopupMenu;
 import javax.swing.Spring;
 import javax.swing.SpringLayout;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Error;
-import uk.org.ownage.dmdirc.ui.interfaces.StatusErrorNotifier;
-import uk.org.ownage.dmdirc.ui.interfaces.StatusMessageNotifier;
+import com.dmdirc.Config;
+import com.dmdirc.Error;
+import com.dmdirc.ui.interfaces.StatusErrorNotifier;
+import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Status bar, shows message and info on the gui.

src/com/dmdirc/ui/components/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Custom UI components.
  */
-package uk.org.ownage.dmdirc.ui.components;
+package com.dmdirc.ui.components;

src/com/dmdirc/ui/dialogs/AboutDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.Cursor;
 import java.awt.GridBagConstraints;
@@ -37,12 +37,12 @@ import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.WindowConstants;
 
-import uk.org.ownage.dmdirc.BrowserLauncher;
-import uk.org.ownage.dmdirc.Main;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.BrowserLauncher;
+import com.dmdirc.Main;
+import com.dmdirc.ui.MainFrame;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * About dialog.

src/com/dmdirc/ui/dialogs/ActionsManagerDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -40,15 +40,15 @@ import javax.swing.JOptionPane;
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 
-import uk.org.ownage.dmdirc.actions.Action;
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.ActionsGroupPanel;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.actionseditor.ActionsEditorDialog;
+import com.dmdirc.actions.Action;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.ActionsGroupPanel;
+import com.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.ui.dialogs.actionseditor.ActionsEditorDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Allows the user to manage actions.

src/com/dmdirc/ui/dialogs/ErrorDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -51,12 +51,12 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.WindowConstants;
 
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.interfaces.StatusErrorNotifier;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * The fatal error dialog is used to inform the user that a fatal error has

src/com/dmdirc/ui/dialogs/NewServerDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -43,18 +43,18 @@ import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import javax.swing.WindowConstants;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.ServerManager;
-import uk.org.ownage.dmdirc.identities.ConfigSource;
-import uk.org.ownage.dmdirc.identities.IdentityManager;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.Config;
+import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
+import com.dmdirc.identities.ConfigSource;
+import com.dmdirc.identities.IdentityManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.StandardDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Dialog that allows the user to enter details of a new server to connect to.

src/com/dmdirc/ui/dialogs/PasteDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -36,11 +36,11 @@ import javax.swing.JTextArea;
 import javax.swing.WindowConstants;
 import javax.swing.border.EtchedBorder;
 
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.Frame;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.Frame;
+import com.dmdirc.ui.components.StandardDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 
 /**
  * Allows the user to modify global client preferences.

src/com/dmdirc/ui/dialogs/PluginDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -43,14 +43,14 @@ import javax.swing.event.HyperlinkListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import uk.org.ownage.dmdirc.BrowserLauncher;
-import uk.org.ownage.dmdirc.plugins.Plugin;
-import uk.org.ownage.dmdirc.plugins.PluginManager;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.PluginCellRenderer;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.BrowserLauncher;
+import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.PluginCellRenderer;
+import com.dmdirc.ui.components.StandardDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 
 /**
  * Plugin manager dialog. Allows the user to manage their plugins.

src/com/dmdirc/ui/dialogs/PreferencesDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.util.Map;
 import java.util.Properties;
@@ -28,9 +28,9 @@ import java.util.Properties;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.ui.components.PreferencesInterface;
-import uk.org.ownage.dmdirc.ui.components.PreferencesPanel;
+import com.dmdirc.Config;
+import com.dmdirc.ui.components.PreferencesInterface;
+import com.dmdirc.ui.components.PreferencesPanel;
 
 /**
  * Allows the user to modify global client preferences.

src/com/dmdirc/ui/dialogs/ProfileEditorDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs;
+package com.dmdirc.ui.dialogs;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -46,15 +46,15 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import uk.org.ownage.dmdirc.identities.ConfigSource;
-import uk.org.ownage.dmdirc.identities.Identity;
-import uk.org.ownage.dmdirc.identities.IdentityManager;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.identities.ConfigSource;
+import com.dmdirc.identities.Identity;
+import com.dmdirc.identities.IdentityManager;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.StandardDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * Profile editing dialog.

src/com/dmdirc/ui/dialogs/actionseditor/ActionCellRenderer.java

@@ -20,16 +20,16 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.dialogs.actionseditor;
 
 import java.awt.Component;
 
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JList;
 
-import uk.org.ownage.dmdirc.actions.ActionComparison;
-import uk.org.ownage.dmdirc.actions.ActionComponent;
-import uk.org.ownage.dmdirc.actions.ActionType;
+import com.dmdirc.actions.ActionComparison;
+import com.dmdirc.actions.ActionComponent;
+import com.dmdirc.actions.ActionType;
 
 /**
  * Displays actions using getName not toString.

src/com/dmdirc/ui/dialogs/actionseditor/ActionsEditorDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.dialogs.actionseditor;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -34,13 +34,13 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 
-import uk.org.ownage.dmdirc.actions.Action;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
-import uk.org.ownage.dmdirc.ui.dialogs.ActionsManagerDialog;
+import com.dmdirc.actions.Action;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.ui.dialogs.ActionsManagerDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Actions editor dialog, used for adding and creating new actions.

src/com/dmdirc/ui/dialogs/actionseditor/ConditionEditorDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.dialogs.actionseditor;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -38,16 +38,16 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SpringLayout;
 
-import uk.org.ownage.dmdirc.actions.ActionComparison;
-import uk.org.ownage.dmdirc.actions.ActionComponent;
-import uk.org.ownage.dmdirc.actions.ActionCondition;
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.ActionType;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.actions.ActionComparison;
+import com.dmdirc.actions.ActionComponent;
+import com.dmdirc.actions.ActionCondition;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.ActionType;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.StandardDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * Action conditions editing dialog, used in the actions editor dialog.

src/com/dmdirc/ui/dialogs/actionseditor/ConditionsTabPanel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.dialogs.actionseditor;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -41,10 +41,10 @@ import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.SpringLayout;
 
-import uk.org.ownage.dmdirc.actions.ActionCondition;
+import com.dmdirc.actions.ActionCondition;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * Conditions tab panel, conditions editing for the actions editor dialog.

src/com/dmdirc/ui/dialogs/actionseditor/GeneralTabPanel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.dialogs.actionseditor;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -40,11 +40,11 @@ import javax.swing.JTextField;
 import javax.swing.SpringLayout;
 import javax.swing.SwingUtilities;
 
-import uk.org.ownage.dmdirc.actions.ActionManager;
-import uk.org.ownage.dmdirc.actions.ActionType;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.ActionType;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * General tab panel, name and trigger editing for the actions editor dialog.

src/com/dmdirc/ui/dialogs/actionseditor/ResponseTabPanel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.actionseditor;
+package com.dmdirc.ui.dialogs.actionseditor;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -35,10 +35,10 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.text.BadLocationException;
 
-import uk.org.ownage.dmdirc.ui.messages.Formatter;
+import com.dmdirc.ui.messages.Formatter;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Response tab panel, response and formatter editing for the actions editor

src/com/dmdirc/ui/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.dialogs.channelsetting;
 
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
@@ -51,20 +51,20 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
 import javax.swing.WindowConstants;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.identities.Identity;
-import uk.org.ownage.dmdirc.identities.IdentityManager;
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.ChannelListModeItem;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.components.ParamModePanel;
-import uk.org.ownage.dmdirc.ui.components.StandardDialog;
+import com.dmdirc.Channel;
+import com.dmdirc.identities.Identity;
+import com.dmdirc.identities.IdentityManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ChannelListModeItem;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.components.ParamModePanel;
+import com.dmdirc.ui.components.StandardDialog;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Allows the user to modify channel settings (modes, topics, etc).

src/com/dmdirc/ui/dialogs/channelsetting/ChannelSettingsPane.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.dialogs.channelsetting;
+package com.dmdirc.ui.dialogs.channelsetting;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -46,13 +46,13 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SpringLayout;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.identities.Identity;
-import uk.org.ownage.dmdirc.ui.components.ColourChooser;
+import com.dmdirc.Config;
+import com.dmdirc.identities.Identity;
+import com.dmdirc.ui.components.ColourChooser;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.LARGE_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
-import static uk.org.ownage.dmdirc.ui.UIUtilities.layoutGrid;
+import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.layoutGrid;
 
 /**
  * Channel settings panel.

src/com/dmdirc/ui/framemanager/DummyFrameManager.java

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.framemanager;
+package com.dmdirc.ui.framemanager;
 
 import java.awt.Color;
 
 import javax.swing.JComponent;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Raw;
-import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.ui.MainFrame;
+import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Query;
+import com.dmdirc.Raw;
+import com.dmdirc.Server;
+import com.dmdirc.ui.MainFrame;
 
 /**
  * A dummy frame manager. Does nothing.

src/com/dmdirc/ui/framemanager/FrameManager.java

@@ -20,17 +20,17 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.framemanager;
+package com.dmdirc.ui.framemanager;
 
 import java.awt.Color;
 
 import javax.swing.JComponent;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Raw;
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Query;
+import com.dmdirc.Raw;
+import com.dmdirc.Server;
 
 /**
  * A frame manager is a widget that allows the user to navigate between the

src/com/dmdirc/ui/framemanager/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Frame manager interface and dummy manager.
  */
-package uk.org.ownage.dmdirc.ui.framemanager;
+package com.dmdirc.ui.framemanager;

src/com/dmdirc/ui/framemanager/tree/TreeFrameManager.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.framemanager.tree;
+package com.dmdirc.ui.framemanager.tree;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -55,17 +55,17 @@ import javax.swing.tree.ExpandVetoException;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Raw;
-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.ui.framemanager.FrameManager;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Query;
+import com.dmdirc.Raw;
+import com.dmdirc.Server;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.framemanager.FrameManager;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Manages open windows in the application in a tree style view.

src/com/dmdirc/ui/framemanager/tree/TreeViewModel.java

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.framemanager.tree;
+package com.dmdirc.ui.framemanager.tree;
 
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 
-import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.Query;
-import uk.org.ownage.dmdirc.Raw;
-import uk.org.ownage.dmdirc.Server;
+import com.dmdirc.Channel;
+import com.dmdirc.Config;
+import com.dmdirc.Query;
+import com.dmdirc.Raw;
+import com.dmdirc.Server;
 
 /**
  * A simple sorted tree data model based on DefaultTreeModel.

src/com/dmdirc/ui/framemanager/tree/TreeViewTreeCellRenderer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.framemanager.tree;
+package com.dmdirc.ui.framemanager.tree;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -33,12 +33,12 @@ import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.FrameContainer;
-import uk.org.ownage.dmdirc.ui.MainFrame;
-import uk.org.ownage.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.Config;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.messages.ColourManager;
 
-import static uk.org.ownage.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 /**
  * Displays a node in a tree according to its type.

src/com/dmdirc/ui/framemanager/tree/package-info.java

@@ -24,4 +24,4 @@
  * Treeview frame mananger.  Provides a visual interface to manage irc windows
  * in a tree format.
  */
-package uk.org.ownage.dmdirc.ui.framemanager.tree;
+package com.dmdirc.ui.framemanager.tree;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.input;
+package com.dmdirc.ui.input;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -29,11 +29,11 @@ import java.awt.event.KeyListener;
 
 import javax.swing.JTextField;
 
-import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.commandparser.CommandParser;
-import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.ui.components.ColourPickerDialog;
-import uk.org.ownage.dmdirc.ui.messages.Styliser;
+import com.dmdirc.Config;
+import com.dmdirc.commandparser.CommandParser;
+import com.dmdirc.commandparser.CommandWindow;
+import com.dmdirc.ui.components.ColourPickerDialog;
+import com.dmdirc.ui.messages.Styliser;
 
 /**
  * Handles events generated by a user typing into a textfield. Allows the user

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.input;
+package com.dmdirc.ui.input;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import uk.org.ownage.dmdirc.Config;
+import com.dmdirc.Config;
 
 /**
  * The tab completer handles a user's request to tab complete some word.

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

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.input;
+package com.dmdirc.ui.input;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import uk.org.ownage.dmdirc.Config;
+import com.dmdirc.Config;
 
 /**
  * Represents the result set from a tab completion operation.

src/com/dmdirc/ui/input/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Input related UI classes.
  */
-package uk.org.ownage.dmdirc.ui.input;
+package com.dmdirc.ui.input;

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.interfaces;
+package com.dmdirc.ui.interfaces;
 
 /**
  * Methods required to be implemented by classes wanting to respond to statusbar

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

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.interfaces;
+package com.dmdirc.ui.interfaces;
 
 import java.awt.event.MouseEvent;
 

src/com/dmdirc/ui/interfaces/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Interfaces associated with UI components.
  */
-package uk.org.ownage.dmdirc.ui.interfaces;
+package com.dmdirc.ui.interfaces;

src/com/dmdirc/ui/messages/ColourManager.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.messages;
+package com.dmdirc.ui.messages;
 
 import java.awt.Color;
 
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The colour manager manages the colour scheme for the IRC client. It allows

src/com/dmdirc/ui/messages/Formatter.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.messages;
+package com.dmdirc.ui.messages;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,9 +32,9 @@ import java.util.InvalidPropertiesFormatException;
 import java.util.Properties;
 import java.util.Set;
 
-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 Formatter provides a standard way to format messages for display.

src/com/dmdirc/ui/messages/Styliser.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.messages;
+package com.dmdirc.ui.messages;
 
 import java.util.Locale;
 
@@ -29,8 +29,8 @@ import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
 
-import uk.org.ownage.dmdirc.logger.ErrorLevel;
-import uk.org.ownage.dmdirc.logger.Logger;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 
 /**
  * The styliser applies IRC styles to text. Styles are indicated by various

src/com/dmdirc/ui/messages/package-info.java

@@ -23,4 +23,4 @@
 /**
  * Utility classes associated with irc messages.
  */
-package uk.org.ownage.dmdirc.ui.messages;
+package com.dmdirc.ui.messages;

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

@@ -23,4 +23,4 @@
 /**
  * UI classes.
  */
-package uk.org.ownage.dmdirc.ui;
+package com.dmdirc.ui;

src/com/dmdirc/ui/textpane/IRCDocument.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.textpane;
+package com.dmdirc.ui.textpane;
 
 import java.text.AttributedString;
 import java.util.ArrayList;

src/com/dmdirc/ui/textpane/TextPane.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.textpane;
+package com.dmdirc.ui.textpane;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/com/dmdirc/ui/textpane/TextPaneCanvas.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc.ui.textpane;
+package com.dmdirc.ui.textpane;
 
 import java.awt.Canvas;
 import java.awt.Color;