Repackaged: Parser

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

src/com/dmdirc/parser/ChannelClientInfo.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/parser/ChannelInfo.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.ArrayList;
 import java.util.Enumeration;

src/com/dmdirc/parser/ChannelListModeItem.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 /**
  * Contains Channel List Mode information.

src/com/dmdirc/parser/ClientInfo.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/parser/IRCParser.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -44,15 +44,15 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackManager;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnConnectError;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnDataIn;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnDataOut;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnDebugInfo;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnErrorInfo;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnSocketClosed;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPingFailed;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPingSuccess;
+import com.dmdirc.parser.callbacks.CallbackManager;
+import com.dmdirc.parser.callbacks.CallbackOnConnectError;
+import com.dmdirc.parser.callbacks.CallbackOnDataIn;
+import com.dmdirc.parser.callbacks.CallbackOnDataOut;
+import com.dmdirc.parser.callbacks.CallbackOnDebugInfo;
+import com.dmdirc.parser.callbacks.CallbackOnErrorInfo;
+import com.dmdirc.parser.callbacks.CallbackOnSocketClosed;
+import com.dmdirc.parser.callbacks.CallbackOnPingFailed;
+import com.dmdirc.parser.callbacks.CallbackOnPingSuccess;
 
 /**
  * IRC Parser.
@@ -327,7 +327,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the DataIn Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataIn
+	 * @see com.dmdirc.parser.callbacks.interfaces.IDataIn
 	 * @param data Incomming Line.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -343,7 +343,7 @@ public final class IRCParser implements Runnable {
 	 * @param data Outgoing Data
 	 * @param fromParser True if parser sent the data, false if sent using .sendLine
 	 * @return true if a method was called, false otherwise
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataOut
+	 * @see com.dmdirc.parser.callbacks.interfaces.IDataOut
 	 */
 	protected boolean callDataOut(final String data, final boolean fromParser) {
 		final CallbackOnDataOut cb = (CallbackOnDataOut) myCallbackManager.getCallbackType("OnDataOut");
@@ -354,7 +354,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, DEBUG_SOCKET etc)
 	 * @param data Debugging Information as a format string
 	 * @param args Formatting String Options
@@ -366,7 +366,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, DEBUG_SOCKET etc)
 	 * @param data Debugging Information
 	 * @return true if a method was called, false otherwise
@@ -380,7 +380,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the IErrorInfo Interface.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IErrorInfo
+	 * @see com.dmdirc.parser.callbacks.interfaces.IErrorInfo
 	 * @param errorInfo ParserError object representing the error.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -393,7 +393,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the IConnectError Interface.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IConnectError
+	 * @see com.dmdirc.parser.callbacks.interfaces.IConnectError
 	 * @param errorInfo ParserError object representing the error.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -406,7 +406,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the SocketClosed Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.ISocketClosed
