Lots of hacking to bring up-to-date with latest version

.gitmodules

@@ -10,3 +10,9 @@
 [submodule "externals/dmdirc-plugins"]
 	path = externals/dmdirc-plugins
 	url = git://dmdirc.com/plugins
+[submodule "externals/dmdirc-util"]
+	path = externals/dmdirc-util
+	url = git://dmdirc.com/util
+[submodule "externals/dmdirc-parser"]
+	path = externals/dmdirc-parser
+	url = git://dmdirc.com/parser

externals/dmdirc

@@ -1 +1 @@
-Subproject commit 6c94f9f39d644a6e5ac421701acdfe49c313c037
+Subproject commit 8e2493dd6de5a9d4b63b1c40f24dd0ea1e28a215

externals/dmdirc-parser

@@ -0,0 +1 @@
+Subproject commit 9e6834de99f6cb14f890c8dbc6911b65ea5c65a0

externals/dmdirc-util

@@ -0,0 +1 @@
+Subproject commit fbd836e534e10f036625cb65cc1f468758a15027

nbproject/build-impl.xml

@@ -133,6 +133,8 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.src5.dir}"/>
+                <available file="${src.src6.dir}"/>
                 <available file="${src.src4.dir}"/>
                 <available file="${src.src2.dir}"/>
                 <available file="${src.src3.dir}"/>
@@ -193,6 +195,8 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.src5.dir">Must set src.src5.dir</fail>
+        <fail unless="src.src6.dir">Must set src.src6.dir</fail>
         <fail unless="src.src4.dir">Must set src.src4.dir</fail>
         <fail unless="src.src2.dir">Must set src.src2.dir</fail>
         <fail unless="src.src3.dir">Must set src.src3.dir</fail>
