Lots of changes.

src/com/dmdirc/Channel.java

@@ -29,9 +29,8 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -102,7 +101,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
      * @param newChannelInfo The parser's channel object that corresponds to
      * this channel
      */
-    public Channel(final Server newServer, final IRCChannelInfo newChannelInfo) {
+    public Channel(final Server newServer, final ChannelInfo newChannelInfo) {
         super("channel", newChannelInfo.getName(),
                 new ConfigManager(newServer.getIrcd(), newServer.getNetwork(),
                 newServer.getName(), newChannelInfo.getName()));
@@ -165,7 +164,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
             return;
         }
 
-        final ClientInfo me = server.getParser().getMyself();
+        final ClientInfo me = server.getParser().getLocalClient();
         final String[] details = getDetails(channelInfo.getUser(me), showColours);
 
         for (String part : splitLine(window.getTranscoder().encode(line))) {
@@ -200,7 +199,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
             return;
         }
 
-        final ClientInfo me = server.getParser().getMyself();
+        final ClientInfo me = server.getParser().getLocalClient();
         final String[] details = getDetails(channelInfo.getUser(me), showColours);
 
         if (server.getParser().getMaxLength("PRIVMSG", getChannelInfo().getName())
@@ -246,7 +245,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
      *
      * @param newChannelInfo The new ChannelInfo object
      */
-    public void setChannelInfo(final IRCChannelInfo newChannelInfo) {
+    public void setChannelInfo(final ChannelInfo newChannelInfo) {
         channelInfo = newChannelInfo;
         registerCallbacks();
     }
@@ -276,7 +275,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
     public void selfJoin() {
         onChannel = true;
 
-        final ClientInfo me = server.getParser().getMyself();
+        final ClientInfo me = server.getParser().getLocalClient();
         addLine("channelSelfJoin", "", me.getNickname(), me.getIdent(),
                 me.getHost(), channelInfo.getName());
 
@@ -396,7 +395,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
         window.removeName(client);
         tabCompleter.removeEntry(TabCompletionType.CHANNEL_NICK, client.getNickname());
 
-        if (client.getClient().equals(server.getParser().getMyself())) {
+        if (client.getClient().equals(server.getParser().getLocalClient())) {
             resetWindow();
         }
     }

src/com/dmdirc/ChannelEventHandler.java

@@ -24,10 +24,10 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.callbacks.CallbackManager;
 import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.*;
@@ -82,13 +82,13 @@ public final class ChannelEventHandler extends EventHandler implements
      * @return True if the client is ourself, false otherwise.
      */
     protected boolean isMyself(final ChannelClientInfo client) {
-        return client.getClient().equals(owner.getServer().getParser().getMyself());
+        return client.getClient().equals(owner.getServer().getParser().getLocalClient());
     }
 
     /** {@inheritDoc} */
     @Override
     public void onChannelMessage(final Parser tParser,
-            final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient,
+            final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
         checkParser(tParser);
 
@@ -99,7 +99,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelGotNames(final Parser tParser, final IRCChannelInfo cChannel) {
+    public void onChannelGotNames(final Parser tParser, final ChannelInfo cChannel) {
         checkParser(tParser);
 
         owner.setClients(cChannel.getChannelClients());
@@ -109,7 +109,7 @@ public final class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @Override
     public void onChannelTopic(final Parser tParser,
-            final IRCChannelInfo cChannel, final boolean bIsJoinTopic) {
+            final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         checkParser(tParser);
 
         final Topic newTopic = new Topic(cChannel.getTopic(),
@@ -128,7 +128,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelJoin(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelJoin(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient) {
         checkParser(tParser);
 
@@ -138,7 +138,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelPart(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelPart(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
         checkParser(tParser);
 
@@ -151,7 +151,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelKick(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelKick(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient,
             final String sReason, final String sKickedByHost) {
         checkParser(tParser);
@@ -163,7 +163,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelQuit(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelQuit(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
         checkParser(tParser);
 
@@ -174,7 +174,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelAction(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelAction(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage,
             final String sHost) {
         checkParser(tParser);
@@ -186,7 +186,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelNickChanged(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelNickChanged(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sOldNick) {
         checkParser(tParser);
 
@@ -198,7 +198,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelModeChanged(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelModeChanged(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sHost,
             final String sModes) {
         checkParser(tParser);
@@ -219,7 +219,7 @@ public final class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @Override
     public void onChannelUserModeChanged(final Parser tParser,
-            final IRCChannelInfo cChannel, final ChannelClientInfo cChangedClient,
+            final ChannelInfo cChannel, final ChannelClientInfo cChangedClient,
             final ChannelClientInfo cSetByClient, final String sHost, final String sMode) {
         checkParser(tParser);
 
@@ -237,7 +237,7 @@ public final class ChannelEventHandler extends EventHandler implements
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelCTCP(final Parser tParser, final IRCChannelInfo cChannel,
+    public void onChannelCTCP(final Parser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sType,
             final String sMessage, final String sHost) {
         checkParser(tParser);
@@ -265,7 +265,7 @@ public final class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @Override
     public void onChannelNotice(final Parser tParser,
-            final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient,
+            final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
         checkParser(tParser);
 

src/com/dmdirc/Invite.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.irc.ClientInfo;
-
+import com.dmdirc.parser.interfaces.ClientInfo;
 import java.util.Date;
 
 /**

src/com/dmdirc/Query.java

@@ -28,8 +28,8 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.callbacks.CallbackManager;
 import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;

src/com/dmdirc/Server.java

@@ -34,9 +34,9 @@ import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.IRCStringConverter;
 import com.dmdirc.parser.irc.MyInfo;
 import com.dmdirc.parser.irc.ParserError;
@@ -566,7 +566,7 @@ public class Server extends WritableFrameContainer implements Serializable {
      *
      * @param chan channel to add
      */
-    public void addChannel(final IRCChannelInfo chan) {
+    public void addChannel(final ChannelInfo chan) {
         synchronized (myState) {
             if (myState.getState() == ServerState.CLOSING) {
                 // Can't join channels while the server is closing

src/com/dmdirc/ServerEventHandler.java

@@ -26,9 +26,9 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.ParserError;
 import com.dmdirc.parser.irc.callbacks.CallbackManager;
 import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
@@ -78,7 +78,7 @@ public final class ServerEventHandler extends EventHandler
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelSelfJoin(final Parser tParser, final IRCChannelInfo cChannel) {
+    public void onChannelSelfJoin(final Parser tParser, final ChannelInfo cChannel) {
         checkParser(tParser);
         owner.addChannel(cChannel);
     }

src/com/dmdirc/actions/CoreActionComponent.java

@@ -30,8 +30,8 @@ import com.dmdirc.Server;
 import com.dmdirc.config.Identity;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -128,7 +128,7 @@ public enum CoreActionComponent implements ActionComponent {
                 
                 return "null";
             } else {
-                return server.getParser().getMyself().getNickname();
+                return server.getParser().getLocalClient().getNickname();
             }
         }
         /** {@inheritDoc} */

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.Server;
 import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Defines server-related events.

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -41,8 +41,8 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
 
@@ -372,7 +372,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 								if ((!token.isEmpty() && !send.getToken().isEmpty()) && (!token.equals(send.getToken()))) {
 									continue;
 								}
-								final IRCParser parser = ((Server)arguments[0]).getParser();
+								final Parser parser = ((Server)arguments[0]).getParser();
 								final String nickname = ((ClientInfo)arguments[1]).getNickname();
 								if (ctcpData[0].equalsIgnoreCase("resume")) {
 									parser.sendCTCP(nickname, "DCC", "ACCEPT "+((quoted) ? "\""+filename+"\"" : filename)+" "+port+" "+send.setFileStart(position)+token);
@@ -516,7 +516,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 		if (!configIP.isEmpty()) {
 			return configIP;
 		} else if (parser != null) {
-			final String myHost = parser.getMyself().getHost();
+			final String myHost = parser.getLocalClient().getHost();
 			if (!myHost.isEmpty()) {
 				try {
 					return InetAddress.getByName(myHost).getHostAddress();

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

@@ -38,10 +38,10 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
@@ -246,7 +246,7 @@ public class LoggingPlugin extends Plugin implements ActionListener {
 			return;
 		}
 		
-		final IRCParser parser = query.getServer().getParser();
+		final Parser parser = query.getServer().getParser();
 		ClientInfo client;
 		
 		if (parser == null) {
@@ -259,7 +259,7 @@ public class LoggingPlugin extends Plugin implements ActionListener {
 		} else {
 			client = parser.getClientInfo(query.getHost());
 			if (client == null) {
-				client = new ClientInfo(parser, query.getHost()).setFake(true);
+				client = new IRCClientInfo(parser, query.getHost()).setFake(true);
 			}
 		}
 		
@@ -312,7 +312,7 @@ public class LoggingPlugin extends Plugin implements ActionListener {
 	 */
 	protected void handleChannelEvent(final CoreActionType type, final StringBuffer format, final Object... arguments) {
 		final Channel chan = ((Channel)arguments[0]);
-		final IRCChannelInfo channel = chan.getChannelInfo();
+		final ChannelInfo channel = chan.getChannelInfo();
 		final String filename = getLogFile(channel);
 		
 		final ChannelClientInfo channelClient = (arguments.length > 1 && arguments[1] instanceof ChannelClientInfo) ? (ChannelClientInfo)arguments[1] : null;
@@ -608,8 +608,8 @@ public class LoggingPlugin extends Plugin implements ActionListener {
 		
 		if (obj == null) {
 			file.append("null.log");
-		} else if (obj instanceof IRCChannelInfo) {
-			final IRCChannelInfo channel = (IRCChannelInfo) obj;
+		} else if (obj instanceof ChannelInfo) {
+			final ChannelInfo channel = (ChannelInfo) obj;
 			if (channel.getParser() != null) {
 				addNetworkDir(directory, file, channel.getParser().getNetworkName());
 			}
@@ -783,7 +783,7 @@ public class LoggingPlugin extends Plugin implements ActionListener {
 			final Parser parser = ((Query) target.getContainer()).getServer().getParser();
 			component = parser.getClientInfo(((Query) target.getContainer()).getHost());
 			if (component == null) {
-				component = new ClientInfo(parser, ((Query) target.getContainer()).getHost()).setFake(true);
+				component = new IRCClientInfo(parser, ((Query) target.getContainer()).getHost()).setFake(true);
 			}
 		} else if (target.getContainer() instanceof Server) {
 			component = target.getContainer().getServer().getParser();

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

@@ -33,9 +33,9 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.ColourManager;
 
@@ -67,7 +67,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
         if (type.equals(CoreActionType.CHANNEL_GOTNAMES)) {
-            final IRCChannelInfo chanInfo = ((Channel) arguments[0]).getChannelInfo();
+            final ChannelInfo chanInfo = ((Channel) arguments[0]).getChannelInfo();
             final String network = ((Channel) arguments[0]).getServer().getNetwork();
             
             for (ChannelClientInfo client : chanInfo.getChannelClients()) {
@@ -88,7 +88,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener {
      */
     private void colourClient(final String network, final ChannelClientInfo client) {
         final Map map = client.getMap();
-        final ClientInfo myself = client.getClient().getParser().getMyself();
+        final ClientInfo myself = client.getClient().getParser().getLocalClient();
         final String nickOption1 = "color:"
                 + client.getClient().getParser().getIRCStringConverter().toLowerCase(network + ":" + client.getNickname());
         final String nickOption2 = "color:"

src/com/dmdirc/addons/userlevel/AccessLevelComponent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.userlevel;
 
 import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Action component to retrieve a client's global access level.

src/com/dmdirc/addons/userlevel/UserLevelPlugin.java

@@ -29,8 +29,8 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 
 import java.util.HashMap;

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

@@ -40,7 +40,7 @@ import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
@@ -176,7 +176,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
 
 			textString.append(frame.getHost());
 			if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "client.showname") && frame.getServer().getParser() != null) {
-				final ClientInfo client = frame.getServer().getParser().getClientInfo(frame.getHost());
+				final IRCClientInfo client = frame.getServer().getParser().getClientInfo(frame.getHost());
 				if (client != null) {
 					final String realname = client.getRealName();
 					if (!realname.isEmpty()) {

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

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -55,7 +55,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, isSilent, "channelNoTopic", cChannel);
             } else {
-                final String[] parts = ClientInfo.parseHostFull(cChannel.getTopicUser());
+                final String[] parts = IRCClientInfo.parseHostFull(cChannel.getTopicUser());
 
                 sendLine(origin, isSilent, "channelTopicDiscovered",
                         "", parts[0], parts[1], parts[2], cChannel.getTopic(),

src/com/dmdirc/parser/interfaces/ClientInfo.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.interfaces;
+
+/**
+ * Holds information about a client, and provides various methods for
+ * interacting with that client.
+ *
+ * @author chris
+ * @since 0.6.3m2
+ */
+public interface ClientInfo {
+
+}

src/com/dmdirc/parser/interfaces/Parser.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.interfaces;
 
+import java.util.Collection;
+
 /**
  * A parser connects to a back-end chat system and handles all communication
  * with it.
@@ -63,9 +65,16 @@ public interface Parser extends Runnable {
     ChannelInfo getChannel(String channel);
 
     /**
-     * Set the current Value of bindIP.
+     * Retrieves a collection of all known channels.
+     *
+     * @return A collection of known channels
+     */
+    Collection<ChannelInfo> getChannels();
+
+    /**
+     * Set the IP address that this parser will bind to
      *
-     * @param ip New value to set bindIP
+     * @param ip IP to bind to
      */
     void setBindIP(String ip);
 
@@ -78,4 +87,12 @@ public interface Parser extends Runnable {
      */
     int getMaxLength(final String type, final String target);
 
+    /**
+     * Returns a {@link ClientInfo} object which represents the locally
+     * connected client.
+     *
+     * @return An info object for the local client
+     */
+    ClientInfo getLocalClient();
+
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -51,7 +51,7 @@ public interface ChannelActionListener extends CallbackInterface {
 	 */
 	void onChannelAction(
             @FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -50,7 +50,7 @@ public interface ChannelCtcpListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCP
 	 */
 	void onChannelCTCP(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sType, String sMessage,
             @FakableSource String sHost);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -50,7 +50,7 @@ public interface ChannelCtcpReplyListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCPReply
 	 */
 	void onChannelCTCPReply(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sType, String sMessage,
             @FakableSource String sHost);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
@@ -42,5 +42,5 @@ public interface ChannelJoinListener extends CallbackInterface {
 	 * @param cChannelClient ChannelClient object for new person
 	 * @see com.dmdirc.parser.irc.ProcessJoin#callChannelJoin
 	 */
-	void onChannelJoin(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient);
+	void onChannelJoin(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -48,7 +48,7 @@ public interface ChannelKickListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessKick#callChannelKick
 	 */
 	void onChannelKick(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             ChannelClientInfo cKickedClient,
             @FakableArgument ChannelClientInfo cKickedByClient,
             String sReason,

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
@@ -40,5 +40,5 @@ public interface ChannelListModeListener extends CallbackInterface {
 	 * @param cChannel Channel which the ListModes reply is for
 	 * @see com.dmdirc.parser.irc.ProcessListModes#callChannelGotListModes
 	 */
-	void onChannelGotListModes(Parser tParser, IRCChannelInfo cChannel);
+	void onChannelGotListModes(Parser tParser, ChannelInfo cChannel);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -49,7 +49,7 @@ public interface ChannelMessageListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelMessage
 	 */
 	void onChannelMessage(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -49,7 +49,7 @@ public interface ChannelModeChangeListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessMode#callChannelModeChanged
 	 */
 	void onChannelModeChanged(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             @FakableSource String sHost,
             String sModes);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -51,7 +51,7 @@ public interface ChannelModeMessageListener extends CallbackInterface {
 	 */
 	void onChannelModeMessage(@FakableSource Parser tParser,
             char prefix,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -51,7 +51,7 @@ public interface ChannelModeNoticeListener extends CallbackInterface {
 	 */
 	void onChannelModeNotice(@FakableSource Parser tParser,
             char prefix,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
@@ -38,5 +38,5 @@ public interface ChannelNamesListener extends CallbackInterface {
 	 * @param cChannel Channel which the names reply is for
 	 * @see com.dmdirc.parser.irc.ProcessNames#callChannelGotNames
 	 */
-	void onChannelGotNames(Parser tParser, IRCChannelInfo cChannel);
+	void onChannelGotNames(Parser tParser, ChannelInfo cChannel);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
@@ -43,5 +43,5 @@ public interface ChannelNickChangeListener extends CallbackInterface {
 	 * @param sOldNick Nickname before change
 	 * @see com.dmdirc.parser.irc.ProcessNick#callChannelNickChanged
 	 */
-	 void onChannelNickChanged(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
+	 void onChannelNickChanged(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -48,7 +48,7 @@ public interface ChannelNonUserModeChangeListener extends CallbackInterface {
 	 * @param sModes String showing the exact mode change parsed. (Not including user modes)
 	 */
 	void onChannelNonUserModeChanged(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             @FakableSource String sHost,
             String sModes);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -49,7 +49,7 @@ public interface ChannelNoticeListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelNotice
 	 */
 	void onChannelNotice(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
@@ -41,5 +41,5 @@ public interface ChannelOtherAwayStateListener extends CallbackInterface {
 	 * @param state Away State (true if away, false if here)
 	 * @see com.dmdirc.parser.irc.ProcessAway#callChannelAwayStateOther
 	 */
-	void onChannelAwayStateOther(Parser tParser, IRCChannelInfo channel, ChannelClientInfo channelClient, boolean state);
+	void onChannelAwayStateOther(Parser tParser, ChannelInfo channel, ChannelClientInfo channelClient, boolean state);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
@@ -43,5 +43,5 @@ public interface ChannelPartListener extends CallbackInterface {
 	 * @param sReason Reason given for parting (May be "")
 	 * @see com.dmdirc.parser.irc.ProcessPart#callChannelPart
 	 */
-	void onChannelPart(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
+	void onChannelPart(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
@@ -43,5 +43,5 @@ public interface ChannelQuitListener extends CallbackInterface {
 	 * @param sReason Quit reason
 	 * @see com.dmdirc.parser.irc.ProcessQuit#callChannelQuit
 	 */
-	void onChannelQuit(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
+	void onChannelQuit(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
 }

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 
 /** 
  * Called When we join a channel.
@@ -38,5 +38,5 @@ public interface ChannelSelfJoinListener extends CallbackInterface {
 	 * @param cChannel Channel Object
 	 * @see com.dmdirc.parser.irc.ProcessJoin#callChannelSelfJoin
 	 */
-	void onChannelSelfJoin(Parser tParser, IRCChannelInfo cChannel);
+	void onChannelSelfJoin(Parser tParser, ChannelInfo cChannel);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -48,7 +48,7 @@ public interface ChannelSingleModeChangeListener extends CallbackInterface {
 	 * @param sModes String parsed (ie "+m" or "+k moo"
 	 */
 	void onChannelSingleModeChanged(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             @FakableSource String sHost,
             String sModes);

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
@@ -41,5 +41,5 @@ public interface ChannelTopicListener extends CallbackInterface {
 	 * @param bIsJoinTopic True when getting topic on join, false if set by user/server
 	 * @see com.dmdirc.parser.irc.ProcessTopic#callChannelTopic
 	 */
-	void onChannelTopic(Parser tParser, IRCChannelInfo cChannel, boolean bIsJoinTopic);
+	void onChannelTopic(Parser tParser, ChannelInfo cChannel, boolean bIsJoinTopic);
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.callbacks.FakableArgument;
 import com.dmdirc.parser.irc.callbacks.FakableSource;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
@@ -48,7 +48,7 @@ public interface ChannelUserModeChangeListener extends CallbackInterface {
 	 * @see com.dmdirc.parser.irc.ProcessMode#callChannelUserModeChanged
 	 */
 	void onChannelUserModeChanged(@FakableSource Parser tParser,
-            @FakableSource IRCChannelInfo cChannel,
+            @FakableSource ChannelInfo cChannel,
             ChannelClientInfo cChangedClient,
             @FakableArgument ChannelClientInfo cSetByClient,
             @FakableSource String sHost,

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
 
 /**
  * Called when we or another user change nickname.

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**

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

@@ -22,8 +22,9 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
+
 /** 
  * Called When we, or another client quits IRC (Called once in total).
  * This is called BEFORE client has been removed from the channel.

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
 
 /** 
  * Called when user modes are changed.

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.interfaces.callbacks;
 
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ClientInfo;
 
 /** 
  * Called when user modes are Discovered.

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

@@ -22,6 +22,9 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,9 +41,9 @@ public class ChannelClientInfo {
 	/** Integer representation of the channel modes assocated with this user. */
 	private long nModes;
 	/** Reference to the parser object that owns this channelclient, Used for modes. */
-	private final IRCParser myParser;
+	private final Parser myParser;
 	/** Reference to the channel object that owns this channelclient. */
-	private final IRCChannelInfo myChannel;
+	private final ChannelInfo myChannel;
 	/** A Map to allow applications to attach misc data to this object */
 	private Map myMap;
 	
@@ -51,7 +54,7 @@ public class ChannelClientInfo {
 	 * @param client Client that this channelclient represents
 	 * @param channel Channel that owns this channelclient
 	 */	
-	public ChannelClientInfo(final IRCParser tParser, final ClientInfo client, final IRCChannelInfo channel) {
+	public ChannelClientInfo(final Parser tParser, final ClientInfo client, final ChannelInfo channel) {
 		myMap = new HashMap<Object, Object>();
 		myParser = tParser;
 		cClient = client;
@@ -90,7 +93,7 @@ public class ChannelClientInfo {
 	 *
 	 * @return Channel object that owns this ChannelClient
 	 */
-	public IRCChannelInfo getChannel() { return myChannel; }
+	public ChannelInfo getChannel() { return myChannel; }
 	/**
 	 * Get the nickname of the client object represented by this channelclient.
 	 *

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.HashMap;
@@ -38,7 +39,7 @@ import java.util.Queue;
  * @author Chris Smith
  * @see IRCParser
  */
-public class IRCChannelInfo implements ChannelInfo {
+class IRCChannelInfo implements ChannelInfo {
 	/**
 	 * Boolean repreenting the status of names requests.
 	 * When this is false, any new names reply will cause current known channelclients to be removed.
@@ -122,7 +123,7 @@ public class IRCChannelInfo implements ChannelInfo {
 	 * Ask the server for all the list modes for this channel.
 	 */
 	public void requestListModes() {
-		final ChannelClientInfo me = getUser(myParser.getMyself());
+		final ChannelClientInfo me = getUser(myParser.getLocalClient());
 		if (me == null) {
 			// In a normal situation of non bouncer-brokenness this won't happen
 			return;
@@ -268,11 +269,11 @@ public class IRCChannelInfo implements ChannelInfo {
 	 * Empty the channel (Remove all known channelclients).
 	 */
 	protected void emptyChannel() {
-		ClientInfo cTemp = null;
+		IRCClientInfo cTemp = null;
 		for (ChannelClientInfo client : hChannelUserList.values()) {
 			cTemp = client.getClient();
 			cTemp.delChannelClientInfo(client);
-			if (cTemp != myParser.getMyself() && !cTemp.checkVisibility()) {
+			if (cTemp != myParser.getLocalClient() && !cTemp.checkVisibility()) {
 				myParser.removeClient(cTemp);
 			}
 		}
@@ -298,12 +299,12 @@ public class IRCChannelInfo implements ChannelInfo {
 	 * @since 0.6
 	 */
 	public ChannelClientInfo getUser(final String sWho, final boolean createFake) {
-		final String who = myParser.getIRCStringConverter().toLowerCase(ClientInfo.parseHost(sWho));
+		final String who = myParser.getIRCStringConverter().toLowerCase(IRCClientInfo.parseHost(sWho));
 		if (hChannelUserList.containsKey(who)) {
 			return hChannelUserList.get(who);
 		}
 		if (createFake) {
-			return new ChannelClientInfo(myParser, (new ClientInfo(myParser, sWho)).setFake(true), this);
+			return new ChannelClientInfo(myParser, (new IRCClientInfo(myParser, sWho)).setFake(true), this);
 		} else {
 			return null;
 		}
@@ -330,7 +331,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 ChannelClientInfo addClient(final ClientInfo cClient) {
+	protected ChannelClientInfo addClient(final IRCClientInfo cClient) {
 		ChannelClientInfo cTemp = getUser(cClient);
 		if (cTemp == null) { 
 			cTemp = new ChannelClientInfo(myParser, cClient, this);
@@ -344,13 +345,13 @@ public class IRCChannelInfo implements ChannelInfo {
 	 *
 	 * @param cClient Client object to be removed from channel
 	 */	
-	protected void delClient(final ClientInfo cClient) {
+	protected void delClient(final IRCClientInfo cClient) {
 		ChannelClientInfo cTemp = null;
 		cTemp = getUser(cClient);
 		if (cTemp != null) {
-			final ClientInfo clTemp = cTemp.getClient();
+			final IRCClientInfo clTemp = cTemp.getClient();
 			clTemp.delChannelClientInfo(cTemp);
-			if (clTemp != myParser.getMyself() && !clTemp.checkVisibility()) {
+			if (clTemp != myParser.getLocalClient() && !clTemp.checkVisibility()) {
 				myParser.removeClient(clTemp);
 			}
 			hChannelUserList.remove(myParser.getIRCStringConverter().toLowerCase(cTemp.getNickname()));

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ClientInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.LinkedList;
@@ -36,7 +37,7 @@ import java.util.Map;
  * @author Chris Smith
  * @see IRCParser
  */
-public final class ClientInfo {
+class IRCClientInfo implements ClientInfo {
 	/** Known nickname of client. */
 	private String sNickname = "";
 	/** Known ident of client. */
@@ -69,7 +70,7 @@ public final class ClientInfo {
 	 * @param sHostmask Hostmask parsed by parseHost to get nickname
 	 * @see ClientInfo#parseHost
 	 */
-	public ClientInfo(final IRCParser tParser, final String sHostmask) { 
+	public IRCClientInfo(final IRCParser tParser, final String sHostmask) {
 		myMap = new HashMap<Object, Object>();
 		setUserBits(sHostmask, true);
 		myParser = tParser;
@@ -112,7 +113,7 @@ public final class ClientInfo {
 	 * @param newValue new value for isFake - True if this is a fake client, else false
 	 * @return this Object
 	 */
-	public ClientInfo setFake(final boolean newValue) { bIsFake = newValue; return this; }
+	public IRCClientInfo setFake(final boolean newValue) { bIsFake = newValue; return this; }
 
 	/**
 	 * Get a nickname of a user from a hostmask.

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
@@ -207,9 +208,9 @@ class IRCParser implements Parser, Runnable {
 	/** Hashtable storing all known clients based on nickname (in lowercase). */
 	private final Map<String, ClientInfo> hClientList = new Hashtable<String, ClientInfo>();
 	/** Hashtable storing all known channels based on chanel name (inc prefix - in lowercase). */
-	private final Map<String, IRCChannelInfo> hChannelList = new Hashtable<String, IRCChannelInfo>();
+	private final Map<String, ChannelInfo> hChannelList = new Hashtable<String, ChannelInfo>();
 	/** Reference to the ClientInfo object that references ourself. */
-	private ClientInfo cMyself = new ClientInfo(this, "myself").setFake(true);
+	private IRCClientInfo cMyself = new IRCClientInfo(this, "myself").setFake(true);
 	/** Hashtable storing all information gathered from 005. */
 	final Map<String, String> h005Info = new Hashtable<String, String>();
 
@@ -596,7 +597,7 @@ class IRCParser implements Parser, Runnable {
 		sServerName = "";
 		sNetworkName = "";
 		lastLine = "";
-		cMyself = new ClientInfo(this, "myself").setFake(true);
+		cMyself = new IRCClientInfo(this, "myself").setFake(true);
 
 		stopPingTimer();
 
@@ -879,7 +880,7 @@ class IRCParser implements Parser, Runnable {
 	 * @return ClientInfo Object for the client, or null
 	 */
 	public ClientInfo getClientInfo(final String sHost) {
-		final String sWho = getIRCStringConverter().toLowerCase(ClientInfo.parseHost(sHost));
+		final String sWho = getIRCStringConverter().toLowerCase(IRCClientInfo.parseHost(sHost));
 		if (hClientList.containsKey(sWho)) { return hClientList.get(sWho); }
 		else { return null; }
 	}
@@ -891,9 +892,9 @@ class IRCParser implements Parser, Runnable {
 	 * @return ClientInfo Object for the client.
 	 */
 	public ClientInfo getClientInfoOrFake(final String sHost) {
-		final String sWho = getIRCStringConverter().toLowerCase(ClientInfo.parseHost(sHost));
+		final String sWho = getIRCStringConverter().toLowerCase(IRCClientInfo.parseHost(sHost));
 		if (hClientList.containsKey(sWho)) { return hClientList.get(sWho); }
-		else { return new ClientInfo(this, sHost).setFake(true); }
+		else { return new IRCClientInfo(this, sHost).setFake(true); }
 	}
 
 	/** {@inheritDoc} */
@@ -1981,12 +1982,9 @@ class IRCParser implements Parser, Runnable {
 		return pingNeeded.get();
 	}
 
-	/**
-	 * Get a reference to the cMyself object.
-	 *
-	 * @return cMyself reference
-	 */
-	public ClientInfo getMyself() { return cMyself; }
+	/** {@inheritDoc} */
+        @Override
+	public ClientInfo getLocalClient() { return cMyself; }
 
 	/**
 	 * Get the current nickname.
@@ -2028,7 +2026,7 @@ class IRCParser implements Parser, Runnable {
 	 *
 	 * @param client Client to remove
 	 */
-	public void removeClient(final ClientInfo client) {
+	public void removeClient(final IRCClientInfo client) {
 		if (client != cMyself) {
 			forceRemoveClient(client);
 		}
@@ -2040,7 +2038,7 @@ class IRCParser implements Parser, Runnable {
 	 *
 	 * @param client Client to remove
 	 */
-	protected void forceRemoveClient(final ClientInfo client) {
+	protected void forceRemoveClient(final IRCClientInfo client) {
 		hClientList.remove(getIRCStringConverter().toLowerCase(client.getNickname()));
 	}
 
@@ -2067,7 +2065,7 @@ class IRCParser implements Parser, Runnable {
 	 */
 	public void clearClients() {
 		hClientList.clear();
-		addClient(getMyself());
+		addClient(getLocalClient());
 	}
 
 	/**
@@ -2086,7 +2084,7 @@ class IRCParser implements Parser, Runnable {
 	 *
 	 * @param channel Channel to remove
 	 */
-	public void removeChannel(final IRCChannelInfo channel) {
+	public void removeChannel(final ChannelInfo channel) {
 		synchronized (hChannelList) {
 			hChannelList.remove(getIRCStringConverter().toLowerCase(channel.getName()));
 		}
@@ -2103,14 +2101,11 @@ class IRCParser implements Parser, Runnable {
 		}
 	}
 
-	/**
-	 * Get the known channels as a collection.
-	 *
-	 * @return Known channels as a collection
-	 */
-	public Collection<IRCChannelInfo> getChannels() {
+	/** {@inheritDoc} */
+        @Override
+	public Collection<ChannelInfo> getChannels() {
 		synchronized (hChannelList) {
-			return hChannelList.values();
+                    return hChannelList.values();
 		}
 	}
 

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

@@ -103,7 +103,7 @@ public abstract class IRCProcessor {
 	 * @param sWho Who can be any valid identifier for a client as long as it contains a nickname (?:)nick(?!ident)(?@host)
 	 * @return ClientInfo Object for the client, or null
 	 */
-	protected final ClientInfo getClientInfo(final String sWho) {
+	protected final IRCClientInfo getClientInfo(final String sWho) {
 		return myParser.getClientInfo(sWho);
 	}
 	

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

@@ -42,22 +42,22 @@ public class Process001 extends IRCProcessor {
 		final String sNick = token[2];
 				
 		// myself will be fake if we havn't recieved a 001 yet
-		if (myParser.getMyself().isFake()) {
+		if (myParser.getLocalClient().isFake()) {
 			// Update stored information
-			myParser.getMyself().setUserBits(sNick, true, true);
-			myParser.getMyself().setFake(false);
-			myParser.addClient(myParser.getMyself());
+			myParser.getLocalClient().setUserBits(sNick, true, true);
+			myParser.getLocalClient().setFake(false);
+			myParser.addClient(myParser.getLocalClient());
 		} else {
 			// Another 001? if nicknames change then we need to update the hashtable
-			if (!myParser.getMyself().getNickname().equalsIgnoreCase(sNick)) {
+			if (!myParser.getLocalClient().getNickname().equalsIgnoreCase(sNick)) {
 				// Nick changed, remove old me
-				myParser.forceRemoveClient(myParser.getMyself());
+				myParser.forceRemoveClient(myParser.getLocalClient());
 				/// Update stored information
-				myParser.getMyself().setUserBits(sNick, true, true);
+				myParser.getLocalClient().setUserBits(sNick, true, true);
 				// Check that we don't already know someone by this name
-				if (myParser.getClientInfo(myParser.getMyself().getNickname()) == null) {
+				if (myParser.getClientInfo(myParser.getLocalClient().getNickname()) == null) {
 					// And add to list
-					myParser.addClient(myParser.getMyself());
+					myParser.addClient(myParser.getLocalClient());
 				} else {
 					// Someone else already know? this is bad!
 					myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "001 overwrites existing client?", myParser.getLastLine()));

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

@@ -84,8 +84,8 @@ public class Process004005 extends IRCProcessor {
 						// This means that the casemapping is not rfc1459
 						// We have only added ourselves so far (from 001)
 						// We can fix the hashtable easily.
-						myParser.removeClient(myParser.getMyself());
-						myParser.addClient(myParser.getMyself());
+						myParser.removeClient(myParser.getLocalClient());
+						myParser.addClient(myParser.getLocalClient());
 					}
 				} else if (sKey.equals("CHANTYPES")) {
 					myParser.parseChanPrefix();

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

@@ -37,11 +37,11 @@ public class ProcessAway extends IRCProcessor {
 	@Override
 	public void process(String sParam, String[] token) {
 		if (sParam.equals("301")) {
-			ClientInfo iClient = myParser.getClientInfo(token[3]);
+			IRCClientInfo iClient = myParser.getClientInfo(token[3]);
 			if (iClient != null) { iClient.setAwayReason(token[token.length-1]); }
 		} else {
-			myParser.getMyself().setAwayState(sParam.equals("306"));
-			callAwayState(myParser.getMyself().getAwayState(), myParser.getMyself().getAwayReason());
+			myParser.getLocalClient().setAwayState(sParam.equals("306"));
+			callAwayState(myParser.getLocalClient().getAwayState(), myParser.getLocalClient().getAwayReason());
 		}
 	}
 	

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

@@ -50,7 +50,7 @@ public class ProcessJoin extends IRCProcessor {
 			// :nick!ident@host JOIN (:)#Channel
 			Byte nTemp;
 			if (token.length < 3) { return; }
-			ClientInfo iClient;
+			IRCClientInfo iClient;
 			IRCChannelInfo iChannel;
 			ChannelClientInfo iChannelClient;
 			
@@ -58,13 +58,13 @@ public class ProcessJoin extends IRCProcessor {
 			iChannel = myParser.getChannel(token[token.length-1]);
 			
 			if (iClient == null) { 
-				iClient = new ClientInfo(myParser, token[0]);
+				iClient = new IRCClientInfo(myParser, token[0]);
 				myParser.addClient(iClient);
 			}
 			// Check to see if we know the host/ident for this client to facilitate dmdirc Formatter
 			if (iClient.getHost().isEmpty()) { iClient.setUserBits(token[0],false); }
 			if (iChannel != null) {
-				if (iClient == myParser.getMyself()) {
+				if (iClient == myParser.getLocalClient()) {
 					try {
 						if (iChannel.getUser(iClient) != null) {
 							// If we are joining a channel we are already on, fake a part from

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

@@ -41,8 +41,8 @@ public class ProcessKick extends IRCProcessor {
 		ChannelClientInfo iChannelClient;
 		ChannelClientInfo iChannelKicker;
 		ChannelInfo iChannel;
-		ClientInfo iClient;
-		ClientInfo iKicker;
+		IRCClientInfo iClient;
+		IRCClientInfo iKicker;
 		String sReason = "";
 		
 		iClient = getClientInfo(token[3]);
@@ -57,7 +57,7 @@ public class ProcessKick extends IRCProcessor {
 		}
 
 		if (iChannel == null) { 
-			if (iClient != myParser.getMyself()) {
+			if (iClient != myParser.getLocalClient()) {
 				callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel ("+token[2]+") that I am not on. [User: "+token[3]+"]", myParser.getLastLine()));
 			}
 			return;
@@ -72,7 +72,7 @@ public class ProcessKick extends IRCProcessor {
 			if (myParser.removeAfterCallback) { callChannelKick(iChannel,iChannelClient,iChannelKicker,sReason,token[0]); }
 			iChannel.delClient(iClient);
 			if (!myParser.removeAfterCallback) { callChannelKick(iChannel,iChannelClient,iChannelKicker,sReason,token[0]); }
-			if (iClient == myParser.getMyself()) {
+			if (iClient == myParser.getLocalClient()) {
 				iChannel.emptyChannel();
 				myParser.removeChannel(iChannel);
 			}

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

@@ -91,7 +91,7 @@ public class ProcessMessage extends IRCProcessor {
 		
 		ChannelClientInfo iChannelClient = null;
 		ChannelInfo iChannel = null;
-		ClientInfo iClient = null;
+		IRCClientInfo iClient = null;
 		// "nick!user@host PRIVMSG #Channel" should be processed as "nick!user@host PRIVMSG #Channel :"
 		if (token.length < 4) {
 			sMessage = "";
@@ -239,7 +239,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelAction(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelAction(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelActionListener.class).call(cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -254,7 +254,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelCTCP(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
+	protected boolean callChannelCTCP(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelCtcpListener.class).call(cChannel, cChannelClient, sType, sMessage, sHost);
 	}
 
@@ -269,7 +269,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelCTCPReply(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
+	protected boolean callChannelCTCPReply(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelCtcpReplyListener.class).call(cChannel, cChannelClient, sType, sMessage, sHost);
 	}
 	
@@ -283,7 +283,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelMessage(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelMessage(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelMessageListener.class).call(cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -297,7 +297,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelNotice(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelNotice(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelNoticeListener.class).call(cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -312,7 +312,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelModeNotice(final char prefix, final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelModeNotice(final char prefix, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelModeNoticeListener.class).call(prefix, cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -327,7 +327,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelModeMessage(final char prefix, final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelModeMessage(final char prefix, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelModeMessageListener.class).call(prefix, cChannel, cChannelClient, sMessage, sHost);
 	}
 	

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelSingleModeChangeListener;
@@ -91,7 +92,7 @@ public class ProcessMode extends IRCProcessor {
 		char cPositive = '+';
 		ChannelInfo iChannel;
 		ChannelClientInfo iChannelClientInfo;
-		ClientInfo iClient;
+		IRCClientInfo iClient;
 		ChannelClientInfo setterCCI;
 		
 		CallbackObject cbSingle = null;
@@ -141,11 +142,9 @@ public class ProcessMode extends IRCProcessor {
 					iChannelClientInfo = iChannel.getUser(sModeParam);
 					if (iChannelClientInfo == null) {
 						// Client not known?
-//						callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got mode for client not known on channel - Added", myParser.getLastLine()));
 						iClient = getClientInfo(sModeParam);
 						if (iClient == null) { 
-//							callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got mode for client not known at all - Added", myParser.getLastLine()));
-							iClient = new ClientInfo(myParser, sModeParam);
+							iClient = new IRCClientInfo(myParser, sModeParam);
 							myParser.addClient(iClient);
 						}
 						iChannelClientInfo = iChannel.addClient(iClient);
@@ -158,7 +157,6 @@ public class ProcessMode extends IRCProcessor {
 					continue;
 				} else {
 					// unknown mode - add as boolean
-//					callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got unknown mode "+cMode+" - Added as boolean mode", myParser.getLastLine()));
 					myParser.hChanModesBool.put(cMode,myParser.nNextKeyCMBool);
 					nValue = myParser.nNextKeyCMBool;
 					bBooleanMode = true;
@@ -230,7 +228,7 @@ public class ProcessMode extends IRCProcessor {
 		long nCurrent = 0, nValue = 0;
 		boolean bPositive = true;
 		
-		ClientInfo iClient;
+		IRCClientInfo iClient;
 		
 		iClient = getClientInfo(token[2]);
 		if (iClient == null) { return; }
@@ -280,7 +278,7 @@ public class ProcessMode extends IRCProcessor {
 	 * @param sModes Exact String parsed
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelModeChanged(IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes) {
+	protected boolean callChannelModeChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes) {
 		return getCallbackManager().getCallbackType(ChannelModeChangeListener.class).call(cChannel, cChannelClient, sHost, sModes);
 	}
 	
@@ -295,7 +293,7 @@ public class ProcessMode extends IRCProcessor {
 	 * @param sHost Host doing the mode changing (User host or server name)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelUserModeChanged(IRCChannelInfo cChannel, ChannelClientInfo cChangedClient, ChannelClientInfo cSetByClient, String sHost, String sMode) {
+	protected boolean callChannelUserModeChanged(ChannelInfo cChannel, ChannelClientInfo cChangedClient, ChannelClientInfo cSetByClient, String sHost, String sMode) {
 		return getCallbackManager().getCallbackType(ChannelUserModeChangeListener.class).call(cChannel, cChangedClient, cSetByClient, sHost, sMode);
 	}
 	

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

@@ -54,7 +54,7 @@ public class ProcessNames extends IRCProcessor {
 		} else {
 			// Names
 			
-			ClientInfo iClient;
+			IRCClientInfo iClient;
 			ChannelClientInfo iChannelClient;
 			
 			iChannel = getChannel(token[4]);
@@ -90,7 +90,7 @@ public class ProcessNames extends IRCProcessor {
 				callDebugInfo(IRCParser.DEBUG_INFO, "Name: %s Modes: \"%s\" [%d]",sName,sModes.toString(),nPrefix);
 				
 				iClient = getClientInfo(sName);
-				if (iClient == null) { iClient = new ClientInfo(myParser, sName); myParser.addClient(iClient); }
+				if (iClient == null) { iClient = new IRCClientInfo(myParser, sName); myParser.addClient(iClient); }
 				iChannelClient = iChannel.addClient(iClient);
 				iChannelClient.setChanMode(nPrefix);
 
@@ -108,7 +108,7 @@ public class ProcessNames extends IRCProcessor {
 	 * @param cChannel Channel which the names reply is for
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelGotNames(IRCChannelInfo cChannel) {
+	protected boolean callChannelGotNames(ChannelInfo cChannel) {
 		return getCallbackManager().getCallbackType(ChannelNamesListener.class).call(cChannel);
 	}
 	

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 
@@ -37,7 +38,7 @@ public class ProcessNick extends IRCProcessor {
 	 */
 	@Override
 	public void process(String sParam, String[] token) {
-		ClientInfo iClient;
+		IRCClientInfo iClient;
 		ChannelClientInfo iChannelClient;
 		String oldNickname;
 		
@@ -61,7 +62,7 @@ public class ProcessNick extends IRCProcessor {
 					myParser.addClient(iClient);
 				}
 				
-				for (IRCChannelInfo iChannel : myParser.getChannels()) {
+				for (ChannelInfo iChannel : myParser.getChannels()) {
 					// Find the user (using the old nickname)
 					iChannelClient = iChannel.getUser(oldNickname);
 					if (iChannelClient != null) {
@@ -71,11 +72,11 @@ public class ProcessNick extends IRCProcessor {
 						if (!isSameNick) {
 							iChannel.renameClient(oldNickname, iChannelClient);
 						}
-						callChannelNickChanged(iChannel,iChannelClient,ClientInfo.parseHost(token[0]));
+						callChannelNickChanged(iChannel,iChannelClient,IRCClientInfo.parseHost(token[0]));
 					}
 				}
 				
-				callNickChanged(iClient, ClientInfo.parseHost(token[0]));
+				callNickChanged(iClient, IRCClientInfo.parseHost(token[0]));
 			}
 		}
 		
@@ -102,7 +103,7 @@ public class ProcessNick extends IRCProcessor {
 	 * @param sOldNick Nickname before change
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callNickChanged(ClientInfo cClient, String sOldNick) {
+	protected boolean callNickChanged(IRCClientInfo cClient, String sOldNick) {
 		return getCallbackManager().getCallbackType(NickChangeListener.class).call(cClient, sOldNick);
 	}
 	

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

@@ -41,7 +41,7 @@ public class ProcessPart extends IRCProcessor {
 		// :nick!ident@host PART #Channel
 		// :nick!ident@host PART #Channel :reason
 		if (token.length < 3) { return; }
-		ClientInfo iClient;
+		IRCClientInfo iClient;
 		ChannelInfo iChannel;
 		ChannelClientInfo iChannelClient;
 		
@@ -54,7 +54,7 @@ public class ProcessPart extends IRCProcessor {
 			iClient.setUserBits(token[0],false);
 		}
 		if (iChannel == null) { 
-			if (iClient != myParser.getMyself()) {
+			if (iClient != myParser.getLocalClient()) {
 				callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") that I am not on. [User: "+token[0]+"]", myParser.getLastLine()));
 			}
 			return;
@@ -70,7 +70,7 @@ public class ProcessPart extends IRCProcessor {
 			callDebugInfo(IRCParser.DEBUG_INFO, "Removing %s from %s",iClient.getNickname(),iChannel.getName());
 			iChannel.delClient(iClient);
 			if (!myParser.removeAfterCallback) { callChannelPart(iChannel,iChannelClient,sReason); }
-			if (iClient == myParser.getMyself()) {
+			if (iClient == myParser.getLocalClient()) {
 				iChannel.emptyChannel();
 				myParser.removeChannel(iChannel);
 			}
@@ -86,7 +86,7 @@ public class ProcessPart extends IRCProcessor {
 	 * @param sReason Reason given for parting (May be "")
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelPart(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
+	protected boolean callChannelPart(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
 		return getCallbackManager().getCallbackType(ChannelPartListener.class).call(cChannel, cChannelClient, sReason);
 	}
 	

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.irc;
 
+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 java.util.ArrayList;
@@ -42,7 +44,7 @@ public class ProcessQuit extends IRCProcessor {
 		// :nick!ident@host QUIT
 		// :nick!ident@host QUIT :reason
 		if (token.length < 2) { return; }
-		ClientInfo iClient;
+		IRCClientInfo iClient;
 		ChannelClientInfo iChannelClient;
 		
 		iClient = getClientInfo(token[0]);
@@ -55,12 +57,12 @@ public class ProcessQuit extends IRCProcessor {
 		String sReason = "";
 		if (token.length > 2) { sReason = token[token.length-1]; }
 		
-		ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(myParser.getChannels());
-		for (IRCChannelInfo iChannel : channelList) {
+		ArrayList<ChannelInfo> channelList = new ArrayList<ChannelInfo>(myParser.getChannels());
+		for (ChannelInfo iChannel : channelList) {
 			iChannelClient = iChannel.getUser(iClient);
 			if (iChannelClient != null) {
 				if (myParser.removeAfterCallback) { callChannelQuit(iChannel,iChannelClient,sReason); }
-				if (iClient == myParser.getMyself()) {
+				if (iClient == myParser.getLocalClient()) {
 					iChannel.emptyChannel();
 					myParser.removeChannel(iChannel);
 				} else {
@@ -71,7 +73,7 @@ public class ProcessQuit extends IRCProcessor {
 		}
 
 		if (myParser.removeAfterCallback) { callQuit(iClient,sReason); }
-		if (iClient == myParser.getMyself()) {
+		if (iClient == myParser.getLocalClient()) {
 			myParser.clearClients();
 		} else {
 			myParser.removeClient(iClient);
@@ -88,7 +90,7 @@ public class ProcessQuit extends IRCProcessor {
 	 * @param sReason Quit reason
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelQuit(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
+	protected boolean callChannelQuit(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
 		return getCallbackManager().getCallbackType(ChannelQuitListener.class).call(cChannel, cChannelClient, sReason);
 	}
 	

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

@@ -56,7 +56,7 @@ public class ProcessTopic extends IRCProcessor {
 			}
 		} else {
 			if (IRCParser.ALWAYS_UPDATECLIENT) {
-				final ClientInfo iClient = getClientInfo(token[0]);
+				final IRCClientInfo iClient = getClientInfo(token[0]);
 				if (iClient != null && iClient.getHost().isEmpty()) {iClient.setUserBits(token[0],false); }
 			}
 			iChannel = getChannel(token[2]);

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
+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;
@@ -62,13 +64,13 @@ public class ProcessWho extends IRCProcessor {
 			if (client.getAwayState() != isAway) {
 				client.setAwayState(isAway);
 				if (!isAway) { client.setAwayReason(""); }
-				if (client == myParser.getMyself()) {
+				if (client == myParser.getLocalClient()) {
 					callAwayState(client.getAwayState(), client.getAwayReason());
 				} else {
 					callAwayStateOther(client, isAway);
 					
 					ChannelClientInfo iChannelClient;
-					for (IRCChannelInfo iChannel : myParser.getChannels()) {
+					for (ChannelInfo iChannel : myParser.getChannels()) {
 						iChannelClient = iChannel.getUser(client);
 						if (iChannelClient != null) {
 							callChannelAwayStateOther(iChannel,iChannelClient,isAway);
@@ -112,7 +114,7 @@ public class ProcessWho extends IRCProcessor {
 	 * @param state Away State (true if away, false if here)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelAwayStateOther(final IRCChannelInfo channel, final ChannelClientInfo channelClient, final boolean state) {
+	protected boolean callChannelAwayStateOther(final ChannelInfo channel, final ChannelClientInfo channelClient, final boolean state) {
 		return getCallbackManager().getCallbackType(ChannelOtherAwayStateListener.class).call(channel, channelClient, state);
 	}
 	

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.irc.callbacks;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.ParserError;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
@@ -62,7 +62,7 @@ public class CallbackObjectSpecific extends CallbackObject {
 	 * @param cChannel ChannelInfo object for the channel to test
 	 * @return true if channel given matches the specifics for the method given
 	 */
-	protected boolean isValidChan(final CallbackInterface eMethod, final IRCChannelInfo cChannel) {
+	protected boolean isValidChan(final CallbackInterface eMethod, final ChannelInfo cChannel) {
 		if (specificData.containsKey(eMethod)) { 
 			if (!myParser.getIRCStringConverter().equalsIgnoreCase(cChannel.getName(), specificData.get(eMethod))) { return false; }
 		}
@@ -144,9 +144,9 @@ public class CallbackObjectSpecific extends CallbackObject {
             if (type.isAnnotationPresent(SpecificCallback.class) &&
                     ((args[0] instanceof ClientInfo
                         && !isValidUser(iface, ((ClientInfo) args[0]).getHost()))
-                        || (args[0] instanceof IRCChannelInfo
-                        && !isValidChan(iface, (IRCChannelInfo) args[0]))
-                        || (!(args[0] instanceof ClientInfo || args[0] instanceof IRCChannelInfo) &&
+                        || (args[0] instanceof ChannelInfo
+                        && !isValidChan(iface, (ChannelInfo) args[0]))
+                        || (!(args[0] instanceof ClientInfo || args[0] instanceof ChannelInfo) &&
                         args[args.length - 1] instanceof String
                         && !isValidUser(iface, (String) args[args.length - 1])))) {
                 continue;

test/com/dmdirc/harness/parser/TestINickChanged.java

@@ -28,10 +28,10 @@ import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 public class TestINickChanged implements NickChangeListener {
 
     public String oldNick = null;
-    public ClientInfo client;
+    public IRCClientInfo client;
 
     @Override
-    public void onNickChanged(IRCParser tParser, ClientInfo cClient,
+    public void onNickChanged(IRCParser tParser, IRCClientInfo cClient,
                               String sOldNick) {
         oldNick = sOldNick;
         client = cClient;

test/com/dmdirc/harness/parser/TestIQuit.java

@@ -32,7 +32,7 @@ public class TestIQuit implements ChannelQuitListener, QuitListener {
 
     public ChannelClientInfo cclient;
 
-    public ClientInfo client;
+    public IRCClientInfo client;
 
     public String reason;
 
@@ -46,7 +46,7 @@ public class TestIQuit implements ChannelQuitListener, QuitListener {
         this.count++;
     }
 
-    public void onQuit(IRCParser tParser, ClientInfo cClient, String sReason) {
+    public void onQuit(IRCParser tParser, IRCClientInfo cClient, String sReason) {
         this.client = cClient;
         this.reason = sReason;
         this.count++;

test/com/dmdirc/parser/irc/ClientInfoTest.java

@@ -32,7 +32,7 @@ public class ClientInfoTest {
     
     @Test
     public void testMap() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         final Map map = new HashMap();
         
         ci.setMap(map);
@@ -41,7 +41,7 @@ public class ClientInfoTest {
     
     @Test
     public void testFake() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         assertFalse(ci.isFake());
         ci.setFake(true);
         assertTrue(ci.isFake());
@@ -55,9 +55,9 @@ public class ClientInfoTest {
         final String string2 = "nick";
         final String string3 = ":nick@host";
         
-        assertEquals("nick", ClientInfo.parseHost(string1));
-        assertEquals("nick", ClientInfo.parseHost(string2));
-        assertEquals("nick", ClientInfo.parseHost(string3));
+        assertEquals("nick", IRCClientInfo.parseHost(string1));
+        assertEquals("nick", IRCClientInfo.parseHost(string2));
+        assertEquals("nick", IRCClientInfo.parseHost(string3));
     }
     
     @Test
@@ -66,18 +66,18 @@ public class ClientInfoTest {
         final String string2 = "nick";
         final String string3 = ":nick@host";
         
-        assertEquals("nick", ClientInfo.parseHostFull(string1)[0]);
-        assertEquals("ident", ClientInfo.parseHostFull(string1)[1]);
-        assertEquals("host", ClientInfo.parseHostFull(string1)[2]);
+        assertEquals("nick", IRCClientInfo.parseHostFull(string1)[0]);
+        assertEquals("ident", IRCClientInfo.parseHostFull(string1)[1]);
+        assertEquals("host", IRCClientInfo.parseHostFull(string1)[2]);
         
-        assertEquals("nick", ClientInfo.parseHostFull(string2)[0]);
-        assertEquals("nick", ClientInfo.parseHostFull(string3)[0]);
-        assertEquals("host", ClientInfo.parseHostFull(string3)[2]);
+        assertEquals("nick", IRCClientInfo.parseHostFull(string2)[0]);
+        assertEquals("nick", IRCClientInfo.parseHostFull(string3)[0]);
+        assertEquals("host", IRCClientInfo.parseHostFull(string3)[2]);
     }
     
     @Test
     public void testSetUserBits() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         ci.setUserBits("nick2!ident2@host2", false);
         
         assertEquals("nick", ci.getNickname());
@@ -93,13 +93,13 @@ public class ClientInfoTest {
     
     @Test
     public void testToString() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         assertEquals("nick!ident@host", ci.toString());
     }
     
     @Test
     public void testAwayState() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         assertFalse(ci.getAwayState());
         ci.setAwayState(true);
         assertTrue(ci.getAwayState());
@@ -107,7 +107,7 @@ public class ClientInfoTest {
     
     @Test
     public void testAwayReason() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         ci.setAwayState(true);
         ci.setAwayReason("away reason");
         
@@ -118,7 +118,7 @@ public class ClientInfoTest {
     
     @Test
     public void testRealName() {
-        final ClientInfo ci = new ClientInfo(null, "nick!ident@host");
+        final IRCClientInfo ci = new IRCClientInfo(null, "nick!ident@host");
         ci.setRealName("abc def");
         assertEquals("abc def", ci.getRealName());
         ci.setRealName("abc 123 def");