Unbreak ProcessMessage and rename new interfaces some more

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

@@ -36,7 +36,7 @@ import com.dmdirc.parser.irc.callbacks.SpecificCallback;
  * cChannelClient is null if user is a server, or not on the channel.
  */
 @SpecificCallback
-public interface ChannelModeMessage extends CallbackInterface {
+public interface ChannelModeMessageListener extends CallbackInterface {
 	/**
 	 * Called when a person sends a Message to a channel.
 	 * sHost is the hostname of the person sending the Message. (Can be a server or a person)<br>

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

@@ -36,7 +36,7 @@ import com.dmdirc.parser.irc.callbacks.SpecificCallback;
  * cChannelClient is null if user is a server, or not on the channel.
  */
 @SpecificCallback
-public interface ChannelModeNotice extends CallbackInterface {
+public interface ChannelModeNoticeListener extends CallbackInterface {
 	/**
 	 * Called when a person sends a notice to a channel.
 	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>

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

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelActionListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpReplyListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
@@ -310,7 +312,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @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) {
-		return getCallbackManager().getCallbackType("OnChannelModeNotice").call(prefix, cChannel, cChannelClient, sMessage, sHost);
+		return getCallbackManager().getCallbackType(ChannelModeNoticeListener.class).call(prefix, cChannel, cChannelClient, sMessage, sHost);
 	}
 	
 	/**
@@ -325,7 +327,7 @@ public class ProcessMessage extends IRCProcessor {
 	 * @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) {
-		return getCallbackManager().getCallbackType("OnChannelModeMessage").call(prefix, cChannel, cChannelClient, sMessage, sHost);
+		return getCallbackManager().getCallbackType(ChannelModeMessageListener.class).call(prefix, cChannel, cChannelClient, sMessage, sHost);
 	}
 	
 	/**

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

@@ -43,7 +43,7 @@ public final class CallbackManager {
         ChannelJoinListener.class, ChannelKickListener.class,
         ChannelMessageListener.class, ChannelModeChangeListener.class,
         ChannelNickChangeListener.class, ChannelNonUserModeChangeListener.class,
-	ChannelModeMessage.class, ChannelModeNotice.class,
+	ChannelModeMessageListener.class, ChannelModeNoticeListener.class,
         ChannelNoticeListener.class, ChannelPartListener.class, ChannelQuitListener.class,
         ChannelSelfJoinListener.class, ChannelSingleModeChangeListener.class,
         ChannelTopicListener.class, ChannelUserModeChangeListener.class, ConnectErrorListener.class,