@@ -219,7 +223,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src5.dir}:${src.src6.dir}:${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -259,7 +263,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src5.dir}:${src.src6.dir}:${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -291,7 +295,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src5.dir}:${src.src6.dir}:${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -585,11 +589,13 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.src5.dir}:${src.src6.dir}:${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.src5.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.src6.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src4.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src2.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -615,7 +621,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src5.dir}:${src.src6.dir}:${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -826,6 +832,12 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.src5.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.src6.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.src4.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -846,6 +858,12 @@ is divided into following sections:
             </fileset>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.src5.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${src.src6.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.src4.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=36c1f676
+build.xml.data.CRC32=3f367bc6
 build.xml.script.CRC32=d4296ee3
 build.xml.stylesheet.CRC32=28e38971@1.40.0.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=36c1f676
-nbproject/build-impl.xml.script.CRC32=1770fd45
+nbproject/build-impl.xml.data.CRC32=3f367bc6
+nbproject/build-impl.xml.script.CRC32=d8234de7
 nbproject/build-impl.xml.stylesheet.CRC32=fce8b508@1.40.0.45

nbproject/project.properties

@@ -25,10 +25,19 @@ dist.jar=${dist.dir}/charliebravo.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=com/dmdirc/addons/nowplaying/,com/dmdirc/addons/systray/,com/dmdirc/addons/nickcolours/,com/dmdirc/addons/lagdisplay/,com/dmdirc/addons/mediasource_*/,com/dmdirc/addons/ui_swing/,com/dmdirc/addons/dcc/,com/dmdirc/addons/windowstatus/,com/dmdirc/addons/osd/,com/dmdirc/addons/logging/,com/dmdirc/addons/addonbrowser/,uk/co/md87/evetool/ui/,uk/co/md87/evetool/Main.java
+file.reference.commons-codec-1.3.jar=externals/dmdirc-plugins/lib/commons-codec-1.3.jar
+file.reference.commons-lang-2.4.jar=externals/dmdirc-plugins/lib/commons-lang-2.4.jar
 file.reference.jaxen-core.jar=externals/evetool/lib/jaxen-core.jar
 file.reference.jaxen-jdom.jar=externals/evetool/lib/jaxen-jdom.jar
 file.reference.jdom.jar=externals/evetool/lib/jdom.jar
+file.reference.jetty-6.1.22.jar=externals/dmdirc-plugins/lib/jetty-6.1.22.jar
+file.reference.jetty-util-6.1.22.jar=externals/dmdirc-plugins/lib/jetty-util-6.1.22.jar
+file.reference.jxlayer.jar=externals/dmdirc-plugins/lib/jxlayer.jar
+file.reference.miglayout-3.7.3.1-swing.jar=externals/dmdirc-plugins/lib/miglayout-3.7.3.1-swing.jar
 file.reference.saxpath.jar=externals/evetool/lib/saxpath.jar
+file.reference.servlet-api-2.5-20081211.jar=externals/dmdirc-plugins/lib/servlet-api-2.5-20081211.jar
+file.reference.signpost-core-1.1-SNAPSHOT.jar=externals/dmdirc-plugins/lib/signpost-core-1.1-SNAPSHOT.jar
+file.reference.uispec4j-2.2.jar=externals/dmdirc-plugins/lib/uispec4j-2.2.jar
 file.reference.xalan.jar=externals/evetool/lib/xalan.jar
 file.reference.xerces.jar=externals/evetool/lib/xerces.jar
 file.reference.xml-apis.jar=externals/evetool/lib/xml-apis.jar
@@ -41,7 +50,16 @@ javac.classpath=\
     ${file.reference.saxpath.jar}:\
     ${file.reference.xalan.jar}:\
     ${file.reference.xerces.jar}:\
-    ${file.reference.xml-apis.jar}
+    ${file.reference.xml-apis.jar}:\
+    ${file.reference.commons-codec-1.3.jar}:\
+    ${file.reference.commons-lang-2.4.jar}:\
+    ${file.reference.jetty-6.1.22.jar}:\
+    ${file.reference.jetty-util-6.1.22.jar}:\
+    ${file.reference.jxlayer.jar}:\
+    ${file.reference.miglayout-3.7.3.1-swing.jar}:\
+    ${file.reference.servlet-api-2.5-20081211.jar}:\
+    ${file.reference.signpost-core-1.1-SNAPSHOT.jar}:\
+    ${file.reference.uispec4j-2.2.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -85,4 +103,6 @@ src.src.dir=externals/dmdirc/src
 src.src2.dir=externals/evetool/src
 src.src3.dir=externals/dmdirc-plugins/src
 src.src4.dir=externals/util/src
+src.src5.dir=externals/dmdirc-parser/src
+src.src6.dir=externals/dmdirc-util/src
 test.src.dir=test

nbproject/project.xml

@@ -6,6 +6,8 @@
             <name>charliebravo</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
+                <root id="src.src5.dir"/>
+                <root id="src.src6.dir"/>
                 <root id="src.src4.dir"/>
                 <root id="src.src2.dir"/>
                 <root id="src.src3.dir"/>

src/com/md87/charliebravo/CharlieBravo.java

@@ -22,19 +22,22 @@
 
 package com.md87.charliebravo;
 
+import com.dmdirc.parser.common.MyInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.DataInListener;
+import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
+import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
+import com.dmdirc.parser.interfaces.callbacks.Post005Listener;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.MyInfo;
 import com.dmdirc.parser.irc.ServerInfo;
-import com.dmdirc.parser.irc.callbacks.interfaces.IDataIn;
-import com.dmdirc.parser.irc.callbacks.interfaces.IDataOut;
-import com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo;
-import com.dmdirc.parser.irc.callbacks.interfaces.IPost005;
+import java.util.Date;
 
 /**
  *
  * @author chris
  */
-public class CharlieBravo implements Runnable, IPost005, IDebugInfo, IDataIn, IDataOut {
+public class CharlieBravo implements Runnable, Post005Listener,
+        DebugInfoListener, DataInListener, DataOutListener {
 
     protected final Config config = new Config();
     protected final InputHandler handler = new InputHandler(config);
@@ -52,10 +55,10 @@ public class CharlieBravo implements Runnable, IPost005, IDebugInfo, IDataIn, ID
             final IRCParser parser = new IRCParser(myinfo, new ServerInfo(servers[server], 6667, ""));
             handler.setParser(parser);
 
-            parser.getCallbackManager().addCallback("OnPost005", this);
-            parser.getCallbackManager().addCallback("OnDebugInfo", this);
-            parser.getCallbackManager().addCallback("OnDataIn", this);
-            parser.getCallbackManager().addCallback("OnDataOut", this);
+            parser.getCallbackManager().addCallback(Post005Listener.class, this);
+            parser.getCallbackManager().addCallback(DebugInfoListener.class, this);
+            parser.getCallbackManager().addCallback(DataInListener.class, this);
+            parser.getCallbackManager().addCallback(DataOutListener.class, this);
             parser.run();
 
             server = ++server % servers.length;
@@ -68,14 +71,16 @@ public class CharlieBravo implements Runnable, IPost005, IDebugInfo, IDataIn, ID
         }
     }
 
-    public void onPost005(final IRCParser tParser) {
+    @Override
+    public void onPost005(final Parser tParser, final Date date) {
         tParser.joinChannel("#MD87");
         tParser.joinChannel("#DMDirc");
         tParser.joinChannel("#DMDirc.dev");
         tParser.joinChannel("#MDbot");
     }
 
-    public void onDebugInfo(final IRCParser tParser, final int nLevel, final String sData) {
+    @Override
+    public void onDebugInfo(final Parser tParser, final Date date, final int nLevel, final String sData) {
         System.out.println(nLevel + ": " + sData);
     }
 
@@ -83,11 +88,13 @@ public class CharlieBravo implements Runnable, IPost005, IDebugInfo, IDataIn, ID
         new Thread(new CharlieBravo()).start();
     }
 
-    public void onDataIn(final IRCParser tParser, final String sData) {
+    @Override
+    public void onDataIn(final Parser tParser, final Date date, final String sData) {
         System.out.println("<<< " + sData);
     }
 
-    public void onDataOut(final IRCParser tParser, final String sData, final boolean bFromParser) {
+    @Override
+    public void onDataOut(final Parser tParser, final Date date, final String sData, final boolean bFromParser) {
         System.out.println(">>> " + sData);
     }
 

src/com/md87/charliebravo/InputHandler.java

@@ -22,14 +22,17 @@
 
 package com.md87.charliebravo;
 
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
+
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.interfaces.IChannelKick;
-import com.dmdirc.parser.irc.callbacks.interfaces.IChannelMessage;
-import com.dmdirc.parser.irc.callbacks.interfaces.IPrivateCTCP;
-import com.dmdirc.parser.irc.callbacks.interfaces.IPrivateMessage;
+
 import com.dmdirc.util.RollingList;
 import com.md87.charliebravo.commands.AuthenticateCommand;
 import com.md87.charliebravo.commands.CalcCommand;
@@ -51,6 +54,7 @@ import com.md87.charliebravo.commands.TranslateCommand;
 import com.md87.charliebravo.commands.WhoisCommand;
 import com.md87.util.crypto.ArcFourEncrypter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +66,7 @@ import net.miginfocom.Base64;
  *
  * @author chris
  */
-public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateCTCP, IChannelKick {
+public class InputHandler implements ChannelMessageListener, PrivateMessageListener, PrivateCtcpListener, ChannelKickListener {
 
     protected IRCParser parser;
 
@@ -118,24 +122,25 @@ public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateC
     public void setParser(final IRCParser parser) {
         this.parser = parser;
         
-        parser.getCallbackManager().addCallback("OnChannelMessage", this);
-        parser.getCallbackManager().addCallback("OnPrivateMessage", this);
-        parser.getCallbackManager().addCallback("OnPrivateCTCP", this);
-        parser.getCallbackManager().addCallback("OnChannelKick", this);
+        parser.getCallbackManager().addCallback(ChannelMessageListener.class, this);
+        parser.getCallbackManager().addCallback(PrivateMessageListener.class, this);
+        parser.getCallbackManager().addCallback(PrivateCtcpListener.class, this);
+        parser.getCallbackManager().addCallback(ChannelKickListener.class, this);
     }
 
-    public void onChannelMessage(final IRCParser tParser, final ChannelInfo cChannel,
+    @Override
+    public void onChannelMessage(final Parser tParser, final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
         for (String nick : getNicknames()) {
             if (sMessage.matches("^(?i)" + Matcher.quoteReplacement(nick) + "[,:!] .*")) {
-                handleInput(ClientInfo.parseHost(sHost), cChannel.getName(),
+                handleInput(tParser.parseHostmask(sHost)[0], cChannel.getName(),
                         sMessage.substring(nick.length() + 2));
                 break;
             } else if (sMessage.matches("^(?i)" + Matcher.quoteReplacement(nick) + "\\?")
                     && snippets.containsKey(cChannel.getName())) {
                 final RollingList<String> snips = snippets.get(cChannel.getName());
                 final String snippet = snips.get(snips.getList().size() - 1);
-                handleInput(ClientInfo.parseHost(sHost), cChannel.getName(), snippet);
+                handleInput(tParser.parseHostmask(sHost)[0], cChannel.getName(), snippet);
                 snips.remove(snippet);
                 break;
             }
@@ -165,13 +170,15 @@ public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateC
         };
     }
 
-    public void onPrivateMessage(final IRCParser tParser, final String sMessage, final String sHost) {
-        handleInput(ClientInfo.parseHost(sHost), ClientInfo.parseHost(sHost), sMessage);
+    @Override
+    public void onPrivateMessage(final Parser tParser, final Date date, final String sMessage, final String sHost) {
+        handleInput(tParser.parseHostmask(sHost)[0], tParser.parseHostmask(sHost)[0], sMessage);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
-    public void onPrivateCTCP(IRCParser tParser, String sType, String sMessage, String sHost) {
-        final ClientInfo client = tParser.getClientInfoOrFake(sHost);
+    public void onPrivateCTCP(Parser tParser, Date date, String sType, String sMessage, String sHost) {
+        final ClientInfo client = tParser.getClient(sHost);
         if ("COOKIE".equals(sType)) {
             final String status = (String) client.getMap().get("Cookie");
             final String key1 = (String) client.getMap().get("Key1");
@@ -179,7 +186,7 @@ public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateC
             final String idp = (String) client.getMap().get("OpenID-p");
             
             if ("GETKEY".equals(sMessage) && "SET".equals(status)) {
-                parser.sendCTCP(ClientInfo.parseHost(sHost), "COOKIE", "SETKEY " + key1);
+                parser.sendCTCP(tParser.parseHostmask(sHost)[0], "COOKIE", "SETKEY " + key1);
                 client.getMap().put("Cookie", "GETKEY");
             } else if (sMessage.startsWith("OFFER")) {
                 final String what = sMessage.substring(6);
@@ -197,7 +204,7 @@ public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateC
 
                 client.getMap().put("Cookie", "OFFER");
                 client.getMap().put("Key2", newkey2);
-                parser.sendCTCP(ClientInfo.parseHost(sHost), "COOKIE", "GET " + newkey2);
+                parser.sendCTCP(tParser.parseHostmask(sHost)[0], "COOKIE", "GET " + newkey2);
             } else if (sMessage.startsWith("SHOW") && "OFFER".equals(status)) {
                 final String payload = sMessage.substring(5);
                 final String info = new String(new ArcFourEncrypter(key1 + key2)
@@ -253,7 +260,7 @@ public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateC
                     final CommandOptions opts = command.getClass()
                             .getAnnotation(CommandOptions.class);
 
-                    final String id = (String) parser.getClientInfoOrFake(source)
+                    final String id = (String) parser.getClient(source)
                             .getMap().get("OpenID");
 
                     if (opts.requireAuthorisation() && id == null) {
@@ -315,10 +322,11 @@ public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateC
         }
     }
 
-    public void onChannelKick(IRCParser tParser, ChannelInfo cChannel,
+    @Override
+    public void onChannelKick(Parser tParser, Date date, ChannelInfo cChannel,
             ChannelClientInfo cKickedClient, ChannelClientInfo cKickedByClient,
             String sReason, String sKickedByHost) {
-        if (cKickedClient.getClient().equals(parser.getMyself())) {
+        if (cKickedClient.getClient().equals(parser.getLocalClient())) {
             tParser.joinChannel(cChannel.getName());
         }
     }

src/com/md87/charliebravo/commands/AuthenticateCommand.java

@@ -55,16 +55,16 @@ public class AuthenticateCommand implements Command {
                 final int id = handler.getConfig().getConfigfile().getKeyDomain("cookies").size();
                 
                 final String openid = result.get(1).trim();
-                handler.getParser().getClientInfoOrFake(response.getSource())
+                handler.getParser().getClient(response.getSource())
                         .getMap().put("OpenID", openid);
-                handler.getParser().getClientInfoOrFake(response.getSource())
+                handler.getParser().getClient(response.getSource())
                         .getMap().put("Key1", key1);
-                handler.getParser().getClientInfoOrFake(response.getSource())
+                handler.getParser().getClient(response.getSource())
                         .getMap().put("Cookie", "SET");
                 handler.getConfig().setOption(openid, "internal.lastseen",
                         System.currentTimeMillis());
                 handler.getConfig().setOption(openid, "internal.lastuser",
-                        handler.getParser().getClientInfoOrFake(response.getSource()).toString());
+                        handler.getParser().getClient(response.getSource()).toString());
                 response.sendMessage("You are now authenticated as " + openid, true);
 
                 handler.getConfig().getConfigfile().getKeyDomain("cookies")

src/com/md87/charliebravo/commands/SetCommand.java

@@ -22,7 +22,7 @@
 
 package com.md87.charliebravo.commands;
 
-import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.md87.charliebravo.Command;
 import com.md87.charliebravo.CommandOptions;
 import com.md87.charliebravo.InputHandler;
@@ -36,7 +36,7 @@ import com.md87.charliebravo.Response;
 public class SetCommand implements Command {
 
     public void execute(InputHandler handler, Response response, String line) throws Exception {
-        final String openID = (String) handler.getParser().getClientInfoOrFake(response.getSource())
+        final String openID = (String) handler.getParser().getClient(response.getSource())
                 .getMap().get("OpenID");
         String target = openID;
         String value = line;
@@ -51,7 +51,7 @@ public class SetCommand implements Command {
                 final String user = line.substring(offset + 13);
                 value = line.substring(0, offset - 1);
                 
-                final ClientInfo client = handler.getParser().getClientInfo(user);
+                final ClientInfo client = handler.getParser().getClient(user);
 
                 if (client != null) {
                     if (client.getMap().get("OpenID") == null) {

src/com/md87/charliebravo/commands/SkillCommand.java

@@ -42,7 +42,7 @@ import uk.co.md87.evetool.api.wrappers.SkillList;
 public class SkillCommand implements Command {
 
     public void execute(InputHandler handler, Response response, String line) throws Exception {
-        final String openID = (String) handler.getParser().getClientInfoOrFake(response.getSource())
+        final String openID = (String) handler.getParser().getClient(response.getSource())
                 .getMap().get("OpenID");
 
         if (openID == null) {

src/com/md87/charliebravo/commands/WhoisCommand.java

@@ -22,7 +22,7 @@
 
 package com.md87.charliebravo.commands;
 
-import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.ui.messages.Formatter;
 import com.md87.charliebravo.Command;
 import com.md87.charliebravo.InputHandler;
@@ -39,7 +39,7 @@ public class WhoisCommand implements Command {
         if (line.isEmpty()) {
             response.sendRawMessage("Who would you like to whois, " + response.getSource() + "?");
         } else {
-            final ClientInfo ci = handler.getParser().getClientInfo(line);
+            final ClientInfo ci = handler.getParser().getClient(line);
 
             if (ci == null) {
                 if (handler.getConfig().hasOption(line, "internal.lastseen")) {