Move processors into their own package.

Make all package-private fields and methods they hackily touched
into public, for now.

Change-Id: Ica056a901535b0c0f503283d27ff5210fe625d26
Reviewed-on: http://gerrit.dmdirc.com/3952
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessNoticeAuth;
 
 import java.util.Date;
 
@@ -37,7 +38,7 @@ public interface AuthNoticeListener extends CallbackInterface {
      * @param parser Reference to the parser object that made the callback.
      * @param date The date/time at which the event occured
      * @param data Incomming Line.
-     * @see com.dmdirc.parser.irc.ProcessNoticeAuth#callNoticeAuth
+     * @see ProcessNoticeAuth#callNoticeAuth
      */
     void onNoticeAuth(Parser parser, Date date, String data);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessAway;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@ public interface AwayStateListener extends CallbackInterface {
      * @param oldState Old Away State
      * @param currentState Current Away State
      * @param reason Best guess at away reason
-     * @see com.dmdirc.parser.irc.ProcessAway#callAwayState
+     * @see ProcessAway#callAwayState
      */
     void onAwayState(Parser parser, Date date, AwayState oldState,
             AwayState currentState, String reason);

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -50,7 +51,7 @@ public interface ChannelActionListener extends CallbackInterface {
      * @param client ChannelClient who sent the action (may be null if server)
      * @param message action contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelAction
+     * @see ProcessMessage#callChannelAction
      */
     void onChannelAction(
         @FakableSource Parser parser,

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -51,7 +52,7 @@ public interface ChannelCtcpListener extends CallbackInterface {
      * @param type Type of CTCP (VERSION, TIME etc)
      * @param message Additional contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCP
+     * @see ProcessMessage#callChannelCTCP
      */
     void onChannelCTCP(@FakableSource Parser parser,
             Date date,

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -51,7 +52,7 @@ public interface ChannelCtcpReplyListener extends CallbackInterface {
      * @param type Type of CTCPRReply (VERSION, TIME etc)
      * @param message Reply Contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCPReply
+     * @see ProcessMessage#callChannelCTCPReply
      */
     void onChannelCTCPReply(@FakableSource Parser parser,
             Date date,

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

@@ -26,6 +26,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessJoin;
 
 import java.util.Date;
 
@@ -44,7 +45,7 @@ public interface ChannelJoinListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param channel Channel Object
      * @param client ChannelClient object for new person
-     * @see com.dmdirc.parser.irc.ProcessJoin#callChannelJoin
+     * @see ProcessJoin#callChannelJoin
      */
     void onChannelJoin(Parser parser, Date date, ChannelInfo channel, ChannelClientInfo client);
 

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessKick;
 
 import java.util.Date;
 
@@ -49,7 +50,7 @@ public interface ChannelKickListener extends CallbackInterface {
      * @param client ChannelClient that did the kicking (may be null if server)
      * @param reason Reason for kick (may be "")
      * @param host Hostname of Kicker (or servername)
-     * @see com.dmdirc.parser.irc.ProcessKick#callChannelKick
+     * @see ProcessKick#callChannelKick
      */
     void onChannelKick(@FakableSource Parser parser,
             Date date,

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

@@ -25,6 +25,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessListModes;
 
 import java.util.Date;
 
@@ -43,7 +44,7 @@ public interface ChannelListModeListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param channel Channel which the ListModes reply is for
      * @param mode the Mode the ListMOdes reply is for.
-     * @see com.dmdirc.parser.irc.ProcessListModes#callChannelGotListModes
+     * @see ProcessListModes#callChannelGotListModes
      */
     void onChannelGotListModes(Parser parser, Date date, ChannelInfo channel, char mode);
 

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -50,7 +51,7 @@ public interface ChannelMessageListener extends CallbackInterface {
      * @param client ChannelClient who sent the message (may be null if server)
      * @param message Message contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelMessage
+     * @see ProcessMessage#callChannelMessage
      */
     void onChannelMessage(@FakableSource Parser parser, Date date,
             @FakableSource ChannelInfo channel,

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMode;
 
 import java.util.Date;
 
@@ -50,7 +51,7 @@ public interface ChannelModeChangeListener extends CallbackInterface {
      * @param client Client chaning the modes (null if server)
      * @param host Host doing the mode changing (User host or server name)
      * @param modes String showing the exact mode change parsed.
-     * @see com.dmdirc.parser.irc.ProcessMode#callChannelModeChanged
+     * @see ProcessMode#callChannelModeChanged
      */
     void onChannelModeChanged(@FakableSource Parser parser, Date date,
             @FakableSource ChannelInfo channel,

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -52,7 +53,7 @@ public interface ChannelModeMessageListener extends CallbackInterface {
      * @param client ChannelClient who sent the Message (may be null if server)
      * @param message Message contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeMessage
+     * @see ProcessMessage#callChannelModeMessage
      */
     void onChannelModeMessage(@FakableSource Parser parser,
             Date date, @FakableSource ChannelInfo channel,

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -52,7 +53,7 @@ public interface ChannelModeNoticeListener extends CallbackInterface {
      * @param client ChannelClient who sent the notice (may be null if server)
      * @param message notice contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeNotice
+     * @see ProcessMessage#callChannelModeNotice
      */
     void onChannelModeNotice(@FakableSource Parser parser,
             Date date, @FakableSource ChannelInfo channel,

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

@@ -25,6 +25,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessNames;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@ public interface ChannelNamesListener extends CallbackInterface {
      * @param parser Reference to the parser object that made the callback.
      * @param date The date/time at which the event occured
      * @param channel Channel which the names reply is for
-     * @see com.dmdirc.parser.irc.ProcessNames#callChannelGotNames
+     * @see ProcessNames#callChannelGotNames
      */
     void onChannelGotNames(Parser parser, Date date, ChannelInfo channel);
 

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

@@ -26,6 +26,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessNick;
 
 import java.util.Date;
 
@@ -45,7 +46,7 @@ public interface ChannelNickChangeListener extends CallbackInterface {
      * @param channel One of the channels that the user is on
      * @param client Client changing nickname
      * @param oldNick Nickname before change
-     * @see com.dmdirc.parser.irc.ProcessNick#callChannelNickChanged
+     * @see ProcessNick#callChannelNickChanged
      */
     void onChannelNickChanged(Parser parser, Date date, ChannelInfo channel,
             ChannelClientInfo client, String oldNick);

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -50,7 +51,7 @@ public interface ChannelNoticeListener extends CallbackInterface {
      * @param client ChannelClient who sent the notice (may be null if server)
      * @param message notice contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelNotice
+     * @see ProcessMessage#callChannelNotice
      */
     void onChannelNotice(@FakableSource Parser parser, Date date,
             @FakableSource ChannelInfo channel,

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

@@ -26,6 +26,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessPart;
 
 import java.util.Date;
 
@@ -45,7 +46,7 @@ public interface ChannelPartListener extends CallbackInterface {
      * @param channel Channel that the user parted
      * @param client Client that parted
      * @param reason Reason given for parting (May be "")
-     * @see com.dmdirc.parser.irc.ProcessPart#callChannelPart
+     * @see ProcessPart#callChannelPart
      */
     void onChannelPart(Parser parser, Date date, ChannelInfo channel,
             ChannelClientInfo client, String reason);

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

@@ -26,6 +26,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessQuit;
 
 import java.util.Date;
 
@@ -45,7 +46,7 @@ public interface ChannelQuitListener extends CallbackInterface {
      * @param channel Channel that user was on
      * @param client User thats quitting
      * @param reason Quit reason
-     * @see com.dmdirc.parser.irc.ProcessQuit#callChannelQuit
+     * @see ProcessQuit#callChannelQuit
      */
     void onChannelQuit(Parser parser, Date date, ChannelInfo channel,
             ChannelClientInfo client, String reason);

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessJoin;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@ public interface ChannelSelfJoinListener extends CallbackInterface {
      * @param parser Reference to the parser object that made the callback.
      * @param date The date/time at which the event occured
      * @param channel Channel Object
-     * @see com.dmdirc.parser.irc.ProcessJoin#callChannelSelfJoin
+     * @see ProcessJoin#callChannelSelfJoin
      */
     void onChannelSelfJoin(Parser parser, Date date, ChannelInfo channel);
 

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

@@ -25,6 +25,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessTopic;
 
 import java.util.Date;
 
@@ -42,7 +43,7 @@ public interface ChannelTopicListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param channel Channel that topic was set on
      * @param isJoinTopic True when getting topic on join, false if set by user/server
-     * @see com.dmdirc.parser.irc.ProcessTopic#callChannelTopic
+     * @see ProcessTopic#callChannelTopic
      */
     void onChannelTopic(Parser parser, Date date, ChannelInfo channel, boolean isJoinTopic);
 

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMode;
 
 import java.util.Date;
 
@@ -49,7 +50,7 @@ public interface ChannelUserModeChangeListener extends CallbackInterface {
      * @param client Client chaning the modes (null if server)
      * @param host Host doing the mode changing (User host or server name)
      * @param mode String representing mode change (ie +o)
-     * @see com.dmdirc.parser.irc.ProcessMode#callChannelUserModeChanged
+     * @see ProcessMode#callChannelUserModeChanged
      */
     void onChannelUserModeChanged(@FakableSource Parser parser,
             Date date,

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessInvite;
 
 import java.util.Date;
 
@@ -38,7 +39,7 @@ public interface InviteListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param userHost Hostname of user who invited us
      * @param channel Channel we were invited to
-     * @see com.dmdirc.parser.irc.ProcessInvite#callInvite
+     * @see ProcessInvite#callInvite
      */
     void onInvite(Parser parser, Date date, String userHost, String channel);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMOTD;
 
 import java.util.Date;
 
@@ -38,7 +39,7 @@ public interface MotdEndListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param noMOTD Set to true if this was a "No MOTD Found" message rather than an "End of MOTD"
      * @param data The contents of the line (incase of language changes or so)
-     * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDEnd
+     * @see ProcessMOTD#callMOTDEnd
      */
     void onMOTDEnd(Parser parser, Date date, boolean noMOTD, String data);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMOTD;
 
 import java.util.Date;
 
@@ -37,7 +38,7 @@ public interface MotdLineListener extends CallbackInterface {
      * @param parser Reference to the parser object that made the callback.
      * @param date The date/time at which the event occured
      * @param data Incomming Line.
-     * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDLine
+     * @see ProcessMOTD#callMOTDLine
      */
     void onMOTDLine(Parser parser, Date date, String data);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMOTD;
 
 import java.util.Date;
 
@@ -37,7 +38,7 @@ public interface MotdStartListener extends CallbackInterface {
      * @param parser Reference to the parser object that made the callback.
      * @param date The date/time at which the event occured
      * @param data Incomming Line.
-     * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDStart
+     * @see ProcessMOTD#callMOTDStart
      */
     void onMOTDStart(Parser parser, Date date, String data);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.Process004005;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@ public interface NetworkDetectedListener extends CallbackInterface {
      * @param networkName The name of the network.
      * @param ircdVersion The version of the ircd.
      * @param ircdType The Guessed type of the ircd based on the name.
-     * @see com.dmdirc.parser.irc.Process004005#callGotNetwork
+     * @see Process004005#callGotNetwork
      */
     void onGotNetwork(Parser parser, Date date, String networkName,
             String ircdVersion, String ircdType);

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessNick;
 
 import java.util.Date;
 
@@ -41,7 +42,7 @@ public interface NickChangeListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param client Client changing nickname
      * @param oldNick Nickname before change
-     * @see com.dmdirc.parser.irc.ProcessNick#callNickChanged
+     * @see ProcessNick#callNickChanged
      */
     void onNickChanged(Parser parser, Date date, ClientInfo client, String oldNick);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessNickInUse;
 
 import java.util.Date;
 
@@ -37,7 +38,7 @@ public interface NickInUseListener extends CallbackInterface {
      * @param nickname Nickname that was wanted.
      * @param date The date/time at which the event occured
      * @param parser Reference to the parser object that made the callback.
-     * @see com.dmdirc.parser.irc.ProcessNickInUse#callNickInUse
+     * @see ProcessNickInUse#callNickInUse
      */
     void onNickInUse(Parser parser, Date date, String nickname);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -38,7 +39,7 @@ public interface NumericListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param numeric What numeric is this for
      * @param token IRC Tokenised line
-     * @see com.dmdirc.parser.irc.ProcessingManager#callNumeric
+     * @see ProcessingManager#callNumeric
      */
     void onNumeric(Parser parser, Date date, int numeric, String[] token);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -42,7 +43,7 @@ public interface PrivateActionListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message action contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateAction
+     * @see ProcessMessage#callPrivateAction
      */
     void onPrivateAction(Parser parser, Date date, String message, String host);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -45,7 +46,7 @@ public interface PrivateCtcpListener extends CallbackInterface {
      * @param type Type of CTCP (VERSION, TIME etc)
      * @param message Additional contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCP
+     * @see ProcessMessage#callPrivateCTCP
      */
     void onPrivateCTCP(Parser parser, Date date, String type, String message, String host);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -45,7 +46,7 @@ public interface PrivateCtcpReplyListener extends CallbackInterface {
      * @param type Type of CTCPRReply (VERSION, TIME etc)
      * @param message Reply Contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCPReply
+     * @see ProcessMessage#callPrivateCTCPReply
      */
     void onPrivateCTCPReply(Parser parser, Date date, String type, String message, String host);
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -44,7 +45,7 @@ public interface PrivateMessageListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message Message contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateMessage
+     * @see ProcessMessage#callPrivateMessage
      */
     void onPrivateMessage(Parser parser, Date date, String message, String host);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -44,7 +45,7 @@ public interface PrivateNoticeListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message Notice contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
+     * @see ProcessMessage#callPrivateNotice
      */
     void onPrivateNotice(Parser parser, Date date, String message, String host);
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessQuit;
 
 import java.util.Date;
 
@@ -41,7 +42,7 @@ public interface QuitListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param client Client Quitting
      * @param reason Reason for quitting (may be "")
-     * @see com.dmdirc.parser.irc.ProcessQuit#callQuit
+     * @see ProcessQuit#callQuit
      */
     void onQuit(Parser parser, Date date, ClientInfo client, String reason);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -42,7 +43,7 @@ public interface ServerNoticeListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message Notice contents
      * @param host Hostname of sender
-     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
+     * @see ProcessMessage#callPrivateNotice
      */
     void onServerNotice(Parser parser, Date date, String message, String host);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -39,7 +40,7 @@ public interface UnknownActionListener extends CallbackInterface {
      * @param message Action contents
      * @param target Actual target of action
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownAction
+     * @see ProcessMessage#callUnknownAction
      */
     void onUnknownAction(Parser parser, Date date, String message,
             String target, String host);

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -44,7 +45,7 @@ public interface UnknownCtcpListener extends CallbackInterface {
      * @param message Additional contents
      * @param target Actual Target of CTCP
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCP
+     * @see ProcessMessage#callUnknownCTCP
      */
     void onUnknownCTCP(Parser parser, Date date, String type, String message,
             String target, String host);

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -44,7 +45,7 @@ public interface UnknownCtcpReplyListener extends CallbackInterface {
      * @param message Reply Contents
      * @param target Actual Target of CTCPReply
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCPReply
+     * @see ProcessMessage#callUnknownCTCPReply
      */
     void onUnknownCTCPReply(Parser parser, Date date, String type,
             String message, String target, String host);

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -39,7 +40,7 @@ public interface UnknownMessageListener extends CallbackInterface {
      * @param message Message contents
      * @param target Actual target of message
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownMessage
+     * @see ProcessMessage#callUnknownMessage
      */
     void onUnknownMessage(Parser parser, Date date, String message, String target, String host);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -43,7 +44,7 @@ public interface UnknownNoticeListener extends CallbackInterface {
      * @param message Notice contents
      * @param target Actual target of notice
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownNotice
+     * @see ProcessMessage#callUnknownNotice
      */
     void onUnknownNotice(Parser parser, Date date, String message, String target, String host);
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
 
 import java.util.Date;
 
@@ -39,7 +40,7 @@ public interface UnknownServerNoticeListener extends CallbackInterface {
      * @param message Notice contents
      * @param target Actual target of notice
      * @param host Hostname of sender
-     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownServerNotice
+     * @see ProcessMessage#callUnknownServerNotice
      */
     void onUnknownServerNotice(Parser parser, Date date, String message,
             String target, String host);

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMode;
 
 import java.util.Date;
 
@@ -44,7 +45,7 @@ public interface UserModeChangeListener extends CallbackInterface {
      * @param client Client that had the mode changed (almost always us)
      * @param host Host that set the mode (us or servername)
      * @param modes The modes set.
-     * @see com.dmdirc.parser.irc.ProcessMode#callUserModeChanged
+     * @see ProcessMode#callUserModeChanged
      */
     void onUserModeChanged(Parser parser, Date date, ClientInfo client,
             String host, String modes);

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.irc.processors.ProcessMode;
 
 import java.util.Date;
 
@@ -42,7 +43,7 @@ public interface UserModeDiscoveryListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param client Client that had the mode changed (almost always us)
      * @param modes The modes set.
-     * @see com.dmdirc.parser.irc.ProcessMode#callUserModeDiscovered
+     * @see ProcessMode#callUserModeDiscovered
      */
     void onUserModeDiscovered(Parser parser, Date date, ClientInfo client, String modes);
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessWallops;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@ public interface WallDesyncListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message Message contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessWallops#callWallDesync
+     * @see ProcessWallops#callWallDesync
      */
     void onWallDesync(Parser parser, Date date, String message, String host);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessWallops;
 
 import java.util.Date;
 
@@ -40,7 +41,7 @@ public interface WallopListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message Message contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessWallops#callWallop
+     * @see ProcessWallops#callWallop
      */
     void onWallop(Parser parser, Date date, String message, String host);
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import com.dmdirc.parser.irc.processors.ProcessWallops;
 
 import java.util.Date;
 
@@ -42,7 +43,7 @@ public interface WalluserListener extends CallbackInterface {
      * @param date The date/time at which the event occured
      * @param message Message contents
      * @param host Hostname of sender (or servername)
-     * @see com.dmdirc.parser.irc.ProcessWallops#callWalluser
+     * @see ProcessWallops#callWalluser
      */
     void onWalluser(Parser parser, Date date, String message, String host);
 }

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -228,7 +228,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param newValue new value for if OnChannelGotListModes ever been called for this channel.
      */
-    protected void setHasGotListModes(final boolean newValue) {
+    public void setHasGotListModes(final boolean newValue) {
         hasGotListModes = newValue;
     }
 
@@ -275,7 +275,7 @@ public class IRCChannelInfo implements ChannelInfo {
     /**
      * Empty the channel (Remove all known channelclients).
      */
-    protected void emptyChannel() {
+    public void emptyChannel() {
         IRCClientInfo cTemp;
         synchronized (clients) {
             for (IRCChannelClientInfo client : clients.values()) {
@@ -325,7 +325,7 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param cClient Client object to be added to channel
      * @return ChannelClientInfo object added, or an existing object if already known on channel
      */
-    protected IRCChannelClientInfo addClient(final IRCClientInfo cClient) {
+    public IRCChannelClientInfo addClient(final IRCClientInfo cClient) {
         IRCChannelClientInfo cTemp = getChannelClient(cClient);
         if (cTemp == null) {
             cTemp = new IRCChannelClientInfo(parser, cClient, this);
@@ -339,7 +339,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param cClient Client object to be removed from channel
      */
-    protected void delClient(final IRCClientInfo cClient) {
+    public void delClient(final IRCClientInfo cClient) {
         final IRCChannelClientInfo cTemp = getChannelClient(cClient);
         if (cTemp != null) {
             final IRCClientInfo clTemp = cTemp.getClient();
@@ -357,7 +357,7 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param oldNickname Nickname client used to be known as
      * @param cChannelClient ChannelClient object with updated client object
      */
-    protected void renameClient(final String oldNickname, final IRCChannelClientInfo cChannelClient) {
+    public void renameClient(final String oldNickname, final IRCChannelClientInfo cChannelClient) {
         if (clients.containsKey(oldNickname)) {
             final IRCChannelClientInfo cTemp = clients.get(oldNickname);
             if (cTemp == cChannelClient) {
@@ -375,7 +375,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param nNewTime New unixtimestamp time for the channel creation (Seconds since epoch, not milliseconds)
      */
-    protected void setCreateTime(final long nNewTime) {
+    public void setCreateTime(final long nNewTime) {
         creationTime = nNewTime;
     }
 
@@ -393,7 +393,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param nNewTime New unixtimestamp time for the topic (Seconds since epoch, not milliseconds)
      */
-    protected void setTopicTime(final long nNewTime) {
+    public void setTopicTime(final long nNewTime) {
         topicTime = nNewTime;
     }
 
@@ -407,7 +407,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param sNewTopic New contents of topic
      */
-    protected void setInternalTopic(final String sNewTopic) {
+    public void setInternalTopic(final String sNewTopic) {
         topic = sNewTopic;
     }
 
@@ -421,7 +421,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param sNewUser New user who set the topic (nickname if gotten on connect, full host if seen by parser)
      */
-    protected void setTopicUser(final String sNewUser) {
+    public void setTopicUser(final String sNewUser) {
         topicUser = sNewUser;
     }
 
@@ -435,7 +435,7 @@ public class IRCChannelInfo implements ChannelInfo {
      *
      * @param nNewMode new long representing channel modes. (Boolean only)
      */
-    protected void setMode(final long nNewMode) {
+    public void setMode(final long nNewMode) {
         modes = nNewMode;
     }
 
@@ -478,7 +478,7 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param cMode Character representing mode
      * @param sValue String repreenting value (if "" mode is unset)
      */
-    protected void setModeParam(final Character cMode, final String sValue) {
+    public void setModeParam(final Character cMode, final String sValue) {
         if (sValue.isEmpty()) {
             if (paramModes.containsKey(cMode)) {
                 paramModes.remove(cMode);
@@ -503,7 +503,8 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param givenItem ChannelListModeItem representing the item
      * @param bAdd Add or remove the value. (true for add, false for remove)
      */
-    protected void setListModeParam(final Character givenMode, final ChannelListModeItem givenItem, final boolean bAdd) {
+    public void setListModeParam(final Character givenMode, final ChannelListModeItem givenItem,
+            final boolean bAdd) {
         Character cMode = givenMode;
         ChannelListModeItem newItem = givenItem;
         if (!parser.chanModesOther.containsKey(cMode) || parser.chanModesOther.get(cMode) != IRCParser.MODE_LIST) {
@@ -575,7 +576,7 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param cMode Character representing mode
      * @param newState change the value returned by getAddState
      */
-    protected void setAddState(final Character cMode, final boolean newState) {
+    public void setAddState(final Character cMode, final boolean newState) {
         synchronized (addingModes) {
             if (newState) {
                 addingModes.add(cMode);
@@ -590,7 +591,7 @@ public class IRCChannelInfo implements ChannelInfo {
     /**
      * Reset the "adding state" of *all* list modes.
      */
-    protected void resetAddState() {
+    public void resetAddState() {
         synchronized (addingModes) {
             addingModes.clear();
         }

src/com/dmdirc/parser/irc/IRCClientInfo.java

@@ -238,7 +238,7 @@ public class IRCClientInfo implements LocalClientInfo {
      *
      * @param newState AwayState representing new away state.
      */
-    protected void setAwayState(final AwayState newState) {
+    public void setAwayState(final AwayState newState) {
         away = newState;
 
         if (away != AwayState.AWAY) {
@@ -262,7 +262,7 @@ public class IRCClientInfo implements LocalClientInfo {
      *
      * @param newValue new away reason for user.
      */
-    protected void setAwayReason(final String newValue) {
+    public void setAwayReason(final String newValue) {
         awayReason = newValue;
     }
 
@@ -276,7 +276,7 @@ public class IRCClientInfo implements LocalClientInfo {
      *
      * @param newValue new RealName for user.
      */
-    protected void setRealName(final String newValue) {
+    public void setRealName(final String newValue) {
         realName = newValue;
     }
 
@@ -290,7 +290,7 @@ public class IRCClientInfo implements LocalClientInfo {
      *
      * @param newValue new account name for user.
      */
-    protected void setAccountName(final String newValue) {
+    public void setAccountName(final String newValue) {
         accountName = newValue;
     }
 
@@ -299,7 +299,7 @@ public class IRCClientInfo implements LocalClientInfo {
      *
      * @param newMode new long representing channel modes. (Boolean only)
      */
-    protected void setUserMode(final long newMode) {
+    public void setUserMode(final long newMode) {
         modes = newMode;
     }
 

src/com/dmdirc/parser/irc/IRCParser.java

@@ -105,13 +105,13 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     public static final int DEBUG_LMQ = 8;
 
     /** Attempt to update user host all the time, not just on Who/Add/NickChange. */
-    static final boolean ALWAYS_UPDATECLIENT = true;
+    public static final boolean ALWAYS_UPDATECLIENT = true;
     /** Byte used to show that a non-boolean mode is a list (b). */
-    static final byte MODE_LIST = 1;
+    public static final byte MODE_LIST = 1;
     /** Byte used to show that a non-boolean mode is not a list, and requires a parameter to set (lk). */
     static final byte MODE_SET = 2;
     /** Byte used to show that a non-boolean mode is not a list, and requires a parameter to unset (k). */
-    static final byte MODE_UNSET = 4;
+    public static final byte MODE_UNSET = 4;
 
     /**
      * Default channel prefixes if none are specified by the IRCd.
@@ -152,13 +152,13 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     private int pingCountDown;
 
     /** Network name. This is "" if no network name is provided */
-    String networkName;
+    public String networkName;
     /** This is what we think the nickname should be. */
-    String thinkNickname;
+    public String thinkNickname;
     /** When using inbuilt pre-001 NickInUse handler, have we tried our AltNick. */
-    boolean triedAlt;
+    public boolean triedAlt;
     /** Have we received the 001. */
-    boolean got001;
+    public boolean got001;
     /** Have we fired post005? */
     boolean post005;
     /** Has the thread started execution yet, (Prevents run() being called multiple times). */
@@ -166,18 +166,18 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     /** Connect timeout. */
     private int connectTimeout = 5000;
     /** Hashtable storing known prefix modes (ohv). */
-    final Map<Character, Long> prefixModes = new HashMap<>();
+    public final Map<Character, Long> prefixModes = new HashMap<>();
     /**
      * Hashtable maping known prefix modes (ohv) to prefixes (@%+) - Both ways.
      * Prefix map contains 2 pairs for each mode. (eg @ => o and o => @)
      */
-    final Map<Character, Character> prefixMap = new HashMap<>();
+    public final Map<Character, Character> prefixMap = new HashMap<>();
     /** Integer representing the next avaliable integer value of a prefix mode. */
     long nextKeyPrefix = 1;
     /** Hashtable storing known user modes (owxis etc). */
-    final Map<Character, Long> userModes = new HashMap<>();
+    public final Map<Character, Long> userModes = new HashMap<>();
     /** Integer representing the next avaliable integer value of a User mode. */
-    long nNextKeyUser = 1;
+    public long nNextKeyUser = 1;
     /**
      * Hashtable storing known boolean chan modes (cntmi etc).
      * Valid Boolean Modes are stored as Hashtable.pub('m',1); where 'm' is the mode and 1 is a numeric value.<br><br>
@@ -186,9 +186,9 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      * <br>
      * Channel modes discovered but not listed in 005 are stored as boolean modes automatically (and a ERROR_WARNING Error is called)
      */
-    final Map<Character, Long> chanModesBool = new HashMap<>();
+    public final Map<Character, Long> chanModesBool = new HashMap<>();
     /** Integer representing the next avaliable integer value of a Boolean mode. */
-    long nextKeyCMBool = 1;
+    public long nextKeyCMBool = 1;
     /**
      * Hashtable storing known non-boolean chan modes (klbeI etc).
      * Non Boolean Modes (for Channels) are stored together in this hashtable, the value param
@@ -198,7 +198,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      * see MODE_SET<br>
      * see MODE_UNSET<br>
      */
-    final Map<Character, Byte> chanModesOther = new HashMap<>();
+    public final Map<Character, Byte> chanModesOther = new HashMap<>();
     /** The last line of input received from the server */
     private ReadLine lastLine = null;
     /** Should the lastline (where given) be appended to the "data" part of any onErrorInfo call? */
@@ -212,7 +212,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     /** Reference to the ClientInfo object that references ourself. */
     private IRCClientInfo myself = new IRCClientInfo(this, "myself").setFake(true);
     /** Hashtable storing all information gathered from 005. */
-    final Map<String, String> h005Info = new HashMap<>();
+    public final Map<String, String> h005Info = new HashMap<>();
     /** difference in ms between our time and the servers time (used for timestampedIRC). */
     long tsdiff;
     /** Reference to the Processing Manager. */
@@ -600,7 +600,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      * @param data Debugging Information as a format string
      * @param args Formatting String Options
      */
-    protected void callDebugInfo(final int level, final String data, final Object... args) {
+    public void callDebugInfo(final int level, final String data, final Object... args) {
         callDebugInfo(level, String.format(data, args));
     }
 
@@ -621,7 +621,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      * @see com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener
      * @param errorInfo ParserError object representing the error.
      */
-    protected void callErrorInfo(final ParserError errorInfo) {
+    public void callErrorInfo(final ParserError errorInfo) {
         getCallback(ErrorInfoListener.class).onErrorInfo(null, null, errorInfo);
     }
 
@@ -1189,7 +1189,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      * @param line Line to send (\r\n termination is added automatically)
      * @return True if line was sent, else false.
      */
-    protected boolean sendString(final String line) {
+    public boolean sendString(final String line) {
         return doSendString(line, QueuePriority.NORMAL, true);
     }
 
@@ -1213,7 +1213,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      * @param priority Priority of this line.
      * @return True if line was sent, else false.
      */
-    protected boolean sendString(final String line, final QueuePriority priority) {
+    public boolean sendString(final String line, final QueuePriority priority) {
         return doSendString(line, priority, true);
     }
 
@@ -1435,7 +1435,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      *
      * @param encoding The encoding to use
      */
-    protected void setEncoding(final IRCEncoding encoding) {
+    public void setEncoding(final IRCEncoding encoding) {
         stringConverter = new IRCStringConverter(encoding);
     }
 
@@ -1650,7 +1650,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     /**
      * Process USERMODES from 004.
      */
-    protected void parseUserModes() {
+    public void parseUserModes() {
         final String sDefaultModes = "nwdoi";
         final String modeStr;
         if (h005Info.containsKey("USERMODES")) {
@@ -1678,7 +1678,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     /**
      * Resets the channel prefix property to the default, RFC specified value.
      */
-    protected void resetChanPrefix() {
+    public void resetChanPrefix() {
         chanPrefix = DEFAULT_CHAN_PREFIX;
     }
 
@@ -1687,7 +1687,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      *
      * @param value The new set of channel prefixes.
      */
-    protected void setChanPrefix(final String value) {
+    public void setChanPrefix(final String value) {
         chanPrefix = value;
     }
 
@@ -2099,7 +2099,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     /**
      * Start the pingTimer.
      */
-    protected void startPingTimer() {
+    public void startPingTimer() {
         pingTimerSem.acquireUninterruptibly();
 
         try {
@@ -2183,7 +2183,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      *
      * @param serverName The discovered server name
      */
-    protected void updateServerName(final String serverName) {
+    public void updateServerName(final String serverName) {
         setServerName(serverName);
     }
 
@@ -2292,7 +2292,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      *
      * @param client Client to remove
      */
-    protected void forceRemoveClient(final IRCClientInfo client) {
+    public void forceRemoveClient(final IRCClientInfo client) {
         clientList.remove(getStringConverter().toLowerCase(client.getRealNickname()));
     }
 

src/com/dmdirc/parser/irc/ProcessingManager.java

@@ -24,6 +24,30 @@ package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.callbacks.NumericListener;
+import com.dmdirc.parser.irc.processors.IRCProcessor;
+import com.dmdirc.parser.irc.processors.Process001;
+import com.dmdirc.parser.irc.processors.Process004005;
+import com.dmdirc.parser.irc.processors.Process464;
+import com.dmdirc.parser.irc.processors.ProcessAccount;
+import com.dmdirc.parser.irc.processors.ProcessAway;
+import com.dmdirc.parser.irc.processors.ProcessCap;
+import com.dmdirc.parser.irc.processors.ProcessInvite;
+import com.dmdirc.parser.irc.processors.ProcessJoin;
+import com.dmdirc.parser.irc.processors.ProcessKick;
+import com.dmdirc.parser.irc.processors.ProcessList;
+import com.dmdirc.parser.irc.processors.ProcessListModes;
+import com.dmdirc.parser.irc.processors.ProcessMOTD;
+import com.dmdirc.parser.irc.processors.ProcessMessage;
+import com.dmdirc.parser.irc.processors.ProcessMode;
+import com.dmdirc.parser.irc.processors.ProcessNames;
+import com.dmdirc.parser.irc.processors.ProcessNick;
+import com.dmdirc.parser.irc.processors.ProcessNickInUse;
+import com.dmdirc.parser.irc.processors.ProcessNoticeAuth;
+import com.dmdirc.parser.irc.processors.ProcessPart;
+import com.dmdirc.parser.irc.processors.ProcessQuit;
+import com.dmdirc.parser.irc.processors.ProcessTopic;
+import com.dmdirc.parser.irc.processors.ProcessWallops;
+import com.dmdirc.parser.irc.processors.ProcessWho;
 
 import java.util.Date;
 import java.util.HashMap;

src/com/dmdirc/parser/irc/TimestampedIRCProcessor.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.irc.processors.IRCProcessor;
+
 import java.util.Date;
 
 /**

src/com/dmdirc/parser/irc/IRCProcessor.java → src/com/dmdirc/parser/irc/processors/IRCProcessor.java

@@ -20,11 +20,15 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * IRCProcessor.

src/com/dmdirc/parser/irc/Process001.java → src/com/dmdirc/parser/irc/processors/Process001.java

@@ -20,10 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a 001 message.
@@ -36,7 +38,7 @@ public class Process001 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process001(final IRCParser parser, final ProcessingManager manager) {
+    public Process001(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/Process004005.java → src/com/dmdirc/parser/irc/processors/Process004005.java

@@ -20,11 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.interfaces.callbacks.NetworkDetectedListener;
+import com.dmdirc.parser.irc.CapabilityState;
+import com.dmdirc.parser.irc.IRCEncoding;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
+import com.dmdirc.parser.irc.ProcessorNotFoundException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -40,7 +45,7 @@ public class Process004005 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process004005(final IRCParser parser, final ProcessingManager manager) {
+    public Process004005(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 
@@ -303,7 +308,7 @@ public class Process004005 extends IRCProcessor {
     /**
      * Processes a 'LISTMODE' token received in a 005. The LISTMODE token
      * indicates support for a new way of describing list modes (such as +b).
-     * See the proposal at {@link http://shanemcc.co.uk/irc/#listmode}.
+     * See the proposal at http://shanemcc.co.uk/irc/#listmode.
      *
      * @param value The value of the token.
      */
@@ -325,7 +330,7 @@ public class Process004005 extends IRCProcessor {
      * protocol allows servers (or proxies) to send historical events with a
      * corresponding timestamp, allowing the client to catch up on events that
      * happened prior to them connecting. See the proposal at
-     * {@link http://shanemcc.co.uk/irc/#timestamping}.
+     * http://shanemcc.co.uk/irc/#timestamping.
      */
     private void processTimestampedIrcToken() {
         if (parser.getCapabilityState("dfbnc.com/tsirc") != CapabilityState.ENABLED) {

src/com/dmdirc/parser/irc/Process464.java → src/com/dmdirc/parser/irc/processors/Process464.java

@@ -20,9 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a 464 message.
@@ -35,7 +37,7 @@ public class Process464 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process464(final IRCParser parser, final ProcessingManager manager) {
+    public Process464(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessAccount.java → src/com/dmdirc/parser/irc/processors/ProcessAccount.java

@@ -20,7 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
+
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process an Account message.
@@ -33,7 +37,7 @@ public class ProcessAccount extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessAccount(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessAccount(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 
@@ -48,7 +52,7 @@ public class ProcessAccount extends IRCProcessor {
         // :nick!user@host ACCOUNT accountname
         final IRCClientInfo iClient = getClientInfo(token[0]);
         if (iClient != null) {
-            iClient.setAccountName(token[2].equals("*") ? null : token[2]);
+            iClient.setAccountName("*".equals(token[2]) ? null : token[2]);
         }
     }
 

src/com/dmdirc/parser/irc/ProcessAway.java → src/com/dmdirc/parser/irc/processors/ProcessAway.java

@@ -19,10 +19,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process an Away/Back message.
@@ -35,7 +38,7 @@ public class ProcessAway extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessAway(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessAway(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 
@@ -53,7 +56,7 @@ public class ProcessAway extends IRCProcessor {
                 if (iClient != null) {
                     final AwayState oldState = iClient.getAwayState();
 
-                    final String reason = (token.length > 2) ? token[token.length - 1] : "";
+                    final String reason = token.length > 2 ? token[token.length - 1] : "";
                     iClient.setAwayReason(reason);
                     iClient.setAwayState(reason.isEmpty() ? AwayState.HERE : AwayState.AWAY);
 

src/com/dmdirc/parser/irc/ProcessCap.java → src/com/dmdirc/parser/irc/processors/ProcessCap.java

@@ -20,7 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
+
+import com.dmdirc.parser.irc.CapabilityState;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
+import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -50,7 +55,7 @@ public class ProcessCap extends TimestampedIRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessCap(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessCap(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
 
         // IRCv3.1 Standard

src/com/dmdirc/parser/irc/ProcessInvite.java → src/com/dmdirc/parser/irc/processors/ProcessInvite.java

@@ -20,9 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.callbacks.InviteListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process an Invite Request.
@@ -35,7 +37,7 @@ public class ProcessInvite extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessInvite(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessInvite(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessJoin.java → src/com/dmdirc/parser/irc/processors/ProcessJoin.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
@@ -28,6 +28,13 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
+import com.dmdirc.parser.irc.CapabilityState;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
+import com.dmdirc.parser.irc.ProcessorNotFoundException;
 
 import java.util.Arrays;
 
@@ -42,7 +49,7 @@ public class ProcessJoin extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessJoin(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessJoin(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 
@@ -85,8 +92,8 @@ public class ProcessJoin extends IRCProcessor {
             if (extendedJoin) {
                 // :nick!ident@host JOIN #Channel accountName :Real Name
                 channelName = token[2];
-                accountName = (token.length > 3) ? token[3] : "*";
-                realName = (token.length > 4) ? token[token.length - 1] : "";
+                accountName = token.length > 3 ? token[3] : "*";
+                realName = token.length > 4 ? token[token.length - 1] : "";
             } else {
                 channelName = token[token.length - 1];
                 accountName = "*";
@@ -104,7 +111,7 @@ public class ProcessJoin extends IRCProcessor {
             }
 
             if (extendedJoin) {
-                iClient.setAccountName(accountName.equals("*") ? null : accountName);
+                iClient.setAccountName("*".equals(accountName) ? null : accountName);
                 iClient.setRealName(realName);
             }
 

src/com/dmdirc/parser/irc/ProcessKick.java → src/com/dmdirc/parser/irc/processors/ProcessKick.java

@@ -20,12 +20,17 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Arrays;
 
@@ -40,7 +45,7 @@ public class ProcessKick extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessKick(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessKick(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessList.java → src/com/dmdirc/parser/irc/processors/ProcessList.java

@@ -20,11 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.callbacks.GroupListEndListener;
 import com.dmdirc.parser.interfaces.callbacks.GroupListEntryListener;
 import com.dmdirc.parser.interfaces.callbacks.GroupListStartListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a list response.
@@ -37,7 +39,7 @@ public class ProcessList extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessList(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessList(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessListModes.java → src/com/dmdirc/parser/irc/processors/ProcessListModes.java

@@ -19,12 +19,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelListModeListener;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
+import com.dmdirc.parser.irc.ServerType;
+import com.dmdirc.parser.irc.ServerTypeGroup;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -41,7 +46,7 @@ public class ProcessListModes extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessListModes(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessListModes(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessMOTD.java → src/com/dmdirc/parser/irc/processors/ProcessMOTD.java

@@ -20,11 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.callbacks.MotdEndListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdLineListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdStartListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a MOTD Related Line.
@@ -37,7 +39,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMOTD(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessMOTD(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessMessage.java → src/com/dmdirc/parser/irc/processors/ProcessMessage.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -44,6 +44,13 @@ import com.dmdirc.parser.interfaces.callbacks.UnknownCtcpReplyListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownServerNoticeListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
+import com.dmdirc.parser.irc.ProcessorNotFoundException;
+import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.util.Date;
 import java.util.regex.PatternSyntaxException;
@@ -64,7 +71,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMessage(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessMessage(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessMode.java → src/com/dmdirc/parser/irc/processors/ProcessMode.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.CallbackObject;
 import com.dmdirc.parser.common.ChannelListModeItem;
@@ -34,6 +34,11 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelSingleModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.UserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.UserModeDiscoveryListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Calendar;
 
@@ -48,7 +53,7 @@ public class ProcessMode extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMode(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessMode(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessNames.java → src/com/dmdirc/parser/irc/processors/ProcessNames.java

@@ -20,11 +20,16 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a Names reply.
@@ -37,7 +42,7 @@ public class ProcessNames extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessNames(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessNames(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessNick.java → src/com/dmdirc/parser/irc/processors/ProcessNick.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -28,6 +28,11 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a Nick change.
@@ -40,7 +45,7 @@ public class ProcessNick extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessNick(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessNick(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessNickInUse.java → src/com/dmdirc/parser/irc/processors/ProcessNickInUse.java

@@ -20,10 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a NickInUse message.
@@ -42,7 +44,7 @@ public class ProcessNickInUse extends IRCProcessor {
      * @param parser IRCParser That owns this object
      * @param manager ProcessingManager that is in charge of this object
      */
-    protected ProcessNickInUse(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessNickInUse(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessNoticeAuth.java → src/com/dmdirc/parser/irc/processors/ProcessNoticeAuth.java

@@ -20,9 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a NoticeAuth message.
@@ -35,7 +37,7 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * @param parser IRCParser That owns this object
      * @param manager ProcessingManager that is in charge of this object
      */
-    protected ProcessNoticeAuth(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessNoticeAuth(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessPart.java → src/com/dmdirc/parser/irc/processors/ProcessPart.java

@@ -20,12 +20,17 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a channel part.
@@ -38,7 +43,7 @@ public class ProcessPart extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessPart(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessPart(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessQuit.java → src/com/dmdirc/parser/irc/processors/ProcessQuit.java

@@ -20,13 +20,18 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
+import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +47,7 @@ public class ProcessQuit extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessQuit(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessQuit(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessTopic.java → src/com/dmdirc/parser/irc/processors/ProcessTopic.java

@@ -20,10 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
+import com.dmdirc.parser.irc.IRCChannelInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a topic change.
@@ -36,7 +40,7 @@ public class ProcessTopic extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessTopic(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessTopic(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessWallops.java → src/com/dmdirc/parser/irc/processors/ProcessWallops.java

@@ -20,11 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
 import com.dmdirc.parser.interfaces.callbacks.WallopListener;
 import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a WALLOPS Message.
@@ -37,7 +39,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessWallops(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessWallops(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }
 

src/com/dmdirc/parser/irc/ProcessWho.java → src/com/dmdirc/parser/irc/processors/ProcessWho.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -29,6 +29,9 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelOtherAwayStateListener;
 import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
+import com.dmdirc.parser.irc.IRCClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process a /who reply.
@@ -41,7 +44,7 @@ public class ProcessWho extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessWho(final IRCParser parser, final ProcessingManager manager) {
+    public ProcessWho(final IRCParser parser, final ProcessingManager manager) {
         super(parser, manager);
     }