Abstract CommandInfos somewhat

src/com/dmdirc/Channel.java

@@ -28,8 +28,9 @@ import com.dmdirc.commandparser.CommandManager;
 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.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
@@ -101,7 +102,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 ChannelInfo newChannelInfo) {
+    public Channel(final Server newServer, final IRCChannelInfo newChannelInfo) {
         super("channel", newChannelInfo.getName(),
                 new ConfigManager(newServer.getIrcd(), newServer.getNetwork(),
                 newServer.getName(), newChannelInfo.getName()));
@@ -159,7 +160,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
     @Override
     public void sendLine(final String line) {
         if (server.getState() != ServerState.CONNECTED
-                || server.getParser().getChannelInfo(channelInfo.getName()) == null) {
+                || server.getParser().getChannel(channelInfo.getName()) == null) {
             // We're not in the channel/connected to the server
             return;
         }
@@ -194,7 +195,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
     @Override
     public void sendAction(final String action) {
         if (server.getState() != ServerState.CONNECTED
-                || server.getParser().getChannelInfo(channelInfo.getName()) == null) {
+                || server.getParser().getChannel(channelInfo.getName()) == null) {
             // We're not on the server/channel
             return;
         }
@@ -245,7 +246,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener,
      *
      * @param newChannelInfo The new ChannelInfo object
      */
-    public void setChannelInfo(final ChannelInfo newChannelInfo) {
+    public void setChannelInfo(final IRCChannelInfo newChannelInfo) {
         channelInfo = newChannelInfo;
         registerCallbacks();
     }

src/com/dmdirc/ChannelEventHandler.java

@@ -26,7 +26,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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;
@@ -88,7 +88,7 @@ public final class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @Override
     public void onChannelMessage(final Parser tParser,
-            final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
+            final IRCChannelInfo 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 ChannelInfo cChannel) {
+    public void onChannelGotNames(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel, final boolean bIsJoinTopic) {
+            final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelJoin(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelPart(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelKick(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelQuit(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelAction(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelNickChanged(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelModeChanged(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel, final ChannelClientInfo cChangedClient,
+            final IRCChannelInfo 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 ChannelInfo cChannel,
+    public void onChannelCTCP(final Parser tParser, final IRCChannelInfo 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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
+            final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
         checkParser(tParser);
 

src/com/dmdirc/Server.java

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

src/com/dmdirc/ServerEventHandler.java

@@ -27,7 +27,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ChannelInfo;
+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;
@@ -78,7 +78,7 @@ public final class ServerEventHandler extends EventHandler
 
     /** {@inheritDoc} */
     @Override
-    public void onChannelSelfJoin(final Parser tParser, final ChannelInfo cChannel) {
+    public void onChannelSelfJoin(final Parser tParser, final IRCChannelInfo cChannel) {
         checkParser(tParser);
         owner.addChannel(cChannel);
     }

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

@@ -40,7 +40,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -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 ChannelInfo channel = chan.getChannelInfo();
+		final IRCChannelInfo 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 ChannelInfo) {
-			final ChannelInfo channel = (ChannelInfo) obj;
+		} else if (obj instanceof IRCChannelInfo) {
+			final IRCChannelInfo channel = (IRCChannelInfo) obj;
 			if (channel.getParser() != null) {
 				addNetworkDir(directory, file, channel.getParser().getNetworkName());
 			}

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

@@ -34,7 +34,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo chanInfo = ((Channel) arguments[0]).getChannelInfo();
+            final IRCChannelInfo chanInfo = ((Channel) arguments[0]).getChannelInfo();
             final String network = ((Channel) arguments[0]).getServer().getNetwork();
             
             for (ChannelClientInfo client : chanInfo.getChannelClients()) {

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

@@ -39,7 +39,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -125,7 +125,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
 			textString.append(frame.getName());
 		} else if (current instanceof Channel) {
 			final Channel frame = (Channel) current;
-			final ChannelInfo chan = frame.getChannelInfo();
+			final IRCChannelInfo chan = frame.getChannelInfo();
 			final Map<Long, String> names = new Hashtable<Long, String>();
 			final Map<Long, Integer> types = new Hashtable<Long, Integer>();
 

src/com/dmdirc/commandparser/commands/channel/Mode.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.commandparser.commands.IntelligentCommand;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -54,7 +54,7 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
     @Override
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
-        final ChannelInfo cChannel = channel.getChannelInfo();
+        final IRCChannelInfo cChannel = channel.getChannelInfo();
 
         if (args.getArguments().length == 0) {
             sendLine(origin, isSilent, "channelModeDiscovered", cChannel.getModeStr(), cChannel);

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

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.interfaces.InputWindow;
 
@@ -50,7 +50,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
     public void execute(final InputWindow origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
-            final ChannelInfo cChannel = channel.getChannelInfo();
+            final IRCChannelInfo cChannel = channel.getChannelInfo();
 
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, isSilent, "channelNoTopic", cChannel);

src/com/dmdirc/parser/interfaces/ChannelInfo.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 channel and allows various operations to be
+ * performed on the channel.
+ *
+ * @since 0.6.3m2
+ * @author chris
+ */
+public interface ChannelInfo {
+
+}

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

@@ -26,6 +26,7 @@ package com.dmdirc.parser.interfaces;
  * A parser connects to a back-end chat system and handles all communication
  * with it.
  *
+ * @since 0.6.3m2
  * @author chris
  */
 public interface Parser extends Runnable {
@@ -45,6 +46,14 @@ public interface Parser extends Runnable {
      */
     void joinChannel(String channel);
 
+    /**
+     * Retrieves a channel information object for the specified channel.
+     *
+     * @param channel Name of the channel to retrieve an information object for
+     * @return A corresponding channel info object
+     */
+    ChannelInfo getChannel(String channel);
+
     /**
      * Set the current Value of bindIP.
      *

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sType, String sMessage,
             @FakableSource String sHost);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sType, String sMessage,
             @FakableSource String sHost);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel, ChannelClientInfo cChannelClient);
+	void onChannelJoin(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             ChannelClientInfo cKickedClient,
             @FakableArgument ChannelClientInfo cKickedByClient,
             String sReason,

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

@@ -23,7 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel);
+	void onChannelGotListModes(Parser tParser, IRCChannelInfo cChannel);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             @FakableSource String sHost,
             String sModes);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -23,7 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel);
+	void onChannelGotNames(Parser tParser, IRCChannelInfo cChannel);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
+	 void onChannelNickChanged(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             @FakableSource String sHost,
             String sModes);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             String sMessage,
             @FakableSource String sHost);

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo channel, ChannelClientInfo channelClient, boolean state);
+	void onChannelAwayStateOther(Parser tParser, IRCChannelInfo channel, ChannelClientInfo channelClient, boolean state);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
+	void onChannelPart(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
+	void onChannelQuit(Parser tParser, IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
 }

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

@@ -23,7 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel);
+	void onChannelSelfJoin(Parser tParser, IRCChannelInfo cChannel);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             @FakableArgument ChannelClientInfo cChannelClient,
             @FakableSource String sHost,
             String sModes);

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

@@ -23,7 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ChannelInfo;
+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, ChannelInfo cChannel, boolean bIsJoinTopic);
+	void onChannelTopic(Parser tParser, IRCChannelInfo cChannel, boolean bIsJoinTopic);
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel,
+            @FakableSource IRCChannelInfo cChannel,
             ChannelClientInfo cChangedClient,
             @FakableArgument ChannelClientInfo cSetByClient,
             @FakableSource String sHost,

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

@@ -40,7 +40,7 @@ public class ChannelClientInfo {
 	/** Reference to the parser object that owns this channelclient, Used for modes. */
 	private final IRCParser myParser;
 	/** Reference to the channel object that owns this channelclient. */
-	private final ChannelInfo myChannel;
+	private final IRCChannelInfo myChannel;
 	/** A Map to allow applications to attach misc data to this object */
 	private Map myMap;
 	
@@ -51,7 +51,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 ChannelInfo channel) {
+	public ChannelClientInfo(final IRCParser tParser, final ClientInfo client, final IRCChannelInfo channel) {
 		myMap = new HashMap<Object, Object>();
 		myParser = tParser;
 		cClient = client;
@@ -90,7 +90,7 @@ public class ChannelClientInfo {
 	 *
 	 * @return Channel object that owns this ChannelClient
 	 */
-	public ChannelInfo getChannel() { return myChannel; }
+	public IRCChannelInfo getChannel() { return myChannel; }
 	/**
 	 * Get the nickname of the client object represented by this channelclient.
 	 *

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.HashMap;
@@ -37,7 +38,7 @@ import java.util.Queue;
  * @author Chris Smith
  * @see IRCParser
  */
-public class ChannelInfo {
+public 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.
@@ -93,7 +94,7 @@ public class ChannelInfo {
 	 * @param tParser Refernce to parser that owns this channelclient (used for modes)	 
 	 * @param name Channel name.
 	 */
-	public ChannelInfo(final IRCParser tParser, final String name) {
+	public IRCChannelInfo(final IRCParser tParser, final String name) {
 		myMap = new HashMap<Object, Object>();
 		myParser = tParser;
 		sName = name;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
@@ -206,7 +207,7 @@ 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, ChannelInfo> hChannelList = new Hashtable<String, ChannelInfo>();
+	private final Map<String, IRCChannelInfo> hChannelList = new Hashtable<String, IRCChannelInfo>();
 	/** Reference to the ClientInfo object that references ourself. */
 	private ClientInfo cMyself = new ClientInfo(this, "myself").setFake(true);
 	/** Hashtable storing all information gathered from 005. */
@@ -895,16 +896,12 @@ class IRCParser implements Parser, Runnable {
 		else { return new ClientInfo(this, sHost).setFake(true); }
 	}
 
-	/**
-	 * Get the ChannelInfo object for a channel.
-	 *
-	 * @param sWhat This is the name of the channel.
-	 * @return ChannelInfo Object for the channel, or null
-	 */
-	public ChannelInfo getChannelInfo(String sWhat) {
+	/** {@inheritDoc} */
+        @Override
+	public ChannelInfo getChannel(String channel) {
 		synchronized (hChannelList) {
-			sWhat = getIRCStringConverter().toLowerCase(sWhat);
-			if (hChannelList.containsKey(sWhat)) { return hChannelList.get(sWhat); } else { return null; }
+			channel = getIRCStringConverter().toLowerCase(channel);
+			if (hChannelList.containsKey(channel)) { return hChannelList.get(channel); } else { return null; }
 		}
 	}
 
@@ -943,7 +940,7 @@ class IRCParser implements Parser, Runnable {
 			// as the ircd will only reply once.
 			final LinkedList<Character> foundModes = new LinkedList<Character>();
 
-			final ChannelInfo channel = getChannelInfo(newLine[1]);
+			final ChannelInfo channel = getChannel(newLine[1]);
 			if (channel != null) {
 				final Queue<Character> listModeQueue = channel.getListModeQueue();
 				for (int i = 0; i < newLine[2].length() ; ++i) {
@@ -1484,7 +1481,7 @@ class IRCParser implements Parser, Runnable {
 	 * @param sReason Reason for leaving (Nothing sent if sReason is "")
 	 */
 	public void partChannel(final String sChannelName, final String sReason) {
-		if (getChannelInfo(sChannelName) == null) { return; }
+		if (getChannel(sChannelName) == null) { return; }
 		if (sReason.isEmpty()) {
 			sendString("PART " + sChannelName);
 		} else {
@@ -1675,11 +1672,11 @@ class IRCParser implements Parser, Runnable {
 	/** {@inheritDoc} */
     @Override
 	public void disconnect(final String message) {
-                if (currentSocketState == SocketState.OPEN) {
-                        currentSocketState = SocketState.CLOSING;
-                        if (got001) { quit(message); }
-                }
-
+                if (currentSocketState == SocketState.OPEN) {
+                        currentSocketState = SocketState.CLOSING;
+                        if (got001) { quit(message); }
+                }
+
 		try {
 			if (socket != null) { socket.close(); }
 		} catch (IOException e) {
@@ -1709,7 +1706,7 @@ class IRCParser implements Parser, Runnable {
 		// Check its not ourself (PM recieved before 005)
 		if (getIRCStringConverter().equalsIgnoreCase(getMyNickname(), sChannelName)) { return false; }
 		// Check if we are already on this channel
-		if (getChannelInfo(sChannelName) != null) { return true; }
+		if (getChannel(sChannelName) != null) { return true; }
 		// Check if we know of any valid chan prefixes
 		if (hChanPrefix.isEmpty()) {
 			// We don't. Lets check against RFC2811-Specified channel types
@@ -2082,7 +2079,7 @@ class IRCParser implements Parser, Runnable {
 	 *
 	 * @param channel Channel to add
 	 */
-	public void addChannel(final ChannelInfo channel) {
+	public void addChannel(final IRCChannelInfo channel) {
 		synchronized (hChannelList) {
 			hChannelList.put(getIRCStringConverter().toLowerCase(channel.getName()), channel);
 		}
@@ -2093,7 +2090,7 @@ class IRCParser implements Parser, Runnable {
 	 *
 	 * @param channel Channel to remove
 	 */
-	public void removeChannel(final ChannelInfo channel) {
+	public void removeChannel(final IRCChannelInfo channel) {
 		synchronized (hChannelList) {
 			hChannelList.remove(getIRCStringConverter().toLowerCase(channel.getName()));
 		}
@@ -2115,7 +2112,7 @@ class IRCParser implements Parser, Runnable {
 	 *
 	 * @return Known channels as a collection
 	 */
-	public Collection<ChannelInfo> getChannels() {
+	public Collection<IRCChannelInfo> getChannels() {
 		synchronized (hChannelList) {
 			return hChannelList.values();
 		}

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.irc.callbacks.CallbackManager;
 
 /**
@@ -109,11 +110,11 @@ public abstract class IRCProcessor {
 	/**
 	 * Get the ChannelInfo object for a channel.
 	 *
-	 * @param sWhat This is the name of the channel.
+	 * @param name This is the name of the channel.
 	 * @return ChannelInfo Object for the channel, or null
 	 */
-	protected final ChannelInfo getChannelInfo(final String sWhat) {
-		return myParser.getChannelInfo(sWhat);
+	protected final ChannelInfo getChannel(final String name) {
+		return myParser.getChannel(name);
 	}
 	
 	/**

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

@@ -40,7 +40,7 @@ public class ProcessJoin extends IRCProcessor {
 	public void process(final String sParam, final String[] token) {
 		if (sParam.equals("329")) {
 			if (token.length < 5) { return; }
-			ChannelInfo iChannel = myParser.getChannelInfo(token[3]);
+			IRCChannelInfo iChannel = myParser.getChannel(token[3]);
 			if (iChannel != null) {
 				try {
 					iChannel.setCreateTime(Integer.parseInt(token[4]));
@@ -51,11 +51,11 @@ public class ProcessJoin extends IRCProcessor {
 			Byte nTemp;
 			if (token.length < 3) { return; }
 			ClientInfo iClient;
-			ChannelInfo iChannel;
+			IRCChannelInfo iChannel;
 			ChannelClientInfo iChannelClient;
 			
 			iClient = myParser.getClientInfo(token[0]);
-			iChannel = myParser.getChannelInfo(token[token.length-1]);
+			iChannel = myParser.getChannel(token[token.length-1]);
 			
 			if (iClient == null) { 
 				iClient = new ClientInfo(myParser, token[0]);
@@ -89,7 +89,7 @@ public class ProcessJoin extends IRCProcessor {
 			//if (iClient != myParser.getMyself()) {
 				// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got join for channel ("+token[token.length-1]+") that I am not on. [Me: "+myParser.getMyself()+"]", myParser.getLastLine()));
 			//}
-			iChannel = new ChannelInfo(myParser, token[token.length-1]);
+			iChannel = new IRCChannelInfo(myParser, token[token.length-1]);
 			// Add ourself to the channel, this will be overridden by the NAMES reply
 			iChannel.addClient(iClient);
 			myParser.addChannel(iChannel);
@@ -108,7 +108,7 @@ public class ProcessJoin extends IRCProcessor {
 	 * @param cChannelClient ChannelClient object for new person
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelJoin(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient) {
+	protected boolean callChannelJoin(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient) {
 		return getCallbackManager().getCallbackType(ChannelJoinListener.class).call(cChannel, cChannelClient);
 	}
 	
@@ -119,7 +119,7 @@ public class ProcessJoin extends IRCProcessor {
 	 * @param cChannel Channel Object
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelSelfJoin(final ChannelInfo cChannel) {
+	protected boolean callChannelSelfJoin(final IRCChannelInfo cChannel) {
 		return  getCallbackManager().getCallbackType(ChannelSelfJoinListener.class).call(cChannel);
 	}
 	

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
 
 /**
@@ -46,7 +47,7 @@ public class ProcessKick extends IRCProcessor {
 		
 		iClient = getClientInfo(token[3]);
 		iKicker = getClientInfo(token[0]);
-		iChannel = getChannelInfo(token[2]);
+		iChannel = getChannel(token[2]);
 		
 		if (iClient == null) { return; }
 		
@@ -89,7 +90,7 @@ public class ProcessKick extends IRCProcessor {
 	 * @param sKickedByHost Hostname of Kicker (or servername)
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelKick(ChannelInfo cChannel, ChannelClientInfo cKickedClient, ChannelClientInfo cKickedByClient, String sReason, String sKickedByHost) {
+	protected boolean callChannelKick(IRCChannelInfo cChannel, ChannelClientInfo cKickedClient, ChannelClientInfo cKickedByClient, String sReason, String sKickedByHost) {
 		return getCallbackManager().getCallbackType(ChannelKickListener.class).call(cChannel, cKickedClient, cKickedByClient, sReason, sKickedByHost);
 	}
 	

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelListModeListener;
 import java.util.List;
 import java.util.LinkedList;
@@ -40,7 +41,7 @@ public class ProcessListModes extends IRCProcessor {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void process(String sParam, String[] token) {
-		ChannelInfo channel = getChannelInfo(token[3]);
+		ChannelInfo channel = getChannel(token[3]);
 		String thisIRCD = myParser.getIRCD(true).toLowerCase();
 		String item = "";
 		String owner = "";
@@ -227,7 +228,7 @@ public class ProcessListModes extends IRCProcessor {
 	 * @param cChannel Channel which the ListModes reply is for
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelGotListModes(ChannelInfo cChannel) {
+	protected boolean callChannelGotListModes(IRCChannelInfo cChannel) {
 		return getCallbackManager().getCallbackType(ChannelListModeListener.class).call(cChannel);
 	}
 	

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelActionListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpReplyListener;
@@ -161,7 +162,7 @@ public class ProcessMessage extends IRCProcessor {
 		final String targetName = (hasModePrefix) ? token[2].substring(1) : token[2];
 		
 		if (isValidChannelName(targetName)) {
-			iChannel = getChannelInfo(targetName);
+			iChannel = getChannel(targetName);
 			if (iChannel == null) {
 				// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", myParser.getLastLine()));
 				return;
@@ -238,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelAction(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelActionListener.class).call(cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -253,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
+	protected boolean callChannelCTCP(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelCtcpListener.class).call(cChannel, cChannelClient, sType, sMessage, sHost);
 	}
 
@@ -268,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
+	protected boolean callChannelCTCPReply(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelCtcpReplyListener.class).call(cChannel, cChannelClient, sType, sMessage, sHost);
 	}
 	
@@ -282,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelMessage(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelMessageListener.class).call(cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -296,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelNotice(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelNoticeListener.class).call(cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -311,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelModeNotice(final char prefix, final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
 		return getCallbackManager().getCallbackType(ChannelModeNoticeListener.class).call(prefix, cChannel, cChannelClient, sMessage, sHost);
 	}
 	
@@ -326,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+	protected boolean callChannelModeMessage(final char prefix, final IRCChannelInfo 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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelSingleModeChangeListener;
@@ -101,7 +102,7 @@ public class ProcessMode extends IRCProcessor {
 			cbNonUser = getCallbackManager().getCallbackType(ChannelNonUserModeChangeListener.class);
 		}
 		
-		iChannel = getChannelInfo(sChannelName);
+		iChannel = getChannel(sChannelName);
 		if (iChannel == null) { 
 			// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got modes for channel ("+sChannelName+") that I am not on.", myParser.getLastLine()));
 			// iChannel = new ChannelInfo(myParser, sChannelName);
@@ -279,7 +280,7 @@ public class ProcessMode extends IRCProcessor {
 	 * @param sModes Exact String parsed
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelModeChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes) {
+	protected boolean callChannelModeChanged(IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes) {
 		return getCallbackManager().getCallbackType(ChannelModeChangeListener.class).call(cChannel, cChannelClient, sHost, sModes);
 	}
 	
@@ -294,7 +295,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(ChannelInfo cChannel, ChannelClientInfo cChangedClient, ChannelClientInfo cSetByClient, String sHost, String sMode) {
+	protected boolean callChannelUserModeChanged(IRCChannelInfo 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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 
 /**
@@ -39,7 +40,7 @@ public class ProcessNames extends IRCProcessor {
 		ChannelInfo iChannel;
 		if (sParam.equals("366")) {
 			// End of names
-			iChannel = getChannelInfo(token[3]);
+			iChannel = getChannel(token[3]);
 			if (iChannel == null) { return; }
 			
 			iChannel.setAddingNames(false);
@@ -56,7 +57,7 @@ public class ProcessNames extends IRCProcessor {
 			ClientInfo iClient;
 			ChannelClientInfo iChannelClient;
 			
-			iChannel = getChannelInfo(token[4]);
+			iChannel = getChannel(token[4]);
 		
 			if (iChannel == null) { return; }
 			
@@ -107,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(ChannelInfo cChannel) {
+	protected boolean callChannelGotNames(IRCChannelInfo cChannel) {
 		return getCallbackManager().getCallbackType(ChannelNamesListener.class).call(cChannel);
 	}
 	

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

@@ -61,7 +61,7 @@ public class ProcessNick extends IRCProcessor {
 					myParser.addClient(iClient);
 				}
 				
-				for (ChannelInfo iChannel : myParser.getChannels()) {
+				for (IRCChannelInfo iChannel : myParser.getChannels()) {
 					// Find the user (using the old nickname)
 					iChannelClient = iChannel.getUser(oldNickname);
 					if (iChannelClient != null) {
@@ -90,7 +90,7 @@ public class ProcessNick extends IRCProcessor {
 	 * @param sOldNick Nickname before change
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelNickChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick) {
+	protected boolean callChannelNickChanged(IRCChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick) {
 		return getCallbackManager().getCallbackType(ChannelNickChangeListener.class).call(cChannel, cChannelClient, sOldNick);
 	}
 	

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
 
 /**
@@ -45,7 +46,7 @@ public class ProcessPart extends IRCProcessor {
 		ChannelClientInfo iChannelClient;
 		
 		iClient = getClientInfo(token[0]);
-		iChannel = getChannelInfo(token[2]);
+		iChannel = getChannel(token[2]);
 		
 		if (iClient == null) { return; }
 		if (IRCParser.ALWAYS_UPDATECLIENT && iClient.getHost().isEmpty()) {
@@ -85,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 ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
+	protected boolean callChannelPart(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
 		return getCallbackManager().getCallbackType(ChannelPartListener.class).call(cChannel, cChannelClient, sReason);
 	}
 	

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

@@ -55,8 +55,8 @@ public class ProcessQuit extends IRCProcessor {
 		String sReason = "";
 		if (token.length > 2) { sReason = token[token.length-1]; }
 		
-		ArrayList<ChannelInfo> channelList = new ArrayList<ChannelInfo>(myParser.getChannels());
-		for (ChannelInfo iChannel : channelList) {
+		ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(myParser.getChannels());
+		for (IRCChannelInfo iChannel : channelList) {
 			iChannelClient = iChannel.getUser(iClient);
 			if (iChannelClient != null) {
 				if (myParser.removeAfterCallback) { callChannelQuit(iChannel,iChannelClient,sReason); }
@@ -88,7 +88,7 @@ public class ProcessQuit extends IRCProcessor {
 	 * @param sReason Quit reason
 	 * @return true if a method was called, false otherwise
 	 */
-	protected boolean callChannelQuit(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
+	protected boolean callChannelQuit(final IRCChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
 		return getCallbackManager().getCallbackType(ChannelQuitListener.class).call(cChannel, cChannelClient, sReason);
 	}
 	

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
 
 /**
@@ -38,12 +39,12 @@ public class ProcessTopic extends IRCProcessor {
 	public void process(final String sParam, final String[] token) {
 		ChannelInfo iChannel;
 		if (sParam.equals("332")) {
-			iChannel = getChannelInfo(token[3]);
+			iChannel = getChannel(token[3]);
 			if (iChannel == null) { return; }
 			iChannel.setTopic(token[token.length-1]);
 		} else if (sParam.equals("333")) {
 			if (token.length > 3) {
-				iChannel = getChannelInfo(token[3]);
+				iChannel = getChannel(token[3]);
 				if (iChannel == null) { return; }
 				if (token.length > 4) {
 					iChannel.setTopicUser(token[4]);
@@ -58,7 +59,7 @@ public class ProcessTopic extends IRCProcessor {
 				final ClientInfo iClient = getClientInfo(token[0]);
 				if (iClient != null && iClient.getHost().isEmpty()) {iClient.setUserBits(token[0],false); }
 			}
-			iChannel = getChannelInfo(token[2]);
+			iChannel = getChannel(token[2]);
 			if (iChannel == null) { return; }
 			iChannel.setTopicTime(System.currentTimeMillis() / 1000);
 			if (token[0].charAt(0) == ':') { token[0] = token[0].substring(1); }

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

@@ -47,9 +47,6 @@ public class ProcessWho extends IRCProcessor {
 		// :server 352 mynickname channel username address server nick flags :hops info
 		//     0    1      2         3     4          5      6      7    8        9
 		
-//		ChannelInfo channel = myParser.getChannelInfo(token[3]);
-//		ChannelClientInfo channelClient = channel.getUser(token[7]);
-//		ClientInfo client = channelClient.getClient();
 		final ClientInfo client = myParser.getClientInfo(token[7]);
 		if (client != null) {
 			// Update ident/host
@@ -63,7 +60,6 @@ public class ProcessWho extends IRCProcessor {
 			final String mode = token[8];
 			final boolean isAway = mode.indexOf('G') != -1;
 			if (client.getAwayState() != isAway) {
-//				System.out.println("Away state for '"+client+"' changed to: "+isAway);
 				client.setAwayState(isAway);
 				if (!isAway) { client.setAwayReason(""); }
 				if (client == myParser.getMyself()) {
@@ -72,7 +68,7 @@ public class ProcessWho extends IRCProcessor {
 					callAwayStateOther(client, isAway);
 					
 					ChannelClientInfo iChannelClient;
-					for (ChannelInfo iChannel : myParser.getChannels()) {
+					for (IRCChannelInfo iChannel : myParser.getChannels()) {
 						iChannelClient = iChannel.getUser(client);
 						if (iChannelClient != null) {
 							callChannelAwayStateOther(iChannel,iChannelClient,isAway);
@@ -116,7 +112,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 ChannelInfo channel, final ChannelClientInfo channelClient, final boolean state) {
+	protected boolean callChannelAwayStateOther(final IRCChannelInfo channel, final ChannelClientInfo channelClient, final boolean state) {
 		return getCallbackManager().getCallbackType(ChannelOtherAwayStateListener.class).call(channel, channelClient, state);
 	}
 	

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

@@ -23,7 +23,7 @@
 package com.dmdirc.parser.irc.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.ChannelInfo;
+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 ChannelInfo cChannel) {
+	protected boolean isValidChan(final CallbackInterface eMethod, final IRCChannelInfo 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 ChannelInfo
-                        && !isValidChan(iface, (ChannelInfo) args[0]))
-                        || (!(args[0] instanceof ClientInfo || args[0] instanceof ChannelInfo) &&
+                        || (args[0] instanceof IRCChannelInfo
+                        && !isValidChan(iface, (IRCChannelInfo) args[0]))
+                        || (!(args[0] instanceof ClientInfo || args[0] instanceof IRCChannelInfo) &&
                         args[args.length - 1] instanceof String
                         && !isValidUser(iface, (String) args[args.length - 1])))) {
                 continue;

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

@@ -30,7 +30,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestLoggingPlugin;
 import com.dmdirc.harness.parser.TestParserFactory;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.ConfigFile;
@@ -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 ChannelInfo(server.getParser(), "#test"));
+        channel = new Channel(server, new IRCChannelInfo(server.getParser(), "#test"));
         query = new Query(server, "foo!bar@baz");
 
         final ConfigFile file = new ConfigFile(LoggingPlugin.class

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

@@ -27,7 +27,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import org.junit.BeforeClass;
@@ -54,7 +54,7 @@ public class KickReasonTest {
     @Test
     public void testUnknown() {
         final InputWindow tiw = mock(InputWindow.class);
-        final ChannelInfo channelInfo = mock(ChannelInfo.class);
+        final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
@@ -68,7 +68,7 @@ public class KickReasonTest {
     @Test
     public void testWithReason() {
         final InputWindow tiw = mock(InputWindow.class);
-        final ChannelInfo channelInfo = mock(ChannelInfo.class);
+        final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
         final ChannelClientInfo cci = mock(ChannelClientInfo.class);
 
@@ -84,7 +84,7 @@ public class KickReasonTest {
     public void testWithoutReason() {
         final InputWindow tiw = mock(InputWindow.class);
         final ConfigManager manager = mock(ConfigManager.class);
-        final ChannelInfo channelInfo = mock(ChannelInfo.class);
+        final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
         final ChannelClientInfo cci = mock(ChannelClientInfo.class);
 

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.ui.interfaces.InputWindow;
 
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.*;
 public class ModeTest {
 
     private final Mode command = new Mode();
-    private ChannelInfo channelinfo;
+    private IRCChannelInfo channelinfo;
     private Channel channel;
     private Server server;
     private IRCParser parser;
@@ -55,7 +55,7 @@ public class ModeTest {
         parser = mock(IRCParser.class);
         server = mock(Server.class);
         channel = mock(Channel.class);
-        channelinfo = mock(ChannelInfo.class);
+        channelinfo = mock(IRCChannelInfo.class);
 
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);

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

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
 import org.junit.Before;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.*;
 public class NamesTest {
 
     private final Names command = new Names();
-    private ChannelInfo channelinfo;
+    private IRCChannelInfo channelinfo;
     private Channel channel;
     private Server server;
     private IRCParser parser;
@@ -54,7 +54,7 @@ public class NamesTest {
         parser = mock(IRCParser.class);
         server = mock(Server.class);
         channel = mock(Channel.class);
-        channelinfo = mock(ChannelInfo.class);
+        channelinfo = mock(IRCChannelInfo.class);
 
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);

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

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.ui.interfaces.InputWindow;
 

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

@@ -27,13 +27,13 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
 
 public class TestIChannelPart implements ChannelPartListener {
 
-    public ChannelInfo channel;
+    public IRCChannelInfo channel;
 
     public ChannelClientInfo cclient;
 
     public String reason;
 
-    public void onChannelPart(IRCParser tParser, ChannelInfo cChannel,
+    public void onChannelPart(IRCParser tParser, IRCChannelInfo cChannel,
                               ChannelClientInfo cChannelClient, String sReason) {
         channel = cChannel;
         cclient = cChannelClient;

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

@@ -27,9 +27,9 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
 
 public class TestIChannelSelfJoin implements ChannelSelfJoinListener {
 
-    public ChannelInfo channel = null;
+    public IRCChannelInfo channel = null;
 
-    public void onChannelSelfJoin(IRCParser tParser, ChannelInfo cChannel) {
+    public void onChannelSelfJoin(IRCParser tParser, IRCChannelInfo cChannel) {
         channel = cChannel;
     }
 }

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

@@ -31,9 +31,9 @@ public class TestIChannelTopic implements ChannelTopicListener {
 
     public boolean isJoin;
 
-    public ChannelInfo channel;
+    public IRCChannelInfo channel;
 
-    public void onChannelTopic(IRCParser tParser, ChannelInfo cChannel,
+    public void onChannelTopic(IRCParser tParser, IRCChannelInfo cChannel,
                                boolean bIsJoinTopic) {
         triggered = true;
         isJoin = bIsJoinTopic;

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

@@ -28,7 +28,7 @@ import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 
 public class TestIQuit implements ChannelQuitListener, QuitListener {
 
-    public ChannelInfo channel;
+    public IRCChannelInfo channel;
 
     public ChannelClientInfo cclient;
 
@@ -38,7 +38,7 @@ public class TestIQuit implements ChannelQuitListener, QuitListener {
 
     public int count = 0;
 
-    public void onChannelQuit(IRCParser tParser, ChannelInfo cChannel,
+    public void onChannelQuit(IRCParser tParser, IRCChannelInfo cChannel,
                               ChannelClientInfo cChannelClient, String sReason) {
         this.channel = cChannel;
         this.cclient = cChannelClient;

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

@@ -23,6 +23,7 @@ package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestParser;
 
+import com.dmdirc.parser.interfaces.ChannelInfo;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,7 +33,7 @@ import static org.junit.Assert.*;
 
 public class ChannelInfoTest {
 
-    final ChannelInfo ci = new ChannelInfo(null, "name");
+    final IRCChannelInfo ci = new IRCChannelInfo(null, "name");
 
     @Test
     public void testGetName() {
@@ -81,7 +82,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendMessage() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendMessage("hello");
+        getChannel(parser).sendMessage("hello");
 
         assertEquals("PRIVMSG #DMDirc_testing :hello", parser.sentLines.get(0));
     }
@@ -89,7 +90,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendNotice() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendNotice("hello");
+        getChannel(parser).sendNotice("hello");
 
         assertEquals("NOTICE #DMDirc_testing :hello", parser.sentLines.get(0));
     }
@@ -97,7 +98,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendCTCP() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendCTCP("type", "hello");
+        getChannel(parser).sendCTCP("type", "hello");
 
         assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "TYPE hello" + ((char) 1),
                 parser.sentLines.get(0));
@@ -106,7 +107,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendCTCPEmpty() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendCTCP("type", "");
+        getChannel(parser).sendCTCP("type", "");
 
         assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "TYPE" + ((char) 1),
                 parser.sentLines.get(0));
@@ -115,7 +116,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendAction() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendAction("moo");
+        getChannel(parser).sendAction("moo");
 
         assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "ACTION moo" + ((char) 1),
                 parser.sentLines.get(0));
@@ -124,7 +125,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendCTCPReply() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendCTCPReply("type", "moo");
+        getChannel(parser).sendCTCPReply("type", "moo");
 
         assertEquals("NOTICE #DMDirc_testing :" + ((char) 1) + "TYPE moo" + ((char) 1),
                 parser.sentLines.get(0));
@@ -133,7 +134,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendCTCPReplyEmpty() {
         final TestParser parser = new TestParser();
-        getChannelInfo(parser).sendCTCPReply("type", "");
+        getChannel(parser).sendCTCPReply("type", "");
 
         assertEquals("NOTICE #DMDirc_testing :" + ((char) 1) + "TYPE" + ((char) 1),
                 parser.sentLines.get(0));
@@ -142,7 +143,7 @@ public class ChannelInfoTest {
     @Test
     public void testSendEmptyMessages() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
         
         info.sendAction("");
         info.sendCTCP("", "");
@@ -156,7 +157,7 @@ public class ChannelInfoTest {
     @Test
     public void testGetSetParamMode() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
         parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
         parser.sentLines.clear();
         
@@ -171,7 +172,7 @@ public class ChannelInfoTest {
     @Test
     public void testModeSendFull() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
 
         parser.sentLines.clear();
         info.alterMode(true, 'i', null);
@@ -196,7 +197,7 @@ public class ChannelInfoTest {
     @Test
     public void testModeSendExtra() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
 
         parser.sentLines.clear();
         info.alterMode(true, 'i', null);
@@ -226,7 +227,7 @@ public class ChannelInfoTest {
     @Test
     public void testModeSendOptimisation1() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
 
         parser.sentLines.clear();
         info.alterMode(true, 'i', null);
@@ -250,7 +251,7 @@ public class ChannelInfoTest {
     @Test
     public void testModeSendOptimisation2() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
 
         parser.sentLines.clear();
         info.alterMode(true, 'm', null);
@@ -272,7 +273,7 @@ public class ChannelInfoTest {
     @Test
     public void testModeUnsetKey() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
         parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
         parser.sentLines.clear();
         
@@ -294,16 +295,16 @@ public class ChannelInfoTest {
         parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
         parser.injectLine(":flub!floo@fleeee JOIN #DMDirc_testing");
 
-        assertNotSame(parser.getChannelInfo("#DMDirc_testing").getChannelClients(),
-                parser.getChannelInfo("#DMDirc_testing").getChannelClients());
-        assertEquals(parser.getChannelInfo("#DMDirc_testing").getChannelClients(),
-                parser.getChannelInfo("#DMDirc_testing").getChannelClients());
+        assertNotSame(parser.getChannel("#DMDirc_testing").getChannelClients(),
+                parser.getChannel("#DMDirc_testing").getChannelClients());
+        assertEquals(parser.getChannel("#DMDirc_testing").getChannelClients(),
+                parser.getChannel("#DMDirc_testing").getChannelClients());
     }
     
     @Test @Ignore
     public void testModeUnsetKeyMultiple() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
         parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
         parser.sentLines.clear();
         
@@ -321,7 +322,7 @@ public class ChannelInfoTest {
     @Test @Ignore
     public void testModeUnsetLimitMultiple() {
         final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannelInfo(parser);
+        final ChannelInfo info = getChannel(parser);
         parser.injectLine(":server 324 nick #DMDirc_testing +l 73");
         parser.sentLines.clear();
         
@@ -346,7 +347,7 @@ public class ChannelInfoTest {
         return res;
     }
 
-    private ChannelInfo getChannelInfo(final TestParser parser) {
+    private ChannelInfo getChannel(final TestParser parser) {
         parser.injectConnectionStrings();
         parser.injectLine(":nick JOIN #DMDirc_testing");
 

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

@@ -404,7 +404,7 @@ public class IRCParserTest {
         parser.injectLine(":server " + numeric2 + " nick #D :End of Channel Something List");
 
         final List<ChannelListModeItem> items
-                = parser.getChannelInfo("#D").getListModeParam(mode);
+                = parser.getChannel("#D").getListModeParam(mode);
 
         assertEquals(3, items.size());
         boolean gotOne = false, gotTwo = false, gotThree = false;
@@ -470,7 +470,7 @@ public class IRCParserTest {
         parser.getCallbackManager().addCallback(ChannelKickListener.class, ick, "#D");
         parser.injectLine(":bar!me@moo KICK #D nick :Bye!");
 
-        verify(ick).onChannelKick(same(parser), (ChannelInfo) anyObject(),
+        verify(ick).onChannelKick(same(parser), (IRCChannelInfo) anyObject(),
                 (ChannelClientInfo) anyObject(), (ChannelClientInfo) anyObject(),
                 anyString(), anyString());
     }

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

@@ -49,7 +49,7 @@ public class ProcessJoinTest {
         assertSame(parser, test.channel.getParser());
         assertEquals(1, parser.getChannels().size());
         assertTrue(parser.getChannels().contains(test.channel));
-        assertEquals(test.channel, parser.getChannelInfo("#DMDirc_testing"));
+        assertEquals(test.channel, parser.getChannel("#DMDirc_testing"));
     }
     
     @Test
@@ -63,7 +63,7 @@ public class ProcessJoinTest {
         parser.injectLine(":nick JOIN #DMDirc_testing");
         parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
 
-        verify(test).onChannelJoin(parser, parser.getChannelInfo("#DMDirc_testing"),
+        verify(test).onChannelJoin(parser, parser.getChannel("#DMDirc_testing"),
                 parser.getClientInfo("foo!bar@baz").getChannelClients().get(0));
     }    
 

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

@@ -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.getChannelInfo("#DMDirc_testing").getModeParam('l'));
+        assertEquals("1234", parser.getChannel("#DMDirc_testing").getModeParam('l'));
         
-        String modes = parser.getChannelInfo("#DMDirc_testing").getModeStr().split(" ")[0];
+        String modes = parser.getChannel("#DMDirc_testing").getModeStr().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.getChannelInfo("#DMDirc_testing").getModeStr().split(" ")[0];
+        modes = parser.getChannel("#DMDirc_testing").getModeStr().split(" ")[0];
         assertEquals(5, modes.length());
         assertEquals('+', modes.charAt(0));
         assertTrue(modes.indexOf('s') > -1);

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

@@ -53,20 +53,20 @@ public class ProcessNamesTest {
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
         assertEquals(1, parser.getChannels().size());
-        assertNotNull(parser.getChannelInfo("#DMDirc_testing"));
-        assertEquals(4, parser.getChannelInfo("#DMDirc_testing").getChannelClients().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());
 
         ChannelClientInfo cci = parser.getClientInfo("luser").getChannelClients().get(0);
-        assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
+        assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
         
-        cci = parser.getChannelInfo("#DMDirc_testing").getUser("nick2");
+        cci = parser.getChannel("#DMDirc_testing").getUser("nick2");
         assertNotNull(cci);
         assertEquals("@+", cci.getChanModeStr(true));
 
-        cci = parser.getChannelInfo("#DMDirc_testing").getUser("nick3");
+        cci = parser.getChannel("#DMDirc_testing").getUser("nick3");
         assertNotNull(cci);
         assertEquals("", cci.getChanModeStr(true));
     }

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

@@ -51,7 +51,7 @@ public class ProcessNickTest {
         assertEquals(1, parser.getClientInfo("LUSER").getChannelClients().size());
 
         ChannelClientInfo cci = parser.getClientInfo("LUSER").getChannelClients().get(0);
-        assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
+        assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
         
         assertSame(cci.getClient(), tinc.client);
@@ -73,7 +73,7 @@ public class ProcessNickTest {
         assertEquals(1, parser.getClientInfo("foobar").getChannelClients().size());
 
         ChannelClientInfo cci = parser.getClientInfo("foobar").getChannelClients().get(0);
-        assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
+        assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
     }    
     

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

@@ -45,11 +45,11 @@ public class ProcessPartTest {
         final TestIChannelPart test = new TestIChannelPart();
         parser.getCallbackManager().addCallback(ChannelPartListener.class, test);
         
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         parser.injectLine(":luser!foo@barsville PART #DMDirc_testing :Bye bye, cruel world");
         
-        assertEquals(1, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         assertNotNull(test.channel);
         assertNotNull(test.cclient);
@@ -73,11 +73,11 @@ public class ProcessPartTest {
         final TestIChannelPart test = new TestIChannelPart();
         parser.getCallbackManager().addCallback(ChannelPartListener.class, test);
         
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         parser.injectLine(":luser!foo@barsville PART #DMDirc_testing");
         
-        assertEquals(1, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         assertNotNull(test.channel);
         assertNotNull(test.cclient);

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

@@ -49,12 +49,12 @@ public class ProcessQuitTest {
         final TestIQuit test = new TestIQuit();
         parser.getCallbackManager().addCallback(ChannelQuitListener.class, test);
         
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         parser.injectLine(":luser!foo@barsville QUIT :Bye bye, cruel world");
         
-        assertEquals(1, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing2").getChannelClients().size());
+        assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing2").getChannelClients().size());
         
         assertNotNull(test.channel);
         assertNotNull(test.cclient);
@@ -82,12 +82,12 @@ public class ProcessQuitTest {
         final TestIQuit test = new TestIQuit();
         parser.getCallbackManager().addCallback(QuitListener.class, test);
         
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         parser.injectLine(":luser!foo@barsville QUIT :Bye bye, cruel world");
         
-        assertEquals(1, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing2").getChannelClients().size());
+        assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing2").getChannelClients().size());
         
         assertNotNull(test.client);
         assertNotNull(test.reason);
@@ -110,11 +110,11 @@ public class ProcessQuitTest {
         final TestIQuit test = new TestIQuit();
         parser.getCallbackManager().addCallback(QuitListener.class, test);
         
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         parser.injectLine(":luser!foo@barsville QUIT");
         
-        assertEquals(1, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
         assertNotNull(test.client);
         assertNotNull(test.reason);