Minor tidying, unbreak unit tests (apparently refactors don't apply to them?!)

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
@@ -62,7 +61,7 @@ public class IRCClientInfo implements LocalClientInfo {
 	/** A Map to allow applications to attach misc data to this object */
 	private Map<Object, Object> myMap;
 	/** List of ChannelClientInfos that point to this */
-	private final Map<String, ChannelClientInfo> myChannelClientInfos = new Hashtable<String, ChannelClientInfo>();
+	private final Map<String, IRCChannelClientInfo> myChannelClientInfos = new Hashtable<String, IRCChannelClientInfo>();
 	/** Modes waiting to be sent to the server. */
 	private final List<String> lModeQueue = new LinkedList<String>();
 
@@ -321,9 +320,9 @@ public class IRCClientInfo implements LocalClientInfo {
 	 *
 	 * @return int with the count of known channels
 	 */	
-	public List<ChannelClientInfo> getChannelClients() {
-		final List<ChannelClientInfo> result = new ArrayList<ChannelClientInfo>();
-		for (ChannelClientInfo cci : myChannelClientInfos.values()) {
+	public List<IRCChannelClientInfo> getChannelClients() {
+		final List<IRCChannelClientInfo> result = new ArrayList<IRCChannelClientInfo>();
+		for (IRCChannelClientInfo cci : myChannelClientInfos.values()) {
 			result.add(cci);
 		}
 		return result;
@@ -331,7 +330,7 @@ public class IRCClientInfo implements LocalClientInfo {
 	
 	/** {@inheritDoc} */
         @Override
-	public void alterMode(final boolean positive, final Character mode) {
+	public void alterMode(final boolean add, final Character mode) {
 		if (isFake()) { return; }
 		int modecount = 1;
 		String modestr = "";
@@ -342,9 +341,9 @@ public class IRCClientInfo implements LocalClientInfo {
 				modecount = 1;
 			}
 		}
-		modestr = ((positive) ? "+" : "-") + mode;
+		modestr = ((add) ? "+" : "-") + mode;
 		if (!myParser.userModes.containsKey(mode)) { return; }
-		final String teststr = ((positive) ? "-" : "+") + mode;
+		final String teststr = ((add) ? "-" : "+") + mode;
 		if (lModeQueue.contains(teststr)) {
 			lModeQueue.remove(teststr);
 			return;

test/com/dmdirc/addons/logging/LoggingPluginTest.java

@@ -32,7 +32,7 @@ import com.dmdirc.harness.TestLoggingPlugin;
 import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.addons.ui_dummy.DummyController;
-import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.util.ConfigFile;
 import java.util.ArrayList;
 import java.util.Map;
@@ -54,7 +54,7 @@ public class LoggingPluginTest {
         server = new Server("255.255.255.255", 6667, "", false,
                 IdentityManager.getProfiles().get(0), new ArrayList<String>(),
                 new TestParserFactory());
-        channel = new Channel(server, new IRCChannelInfo(server.getParser(), "#test"));
+        channel = new Channel(server, new IRCChannelInfo((IRCParser) server.getParser(), "#test"));
         query = new Query(server, "foo!bar@baz");
 
         final ConfigFile file = new ConfigFile(LoggingPlugin.class

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -59,7 +59,7 @@ public class ModeTest {
 
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
-        when(channelinfo.getModeStr()).thenReturn("my mode string!");
+        when(channelinfo.getModes()).thenReturn("my mode string!");
         when(channelinfo.toString()).thenReturn("#chan");
     }
 
@@ -78,7 +78,7 @@ public class ModeTest {
 
         command.execute(origin, server, channel, false, new CommandArguments("/mode +hello -bye"));
 
-        verify(parser).sendLine("MODE #chan +hello -bye");
+        verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }
 
     @Test
@@ -88,7 +88,7 @@ public class ModeTest {
         command.execute(origin, server, "#chan", false,
                 new CommandArguments("/mode #chan +hello -bye"));
 
-        verify(parser).sendLine("MODE #chan +hello -bye");
+        verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }
 
     @Test
@@ -98,7 +98,7 @@ public class ModeTest {
         command.execute(origin, server, "#chan", false,
                 new CommandArguments("/mode #chan"));
 
-        verify(parser).sendLine("MODE #chan");
+        verify(parser).sendRawMessage("MODE #chan");
     }
 
 }

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -65,14 +65,14 @@ public class NamesTest {
     public void testNormal() {
         command.execute(null, server, channel, false, new CommandArguments("/names"));
 
-        verify(parser).sendLine("NAMES #chan");
+        verify(parser).sendRawMessage("NAMES #chan");
     }
 
     @Test
     public void testExternal() {
         command.execute(null, server, "#chan", false, new CommandArguments("/names #chan"));
 
-        verify(parser).sendLine("NAMES #chan");
+        verify(parser).sendRawMessage("NAMES #chan");
     }
 
 }

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

@@ -22,19 +22,21 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
 
 public class TestIChannelPart implements ChannelPartListener {
 
-    public IRCChannelInfo channel;
+    public ChannelInfo channel;
 
-    public IRCChannelClientInfo cclient;
+    public ChannelClientInfo cclient;
 
     public String reason;
 
-    public void onChannelPart(IRCParser tParser, IRCChannelInfo cChannel,
-                              IRCChannelClientInfo cChannelClient, String sReason) {
+    public void onChannelPart(Parser tParser, ChannelInfo cChannel,
+                              ChannelClientInfo cChannelClient, String sReason) {
         channel = cChannel;
         cclient = cChannelClient;
         reason = sReason;

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
 
 public class TestIChannelSelfJoin implements ChannelSelfJoinListener {
 
-    public IRCChannelInfo channel = null;
+    public ChannelInfo channel = null;
 
-    public void onChannelSelfJoin(IRCParser tParser, IRCChannelInfo cChannel) {
+    public void onChannelSelfJoin(Parser tParser, ChannelInfo cChannel) {
         channel = cChannel;
     }
 }

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

@@ -22,7 +22,8 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
 
 public class TestIChannelTopic implements ChannelTopicListener {
@@ -31,9 +32,9 @@ public class TestIChannelTopic implements ChannelTopicListener {
 
     public boolean isJoin;
 
-    public IRCChannelInfo channel;
+    public ChannelInfo channel;
 
-    public void onChannelTopic(IRCParser tParser, IRCChannelInfo cChannel,
+    public void onChannelTopic(Parser tParser, ChannelInfo cChannel,
                                boolean bIsJoinTopic) {
         triggered = true;
         isJoin = bIsJoinTopic;

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

@@ -22,15 +22,16 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
+import com.dmdirc.parser.irc.ParserError;
 
 public class TestIConnectError implements ConnectErrorListener {
 
     public boolean error = false;
 
     @Override
-    public void onConnectError(IRCParser tParser, ParserError errorInfo) {
+    public void onConnectError(Parser tParser, ParserError errorInfo) {
         error = true;
     }
 }

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
+import com.dmdirc.parser.irc.ParserError;
 
 public class TestIErrorInfo implements ErrorInfoListener {
 
     public boolean error = false;
 
-    public void onErrorInfo(IRCParser tParser, ParserError errorInfo) {
+    public void onErrorInfo(Parser tParser, ParserError errorInfo) {
         error = true;
     }
 }

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

@@ -22,16 +22,17 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 
 public class TestINickChanged implements NickChangeListener {
 
     public String oldNick = null;
-    public IRCClientInfo client;
+    public ClientInfo client;
 
     @Override
-    public void onNickChanged(IRCParser tParser, IRCClientInfo cClient,
+    public void onNickChanged(Parser tParser, ClientInfo cClient,
                               String sOldNick) {
         oldNick = sOldNick;
         client = cClient;

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
 
 public class TestINoticeAuth implements AuthNoticeListener {
 
     public String message = null;
 
-    public void onNoticeAuth(IRCParser tParser, String sData) {
+    @Override
+    public void onNoticeAuth(Parser tParser, String sData) {
         message = sData;
     }
 }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.NumericListener;
 
 public class TestINumeric implements NumericListener {
@@ -31,7 +31,8 @@ public class TestINumeric implements NumericListener {
 
     public String[] data;
 
-    public void onNumeric(IRCParser tParser, int numeric, String[] token) {
+    @Override
+    public void onNumeric(Parser tParser, int numeric, String[] token) {
         this.numeric = numeric;
         data = token;
     }

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.Post005Listener;
 
 public class TestIPost005 implements Post005Listener {
 
     public boolean done = false;
 
-    public void onPost005(IRCParser tParser) {
+    @Override
+    public void onPost005(Parser tParser) {
         done = true;
     }
 }

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 
 public class TestIPrivateAction implements PrivateActionListener {
 
     public String message, host;
 
-    public void onPrivateAction(IRCParser tParser, String sMessage, String sHost) {
+    @Override
+    public void onPrivateAction(Parser tParser, String sMessage, String sHost) {
         message = sMessage;
         host = sHost;
     }

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
 
 public class TestIPrivateCTCP implements PrivateCtcpListener {
 
     public String type, message, host;
 
-    public void onPrivateCTCP(IRCParser tParser, String sType, String sMessage,
+    @Override
+    public void onPrivateCTCP(Parser tParser, String sType, String sMessage,
                               String sHost) {
         type = sType;
         message = sMessage;

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 
 public class TestIPrivateMessage implements PrivateMessageListener {
 
     public String host, message;
 
-    public void onPrivateMessage(IRCParser tParser, String sMessage,
+    @Override
+    public void onPrivateMessage(Parser tParser, String sMessage,
                                  String sHost) {
         host = sHost;
         message = sMessage;

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

@@ -22,31 +22,36 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+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.ChannelQuitListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 
 public class TestIQuit implements ChannelQuitListener, QuitListener {
 
-    public IRCChannelInfo channel;
+    public ChannelInfo channel;
 
-    public IRCChannelClientInfo cclient;
+    public ChannelClientInfo cclient;
 
-    public IRCClientInfo client;
+    public ClientInfo client;
 
     public String reason;
 
     public int count = 0;
 
-    public void onChannelQuit(IRCParser tParser, IRCChannelInfo cChannel,
-                              IRCChannelClientInfo cChannelClient, String sReason) {
+    @Override
+    public void onChannelQuit(Parser tParser, ChannelInfo cChannel,
+                              ChannelClientInfo cChannelClient, String sReason) {
         this.channel = cChannel;
         this.cclient = cChannelClient;
         this.reason = sReason;
         this.count++;
     }
 
-    public void onQuit(IRCParser tParser, IRCClientInfo cClient, String sReason) {
+    @Override
+    public void onQuit(Parser tParser, ClientInfo cClient, String sReason) {
         this.client = cClient;
         this.reason = sReason;
         this.count++;

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

@@ -22,14 +22,15 @@
 
 package com.dmdirc.harness.parser;
 
-import com.dmdirc.parser.irc.*;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ServerErrorListener;
 
 public class TestIServerError implements ServerErrorListener {
 
     public String message = null;
 
-    public void onServerError(IRCParser tParser, String sMessage) {
+    @Override
+    public void onServerError(Parser tParser, String sMessage) {
         message = sMessage;
     }
 }

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

@@ -40,7 +40,7 @@ public class ChannelClientInfoTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
-        final IRCChannelClientInfo cci = parser.getClientInfo("luser").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
 
         assertEquals("v", cci.getImportantMode());
         assertEquals("+", cci.getImportantModePrefix());
@@ -69,10 +69,10 @@ public class ChannelClientInfoTest {
 
         parser.injectConnectionStrings();
         parser.injectLine(":nick JOIN #DMDirc_testing");
-        final Map<String, Integer> map1 = new HashMap<String, Integer>();
-        final Map<String, Integer> map2 = new HashMap<String, Integer>();
+        final Map<Object, Object> map1 = new HashMap<Object, Object>();
+        final Map<Object, Object> map2 = new HashMap<Object, Object>();
         
-        final IRCChannelClientInfo cci = parser.getClientInfo("nick").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("nick").getChannelClients().get(0);
         
         cci.setMap(map1);
         assertSame(map1, cci.getMap());
@@ -89,12 +89,12 @@ public class ChannelClientInfoTest {
         parser.injectLine(":nick JOIN #DMDirc_testing");
         parser.sentLines.clear();
         
-        parser.getClientInfo("nick").getChannelClients().get(0).kick("");
+        parser.getClient("nick").getChannelClients().get(0).kick("");
         assertEquals(1, parser.sentLines.size());
         assertEquals("KICK #DMDirc_testing nick", parser.sentLines.get(0));
         parser.sentLines.clear();
         
-        parser.getClientInfo("nick").getChannelClients().get(0).kick("booya");
+        parser.getClient("nick").getChannelClients().get(0).kick("booya");
         assertEquals(1, parser.sentLines.size());
         assertEquals("KICK #DMDirc_testing nick :booya", parser.sentLines.get(0));
     }

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

@@ -143,7 +143,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendEmptyMessages() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
+        final IRCChannelInfo info = getChannel(parser);
         
         info.sendAction("");
         info.sendCTCP("", "");
@@ -347,7 +347,7 @@ public class ChannelInfoTest {
         return res;
     }
 
-    private ChannelInfo getChannel(final TestParser parser) {
+    private IRCChannelInfo getChannel(final TestParser parser) {
         parser.injectConnectionStrings();
         parser.injectLine(":nick JOIN #DMDirc_testing");
 

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

@@ -45,7 +45,7 @@ import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.ServerErrorListener;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
 
 import javax.net.ssl.TrustManager;
 
@@ -348,7 +348,7 @@ public class IRCParserTest {
 
         assertTrue(Arrays.equals(parser.getDefaultTrustManager(), parser.getTrustManager()));
 
-        parser.setTrustManager(new TrustManager[0]);
+        parser.setTrustManagers(new TrustManager[0]);
 
         assertTrue(Arrays.equals(new TrustManager[0], parser.getTrustManager()));
     }
@@ -403,8 +403,8 @@ public class IRCParserTest {
         parser.injectLine(":server " + numeric1 + " nick #D ban3!ident@* bansetter3 1003");
         parser.injectLine(":server " + numeric2 + " nick #D :End of Channel Something List");
 
-        final List<ChannelListModeItem> items
-                = parser.getChannel("#D").getListModeParam(mode);
+        final Collection<ChannelListModeItem> items
+                = parser.getChannel("#D").getListMode(mode);
 
         assertEquals(3, items.size());
         boolean gotOne = false, gotTwo = false, gotThree = false;

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

@@ -32,17 +32,17 @@ public class Process001Test {
     public void testDuplicate001() {
         final TestParser tp = new TestParser();
         
-        assertTrue(tp.getMyself().isFake());
+        assertTrue(tp.getLocalClient().isFake());
         
         tp.injectConnectionStrings();
         
-        assertEquals("nick", tp.getMyself().getNickname());
-        assertFalse(tp.getMyself().isFake());
+        assertEquals("nick", tp.getLocalClient().getNickname());
+        assertFalse(tp.getLocalClient().isFake());
         
         tp.injectLine(":server 001 nick2 :Crazy second 001 for you, nick2");
         
-        assertEquals("nick2", tp.getMyself().getNickname());
-        assertFalse(tp.getMyself().isFake());
+        assertEquals("nick2", tp.getLocalClient().getNickname());
+        assertFalse(tp.getLocalClient().isFake());
     }
 
 }

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

@@ -36,7 +36,7 @@ public class Process004005Test {
         parser.injectLine(":server 005 nick CASEMAPPING=" + target
                     + " :are supported by this server");
         
-        assertEquals(expected, parser.getIRCStringConverter().getLimit());
+        assertEquals(expected, parser.getStringConverter().getLimit());
         
         return parser;
     }

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

@@ -64,7 +64,7 @@ public class ProcessJoinTest {
         parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
 
         verify(test).onChannelJoin(parser, parser.getChannel("#DMDirc_testing"),
-                parser.getClientInfo("foo!bar@baz").getChannelClients().get(0));
+                parser.getClient("foo!bar@baz").getChannelClients().get(0));
     }    
 
 }

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

@@ -38,8 +38,8 @@ public class ProcessModeTest {
 
         parser.injectLine(":server 221 nick iw");
 
-        assertTrue(parser.getMyself().getUserModeStr().indexOf('i') > -1);
-        assertTrue(parser.getMyself().getUserModeStr().indexOf('w') > -1);
+        assertTrue(parser.getLocalClient().getModes().indexOf('i') > -1);
+        assertTrue(parser.getLocalClient().getModes().indexOf('w') > -1);
     }
     
     @Test
@@ -51,10 +51,10 @@ public class ProcessModeTest {
         parser.injectLine(":server 221 nick iw");
         parser.injectLine(":server MODE nick :-iw+ox");
 
-        assertTrue(parser.getMyself().getUserModeStr().indexOf('o') > -1);
-        assertTrue(parser.getMyself().getUserModeStr().indexOf('x') > -1);
-        assertEquals(-1, parser.getMyself().getUserModeStr().indexOf('i'));
-        assertEquals(-1, parser.getMyself().getUserModeStr().indexOf('w'));
+        assertTrue(parser.getLocalClient().getModes().indexOf('o') > -1);
+        assertTrue(parser.getLocalClient().getModes().indexOf('x') > -1);
+        assertEquals(-1, parser.getLocalClient().getModes().indexOf('i'));
+        assertEquals(-1, parser.getLocalClient().getModes().indexOf('w'));
     }
     
     @Test
@@ -66,7 +66,7 @@ public class ProcessModeTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
-        final IRCChannelClientInfo cci = parser.getClientInfo("luser").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
 
         parser.injectLine(":server MODE #DMDirc_testing +v luser");
         assertEquals("+", cci.getChanModeStr(true));
@@ -94,16 +94,16 @@ public class ProcessModeTest {
 
         parser.injectLine(":luser!me@my MODE #DMDirc_testing +v :moo");
         
-        assertNotNull(parser.getClientInfo("moo"));
-        assertEquals(1, parser.getClientInfo("moo").channelCount());
+        assertNotNull(parser.getClient("moo"));
+        assertEquals(1, parser.getClient("moo").getChannelCount());
         
-        final IRCChannelClientInfo cci = parser.getClientInfo("moo").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("moo").getChannelClients().get(0);
         
         assertEquals("+", cci.getChanModeStr(true));        
         assertEquals("Parser should update ident when it sees a MODE line",
-                "me", parser.getClientInfo("luser").getIdent());
+                "me", parser.getClient("luser").getUsername());
         assertEquals("Parser should update host when it sees a MODE line",
-                "my", parser.getClientInfo("luser").getHost());
+                "my", parser.getClient("luser").getHostname());
     }
     
     @Test
@@ -120,10 +120,10 @@ public class ProcessModeTest {
 
         parser.injectLine(":server MODE #DMDirc_testing +v moo");
         
-        assertNotNull(parser.getClientInfo("moo"));
-        assertEquals(2, parser.getClientInfo("moo").channelCount());
+        assertNotNull(parser.getClient("moo"));
+        assertEquals(2, parser.getClient("moo").getChannelCount());
         
-        final IRCChannelClientInfo cci = parser.getClientInfo("moo").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = parser.getClient("moo").getChannelClients().get(0);
         
         assertEquals("+", cci.getChanModeStr(true));        
     }   
@@ -138,9 +138,9 @@ public class ProcessModeTest {
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
         parser.injectLine(":server 324 nick #DMDirc_testing +Zstnl 1234");
 
-        assertEquals("1234", parser.getChannel("#DMDirc_testing").getModeParam('l'));
+        assertEquals("1234", parser.getChannel("#DMDirc_testing").getMode('l'));
         
-        String modes = parser.getChannel("#DMDirc_testing").getModeStr().split(" ")[0];
+        String modes = parser.getChannel("#DMDirc_testing").getModes().split(" ")[0];
         assertEquals(6, modes.length());
         assertEquals('+', modes.charAt(0));
         assertTrue(modes.indexOf('Z') > -1);
@@ -151,7 +151,7 @@ public class ProcessModeTest {
         
         parser.injectLine(":server MODE #DMDirc_testing :-Z");
         
-        modes = parser.getChannel("#DMDirc_testing").getModeStr().split(" ")[0];
+        modes = parser.getChannel("#DMDirc_testing").getModes().split(" ")[0];
         assertEquals(5, modes.length());
         assertEquals('+', modes.charAt(0));
         assertTrue(modes.indexOf('s') > -1);

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

@@ -55,10 +55,10 @@ public class ProcessNamesTest {
         assertEquals(1, parser.getChannels().size());
         assertNotNull(parser.getChannel("#DMDirc_testing"));
         assertEquals(4, parser.getChannel("#DMDirc_testing").getChannelClients().size());
-        assertNotNull(parser.getClientInfo("luser"));
-        assertEquals(1, parser.getClientInfo("luser").getChannelClients().size());
+        assertNotNull(parser.getClient("luser"));
+        assertEquals(1, parser.getClient("luser").getChannelClients().size());
 
-        IRCChannelClientInfo cci = parser.getClientInfo("luser").getChannelClients().get(0);
+        IRCChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
         

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

@@ -47,10 +47,10 @@ public class ProcessNickTest {
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
         parser.injectLine(":luser!lu@ser.com NICK LUSER");
 
-        assertNotNull(parser.getClientInfo("LUSER"));
-        assertEquals(1, parser.getClientInfo("LUSER").getChannelClients().size());
+        assertNotNull(parser.getClient("LUSER"));
+        assertEquals(1, parser.getClient("LUSER").getChannelClients().size());
 
-        IRCChannelClientInfo cci = parser.getClientInfo("LUSER").getChannelClients().get(0);
+        IRCChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
         
@@ -68,11 +68,11 @@ public class ProcessNickTest {
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
         parser.injectLine(":luser!lu@ser.com NICK foobar");
 
-        assertNotNull(parser.getClientInfo("foobar"));
-        assertNull(parser.getClientInfo("luser"));
-        assertEquals(1, parser.getClientInfo("foobar").getChannelClients().size());
+        assertNotNull(parser.getClient("foobar"));
+        assertNull(parser.getClient("luser"));
+        assertEquals(1, parser.getClient("foobar").getChannelClients().size());
 
-        IRCChannelClientInfo cci = parser.getClientInfo("foobar").getChannelClients().get(0);
+        IRCChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
     }    

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

@@ -46,7 +46,7 @@ public class ProcessTopicTest {
         assertTrue(test.isJoin);
         assertEquals("#DMDirc_testing", test.channel.getName());
         assertEquals("This be a topic", test.channel.getTopic());
-        assertEquals("Q", test.channel.getTopicUser());
+        assertEquals("Q", test.channel.getTopicSetter());
         assertEquals(1207350306l, test.channel.getTopicTime());
     }
     
@@ -68,7 +68,7 @@ public class ProcessTopicTest {
         assertFalse(test.isJoin);
         assertEquals("#DMDirc_testing", test.channel.getName());
         assertEquals("New topic here", test.channel.getTopic());
-        assertEquals("foobar", test.channel.getTopicUser());
+        assertEquals("foobar", test.channel.getTopicSetter());
         assertTrue(1207350306l < test.channel.getTopicTime());
     }