+	 * @see com.dmdirc.parser.callbacks.interfaces.ISocketClosed
 	 * @return true if a method was called, false otherwise
 	 */	
 	protected boolean callSocketClosed() {
@@ -418,7 +418,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the PingFailed Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPingFailed
+	 * @see com.dmdirc.parser.callbacks.interfaces.IPingFailed
 	 * @return true if a method was called, false otherwise
 	 */	
 	protected boolean callPingFailed() {
@@ -430,7 +430,7 @@ public final class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the PingSuccess Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPingSuccess
+	 * @see com.dmdirc.parser.callbacks.interfaces.IPingSuccess
 	 * @return true if a method was called, false otherwise
 	 */	
 	protected boolean callPingSuccess() {

src/com/dmdirc/parser/IRCProcessor.java

@@ -22,9 +22,9 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackManager;
+import com.dmdirc.parser.callbacks.CallbackManager;
 
 /**
  * IRCProcessor.
@@ -56,7 +56,7 @@ public abstract class IRCProcessor {
 	/**
 	 * Callback to all objects implementing the IErrorInfo Interface.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IErrorInfo
+	 * @see com.dmdirc.parser.callbacks.interfaces.IErrorInfo
 	 * @param errorInfo ParserError object representing the error.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -67,7 +67,7 @@ public abstract class IRCProcessor {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
 	 * @param data Debugging Information
 	 * @param args Formatting String Options
@@ -80,7 +80,7 @@ public abstract class IRCProcessor {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
 	 * @param data Debugging Information
 	 * @return true if a method was called, false otherwise

src/com/dmdirc/parser/MyInfo.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 /**
  * Contains User information.

src/com/dmdirc/parser/ParserError.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 /**
  * IRC Parser Error.

src/com/dmdirc/parser/PingTimer.java

@@ -22,7 +22,7 @@
  * SVN: $Id: IRCParser.java 741 2007-04-01 15:02:16Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.TimerTask;
 

src/com/dmdirc/parser/Process001.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnServerReady;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IServerReady;
+import com.dmdirc.parser.callbacks.CallbackOnServerReady;
+import com.dmdirc.parser.callbacks.interfaces.IServerReady;
 
 /**
  * Process a 001 message.

src/com/dmdirc/parser/Process004005.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnGotNetwork;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IGotNetwork;
+import com.dmdirc.parser.callbacks.CallbackOnGotNetwork;
+import com.dmdirc.parser.callbacks.interfaces.IGotNetwork;
 
 /**
  * Process ISUPPORT lines.

src/com/dmdirc/parser/Process464.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPasswordRequired;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPasswordRequired;
+import com.dmdirc.parser.callbacks.CallbackOnPasswordRequired;
+import com.dmdirc.parser.callbacks.interfaces.IPasswordRequired;
 
 /**
  * Process a 464 message.

src/com/dmdirc/parser/ProcessAway.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnAwayState;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayState;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.callbacks.CallbackOnAwayState;
+import com.dmdirc.parser.callbacks.interfaces.IAwayState;
 
 /**
  * Process an Away/Back message.

src/com/dmdirc/parser/ProcessJoin.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelJoin;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelSelfJoin;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelJoin;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
+import com.dmdirc.parser.callbacks.CallbackOnChannelJoin;
+import com.dmdirc.parser.callbacks.CallbackOnChannelSelfJoin;
+import com.dmdirc.parser.callbacks.interfaces.IChannelJoin;
+import com.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
 import java.util.Enumeration;
 
 /**

src/com/dmdirc/parser/ProcessKick.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelKick;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelKick;
+import com.dmdirc.parser.callbacks.CallbackOnChannelKick;
+import com.dmdirc.parser.callbacks.interfaces.IChannelKick;
 
 /**
  * Process a channel kick.

src/com/dmdirc/parser/ProcessListModes.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-// import uk.org.ownage.dmdirc.parser.callbacks.;
-// import uk.org.ownage.dmdirc.parser.callbacks.interfaces.;
+// import com.dmdirc.parser.callbacks.;
+// import com.dmdirc.parser.callbacks.interfaces.;
 
 /**
  * Process a List Modes.

src/com/dmdirc/parser/ProcessMOTD.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnMOTDEnd;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnMOTDLine;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnMOTDStart;
-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 com.dmdirc.parser.callbacks.CallbackOnMOTDEnd;
+import com.dmdirc.parser.callbacks.CallbackOnMOTDLine;
+import com.dmdirc.parser.callbacks.CallbackOnMOTDStart;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDEnd;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDLine;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDStart;
 
 /**
  * Process a MOTD Related Line

src/com/dmdirc/parser/ProcessMessage.java

@@ -22,38 +22,38 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelAction;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelCTCP;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelCTCPReply;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelNotice;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPrivateAction;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPrivateCTCP;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPrivateCTCPReply;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPrivateMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnPrivateNotice;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnUnknownAction;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnUnknownCTCP;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnUnknownCTCPReply;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnUnknownMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnUnknownNotice;
-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.IChannelCTCPReply;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNotice;
-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.IUnknownAction;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownCTCP;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownCTCPReply;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownMessage;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownNotice;
+import com.dmdirc.parser.callbacks.CallbackOnChannelAction;
+import com.dmdirc.parser.callbacks.CallbackOnChannelCTCP;
+import com.dmdirc.parser.callbacks.CallbackOnChannelCTCPReply;
+import com.dmdirc.parser.callbacks.CallbackOnChannelMessage;
+import com.dmdirc.parser.callbacks.CallbackOnChannelNotice;
+import com.dmdirc.parser.callbacks.CallbackOnPrivateAction;
+import com.dmdirc.parser.callbacks.CallbackOnPrivateCTCP;
+import com.dmdirc.parser.callbacks.CallbackOnPrivateCTCPReply;
+import com.dmdirc.parser.callbacks.CallbackOnPrivateMessage;
+import com.dmdirc.parser.callbacks.CallbackOnPrivateNotice;
+import com.dmdirc.parser.callbacks.CallbackOnUnknownAction;
+import com.dmdirc.parser.callbacks.CallbackOnUnknownCTCP;
+import com.dmdirc.parser.callbacks.CallbackOnUnknownCTCPReply;
+import com.dmdirc.parser.callbacks.CallbackOnUnknownMessage;
+import com.dmdirc.parser.callbacks.CallbackOnUnknownNotice;
+import com.dmdirc.parser.callbacks.interfaces.IChannelAction;
+import com.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
+import com.dmdirc.parser.callbacks.interfaces.IChannelCTCPReply;
+import com.dmdirc.parser.callbacks.interfaces.IChannelMessage;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNotice;
+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.IUnknownAction;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownCTCP;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownCTCPReply;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownMessage;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownNotice;
 
 
 /**

src/com/dmdirc/parser/ProcessMode.java

@@ -22,19 +22,19 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.Calendar;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelSingleModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelNonUserModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelUserModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnUserModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelSingleModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNonUserModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUserModeChanged;
+import com.dmdirc.parser.callbacks.CallbackOnChannelSingleModeChanged;
+import com.dmdirc.parser.callbacks.CallbackOnChannelNonUserModeChanged;
+import com.dmdirc.parser.callbacks.CallbackOnChannelModeChanged;
+import com.dmdirc.parser.callbacks.CallbackOnChannelUserModeChanged;
+import com.dmdirc.parser.callbacks.CallbackOnUserModeChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelSingleModeChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNonUserModeChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
+import com.dmdirc.parser.callbacks.interfaces.IUserModeChanged;
 
 /**
  * Process a Mode line.

src/com/dmdirc/parser/ProcessNames.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelGotNames;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
+import com.dmdirc.parser.callbacks.CallbackOnChannelGotNames;
+import com.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
 
 /**
  * Process a Names reply.

src/com/dmdirc/parser/ProcessNick.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelNickChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnNickChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickChanged;
+import com.dmdirc.parser.callbacks.CallbackOnChannelNickChanged;
+import com.dmdirc.parser.callbacks.CallbackOnNickChanged;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
+import com.dmdirc.parser.callbacks.interfaces.INickChanged;
 import java.util.Enumeration;
 
 /**

src/com/dmdirc/parser/ProcessNickInUse.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnNickInUse;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickInUse;
+import com.dmdirc.parser.callbacks.CallbackOnNickInUse;
+import com.dmdirc.parser.callbacks.interfaces.INickInUse;
 
 /**
  * Process a NickInUse message.

src/com/dmdirc/parser/ProcessNoticeAuth.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnNoticeAuth;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INoticeAuth;
+import com.dmdirc.parser.callbacks.CallbackOnNoticeAuth;
+import com.dmdirc.parser.callbacks.interfaces.INoticeAuth;
 
 /**
  * Process a NoticeAuth message.

src/com/dmdirc/parser/ProcessPart.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelPart;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelPart;
+import com.dmdirc.parser.callbacks.CallbackOnChannelPart;
+import com.dmdirc.parser.callbacks.interfaces.IChannelPart;
 
 /**
  * Process a channel part.

src/com/dmdirc/parser/ProcessQuit.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelQuit;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnQuit;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelQuit;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IQuit;
+import com.dmdirc.parser.callbacks.CallbackOnChannelQuit;
+import com.dmdirc.parser.callbacks.CallbackOnQuit;
+import com.dmdirc.parser.callbacks.interfaces.IChannelQuit;
+import com.dmdirc.parser.callbacks.interfaces.IQuit;
 import java.util.Enumeration;
 
 /**

src/com/dmdirc/parser/ProcessTopic.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelTopic;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelTopic;
+import com.dmdirc.parser.callbacks.CallbackOnChannelTopic;
+import com.dmdirc.parser.callbacks.interfaces.IChannelTopic;
 
 /**
  * Process a topic change.

src/com/dmdirc/parser/ProcessWho.java

@@ -22,17 +22,17 @@
  * SVN: $Id: ProcessWho.java 1015 2007-05-02 15:21:37Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.Enumeration;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnAwayStateOther;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnChannelAwayStateOther;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelAwayStateOther;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.callbacks.CallbackOnAwayStateOther;
+import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
+import com.dmdirc.parser.callbacks.CallbackOnChannelAwayStateOther;
+import com.dmdirc.parser.callbacks.interfaces.IChannelAwayStateOther;
 
 /**
  * Process a /who reply

src/com/dmdirc/parser/ProcessingManager.java

@@ -22,9 +22,9 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INumeric;
-import uk.org.ownage.dmdirc.parser.callbacks.CallbackOnNumeric;
+package com.dmdirc.parser;
+import com.dmdirc.parser.callbacks.interfaces.INumeric;
+import com.dmdirc.parser.callbacks.CallbackOnNumeric;
 import java.util.Hashtable;
 import java.util.Enumeration;
 

src/com/dmdirc/parser/ProcessorNotFound.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 /**
  * IRC Parser Processor Not Found Exception.

src/com/dmdirc/parser/RegexStringList.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 import java.util.ArrayList;
 

src/com/dmdirc/parser/ServerInfo.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser;
+package com.dmdirc.parser;
 
 /**
  * Contains Server information.

src/com/dmdirc/parser/callbacks/CallbackManager.java

@@ -22,13 +22,13 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
 
 /**
  * IRC Parser Callback Manager.
@@ -182,7 +182,7 @@ public final class CallbackManager {
 	 *
 	 * @param callbackName Name of callback object.
 	 * @param o instance of ICallbackInterface to add.
-	 * @throws uk.org.ownage.dmdirc.parser.callbacks.CallbackNotFound If callback is not found.
+	 * @throws com.dmdirc.parser.callbacks.CallbackNotFound If callback is not found.
 	 */
 	public void addCallback(final String callbackName, final ICallbackInterface o) throws CallbackNotFound {
 		final CallbackObject cb = getCallbackType(callbackName);

src/com/dmdirc/parser/callbacks/CallbackNotFound.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
 /**
  * IRC Parser Callback Exception.

src/com/dmdirc/parser/callbacks/CallbackObject.java

@@ -22,13 +22,13 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
 import java.util.ArrayList;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
 
 /**
  * CallbackObject.

src/com/dmdirc/parser/callbacks/CallbackObjectSpecific.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
 import java.util.Hashtable;
 
-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.interfaces.ICallbackInterface;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
 
 /**
  * CallbackObjectSpecific.

src/com/dmdirc/parser/callbacks/CallbackOnAwayState.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayState;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IAwayState;
 
 /**
  * Callback to all objects implementing the IAwayState Interface.

src/com/dmdirc/parser/callbacks/CallbackOnAwayStateOther.java

@@ -22,12 +22,12 @@
  * SVN: $Id: CallbackOnAwayStateOther.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
 
 /**
  * Callback to all objects implementing the IAwayStateOther Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelAction.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelAction;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelAction;
 
 /**
  * Callback to all objects implementing the IChannelAction Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelAwayStateOther.java

@@ -22,13 +22,13 @@
  * SVN: $Id: CallbackOnChannelAwayStateOther.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelAwayStateOther;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelAwayStateOther;
 
 /**
  * Callback to all objects implementing the IChannelAwayStateOther Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelCTCP.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
 
 /**
  * Callback to all objects implementing the IChannelCTCP Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelCTCPReply.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelCTCPReply;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelCTCPReply;
 
 /**
  * Callback to all objects implementing the IChannelCTCPReply Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelGotNames.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
 
 /**
  * Callback to all objects implementing the IChannelGotNames Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelJoin.java

@@ -22,13 +22,13 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelJoin;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelJoin;
 
 /**
  * Callback to all objects implementing the IChannelJoin Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelKick.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-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.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelKick;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelKick;
 
 /**
  * Callback to all objects implementing the IChannelKick Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelMessage.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelMessage;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelMessage;
 
 /**
  * Callback to all objects implementing the IChannelMessage Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelModeChanged.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelNickChanged.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
 
 /**
  * Callback to all objects implementing the IChannelNickChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelNonUserModeChanged.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNonUserModeChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNonUserModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelNonUserModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelNotice.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelNotice;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelNotice;
 
 /**
  * Callback to all objects implementing the IChannelNotice Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelPart.java

@@ -22,13 +22,13 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelPart;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelPart;
 
 /**
  * Callback to all objects implementing the IChannelPart Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelQuit.java

@@ -22,13 +22,13 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelQuit;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelQuit;
 
 /**
  * Callback to all objects implementing the IChannelQuit Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelSelfJoin.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
 
 /**
  * Callback to all objects implementing the IChannelSelfJoin Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelSingleModeChanged.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelSingleModeChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelSingleModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelSingleModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelTopic.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelTopic;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelTopic;
 
 /**
  * Callback to all objects implementing the IChannelTopic Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelUserModeChanged.java

@@ -22,14 +22,14 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelUserModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnConnectError.java

@@ -22,11 +22,11 @@
  * SVN: $Id: CallbackOnConnectError.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IConnectError;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IConnectError;
 
 /**
  * Callback to all objects implementing the IConnectError Interface.

src/com/dmdirc/parser/callbacks/CallbackOnDataIn.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataIn;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IDataIn;
 
 /**
  * Callback to all objects implementing the IDataIn Interface.

src/com/dmdirc/parser/callbacks/CallbackOnDataOut.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDataOut;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IDataOut;
 
 /**
  * Callback to all objects implementing the IDataOut Interface.

src/com/dmdirc/parser/callbacks/CallbackOnDebugInfo.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IDebugInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IDebugInfo;
 
 /**
  * Callback to all objects implementing the IDebugInfo Interface.

src/com/dmdirc/parser/callbacks/CallbackOnErrorInfo.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IErrorInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IErrorInfo;
 
 /**
  * Callback to all objects implementing the IErrorInfo Interface.

src/com/dmdirc/parser/callbacks/CallbackOnGotNetwork.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IGotNetwork;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IGotNetwork;
 
 /**
  * Callback to all objects implementing the IGotNetwork Interface.

src/com/dmdirc/parser/callbacks/CallbackOnMOTDEnd.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IMOTDEnd;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDEnd;
 
 /**
  * Callback to all objects implementing the IMotdEnd Interface.

src/com/dmdirc/parser/callbacks/CallbackOnMOTDLine.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IMOTDLine;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDLine;
 
 /**
  * Callback to all objects implementing the IMOTDLine Interface.

src/com/dmdirc/parser/callbacks/CallbackOnMOTDStart.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IMOTDStart;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IMOTDStart;
 
 /**
  * Callback to all objects implementing the IMOTDStart Interface.

src/com/dmdirc/parser/callbacks/CallbackOnNickChanged.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.INickChanged;
 
 /**
  * Callback to all objects implementing the INickChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnNickInUse.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INickInUse;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.INickInUse;
 
 /**
  * Callback to all objects implementing the INickInUse Interface.

src/com/dmdirc/parser/callbacks/CallbackOnNoticeAuth.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INoticeAuth;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.INoticeAuth;
 
 /**
  * Callback to all objects implementing the INoticeAuth Interface.

src/com/dmdirc/parser/callbacks/CallbackOnNumeric.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.INumeric;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.INumeric;
 
 /**
  * Callback to all objects implementing the INumeric Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPasswordRequired.java

@@ -22,11 +22,11 @@
  * SVN: $Id: CallbackOnPasswordRequired.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPasswordRequired;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPasswordRequired;
 
 /**
  * Callback to all objects implementing the IPasswordRequired Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPingFailed.java

@@ -22,11 +22,11 @@
  * SVN: $Id: CallbackOnPingFailed.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPingFailed;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPingFailed;
 
 /**
  * Callback to all objects implementing the IPingFailed Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPingSuccess.java

@@ -22,11 +22,11 @@
  * SVN: $Id: CallbackOnPingSuccess.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPingSuccess;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPingSuccess;
 
 /**
  * Callback to all objects implementing the IPingSuccess Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPrivateAction.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateAction;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
 
 /**
  * Callback to all objects implementing the IPrivateAction Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPrivateCTCP.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateCTCP;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateCTCP;
 
 /**
  * Callback to all objects implementing the IPrivateCTCP Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPrivateCTCPReply.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateCTCPReply;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateCTCPReply;
 
 /**
  * Callback to all objects implementing the IPrivateCTCPReply Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPrivateMessage.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
 
 /**
  * Callback to all objects implementing the IPrivateMessage Interface.

src/com/dmdirc/parser/callbacks/CallbackOnPrivateNotice.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IPrivateNotice;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IPrivateNotice;
 
 /**
  * Callback to all objects implementing the IPrivateNotice Interface.

src/com/dmdirc/parser/callbacks/CallbackOnQuit.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IQuit;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IQuit;
 
 /**
  * Callback to all objects implementing the IQuit Interface.

src/com/dmdirc/parser/callbacks/CallbackOnServerReady.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IServerReady;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IServerReady;
 
 /**
  * Callback to all objects implementing the IServerReady Interface.

src/com/dmdirc/parser/callbacks/CallbackOnSocketClosed.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.ISocketClosed;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.ISocketClosed;
 
 /**
  * Callback to all objects implementing the ISocketClosed Interface.

src/com/dmdirc/parser/callbacks/CallbackOnUnknownAction.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownAction;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownAction;
 
 /**
  * Callback to all objects implementing the IUnknownAction Interface.

src/com/dmdirc/parser/callbacks/CallbackOnUnknownCTCP.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownCTCP;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownCTCP;
 
 /**
  * Callback to all objects implementing the IUnknownCTCP Interface.

src/com/dmdirc/parser/callbacks/CallbackOnUnknownCTCPReply.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownCTCPReply;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownCTCPReply;
 
 /**
  * Callback to all objects implementing the IUnknownCTCPReply Interface.

src/com/dmdirc/parser/callbacks/CallbackOnUnknownMessage.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownMessage;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IUnknownMessage;
 
 /**
  * Callback to all objects implementing the IUnknownMessage Interface.

src/com/dmdirc/parser/callbacks/CallbackOnUnknownNotice.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import  uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUnknownNotice;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import  com.dmdirc.parser.callbacks.interfaces.IUnknownNotice;
 
 /**
  * Callback to all objects implementing the IUnknownNotice Interface.

src/com/dmdirc/parser/callbacks/CallbackOnUserModeChanged.java

@@ -22,12 +22,12 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks;
+package com.dmdirc.parser.callbacks;
 
-import uk.org.ownage.dmdirc.parser.ClientInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ParserError;
-import uk.org.ownage.dmdirc.parser.callbacks.interfaces.IUserModeChanged;
+import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ParserError;
+import com.dmdirc.parser.callbacks.interfaces.IUserModeChanged;
 
 /**
  * Callback to all objects implementing the IUserModeChanged Interface.

src/com/dmdirc/parser/callbacks/interfaces/IAwayState.java

@@ -22,9 +22,9 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when we go away, or come back.
@@ -36,7 +36,7 @@ public interface IAwayState extends ICallbackInterface {
 	 * @param tParser Reference to the parser object that made the callback.
 	 * @param currentState Set to true if we are now away, else false.
 	 * @param reason Best guess at away reason
-	 * @see uk.org.ownage.dmdirc.parser.ProcessAway#callAwayState
+	 * @see com.dmdirc.parser.ProcessAway#callAwayState
 	 */
 	void onAwayState(IRCParser tParser, boolean currentState, String reason);
 }

src/com/dmdirc/parser/callbacks/interfaces/IAwayStateOther.java

@@ -22,10 +22,10 @@
  * SVN: $Id: IAwayStateOther.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ClientInfo;
 
 /**
  * Called when we go away, or come back.
@@ -37,7 +37,7 @@ public interface IAwayStateOther extends ICallbackInterface {
 	 * @param tParser Reference to the parser object that made the callback.
 	 * @param client Client this is for
 	 * @param state Away State (true if away, false if here)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessAway#callAwayStateOther
+	 * @see com.dmdirc.parser.ProcessAway#callAwayStateOther
 	 */
 	void onAwayStateOther(IRCParser tParser, ClientInfo client, boolean state);
 }

src/com/dmdirc/parser/callbacks/interfaces/ICallbackInterface.java

@@ -22,7 +22,7 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
 /**
  * "SuperInterface" for all callbacks.

src/com/dmdirc/parser/callbacks/interfaces/IChannelAction.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when a person does an action in a channel.
@@ -44,7 +44,7 @@ public interface IChannelAction extends ICallbackInterface {
 	 * @param cChannelClient ChannelClient who sent the action (may be null if server)
 	 * @param sMessage action contents
 	 * @param sHost Hostname of sender (or servername)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessMessage#callChannelAction
+	 * @see com.dmdirc.parser.ProcessMessage#callChannelAction
 	 */
 	void onChannelAction(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sMessage, String sHost);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelAwayStateOther.java

@@ -22,11 +22,11 @@
  * SVN: $Id: IChannelAwayStateOther.java 719 2007-03-28 13:20:56Z ShaneMcC $
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.IRCParser;
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
 
 /**
  * Called when we go away, or come back.
@@ -39,7 +39,7 @@ public interface IChannelAwayStateOther extends ICallbackInterface {
 	 * @param channel Channel this is for
 	 * @param channelclient Client this is for
 	 * @param state Away State (true if away, false if here)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessAway#callChannelAwayStateOther
+	 * @see com.dmdirc.parser.ProcessAway#callChannelAwayStateOther
 	 */
 	void onChannelAwayStateOther(IRCParser tParser, ChannelInfo channel, ChannelClientInfo channelClient, boolean state);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelCTCP.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when a person sends a CTCP to a channel.
@@ -45,7 +45,7 @@ public interface IChannelCTCP extends ICallbackInterface {
 	 * @param sType Type of CTCP (VERSION, TIME etc)
 	 * @param sMessage Additional contents
 	 * @param sHost Hostname of sender (or servername)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessMessage#callChannelCTCP
+	 * @see com.dmdirc.parser.ProcessMessage#callChannelCTCP
 	 */
 	void onChannelCTCP(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sType, String sMessage, String sHost);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelCTCPReply.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when a person sends a CTCPRReply to a channel.
@@ -45,7 +45,7 @@ public interface IChannelCTCPReply extends ICallbackInterface {
 	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
 	 * @param sMessage Reply Contents
 	 * @param sHost Hostname of sender (or servername)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessMessage#callChannelCTCPReply
+	 * @see com.dmdirc.parser.ProcessMessage#callChannelCTCPReply
 	 */
 	void onChannelCTCPReply(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sType, String sMessage, String sHost);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelGotNames.java

@@ -22,10 +22,10 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when a names reply is parsed.
@@ -36,7 +36,7 @@ public interface IChannelGotNames extends ICallbackInterface {
 	 *
 	 * @param tParser Reference to the parser object that made the callback.
 	 * @param cChannel Channel which the names reply is for
-	 * @see uk.org.ownage.dmdirc.parser.ProcessNames#callChannelGotNames
+	 * @see com.dmdirc.parser.ProcessNames#callChannelGotNames
 	 */
 	void onChannelGotNames(IRCParser tParser, ChannelInfo cChannel);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelJoin.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /** 
  * Called When we, or another client joins a channel.
@@ -40,7 +40,7 @@ public interface IChannelJoin extends ICallbackInterface {
 	 * @param tParser Reference to the parser object that made the callback.
 	 * @param cChannel Channel Object
 	 * @param cChannelClient ChannelClient object for new person
-	 * @see uk.org.ownage.dmdirc.parser.ProcessJoin#callChannelJoin
+	 * @see com.dmdirc.parser.ProcessJoin#callChannelJoin
 	 */
 	void onChannelJoin(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelKick.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when a person is kicked.
@@ -43,7 +43,7 @@ public interface IChannelKick extends ICallbackInterface {
 	 * @param cKickedByClient ChannelClient that did the kicking (may be null if server)
 	 * @param sReason Reason for kick (may be "")
 	 * @param sKickedByHost Hostname of Kicker (or servername)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessKick#callChannelKick
+	 * @see com.dmdirc.parser.ProcessKick#callChannelKick
 	 */
 	void onChannelKick(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cKickedClient, ChannelClientInfo cKickedByClient, String sReason, String sKickedByHost);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelMessage.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /**
  * Called when a person sends a message to a channel.
@@ -44,7 +44,7 @@ public interface IChannelMessage extends ICallbackInterface {
 	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
 	 * @param sMessage Message contents
 	 * @param sHost Hostname of sender (or servername)
-	 * @see uk.org.ownage.dmdirc.parser.ProcessMessage#callChannelMessage
+	 * @see com.dmdirc.parser.ProcessMessage#callChannelMessage
 	 */
 	void onChannelMessage(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sMessage, String sHost);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelModeChanged.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /** 
  * Called when the channel modes are changed or discovered.
@@ -44,7 +44,7 @@ public interface IChannelModeChanged extends ICallbackInterface {
 	 * @param cChannelClient Client chaning the modes (null if server)
 	 * @param sHost Host doing the mode changing (User host or server name)
 	 * @param sModes String showing the exact mode change parsed.
-	 * @see uk.org.ownage.dmdirc.parser.ProcessMode#callChannelModeChanged
+	 * @see com.dmdirc.parser.ProcessMode#callChannelModeChanged
 	 */
 	void onChannelModeChanged(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelNickChanged.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /** 
  * Called when we or another user change nickname (Called once per channel the user is on).
@@ -41,7 +41,7 @@ public interface IChannelNickChanged extends ICallbackInterface {
 	 * @param cChannel One of the channels that the user is on
 	 * @param cChannelClient Client changing nickname
 	 * @param sOldNick Nickname before change
-	 * @see uk.org.ownage.dmdirc.parser.ProcessNick#callChannelNickChanged
+	 * @see com.dmdirc.parser.ProcessNick#callChannelNickChanged
 	 */
 	 void onChannelNickChanged(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
 }

src/com/dmdirc/parser/callbacks/interfaces/IChannelNonUserModeChanged.java

@@ -22,11 +22,11 @@
  * SVN: $Id$
  */
 
-package uk.org.ownage.dmdirc.parser.callbacks.interfaces;
+package com.dmdirc.parser.callbacks.interfaces;
 
-import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
-import uk.org.ownage.dmdirc.parser.ChannelInfo;
-import uk.org.ownage.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.IRCParser;
 
 /** 
  * Called when the channel modes are changed or discovered.