Improve the way specific callbacks are done

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

@@ -22,13 +22,10 @@
 
 package com.dmdirc.parser.irc.callbacks;
 
-import java.util.Hashtable;
-
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.callbacks.interfaces.*;
-import java.lang.reflect.Method;
+
+import java.util.Hashtable;
 import java.util.Map;
 
 /**
@@ -76,11 +73,7 @@ public final class CallbackManager {
 		myParser = parser;
 		
         for (Class<?> type : CLASSES) {
-            final Method method = type.getMethods()[0];
-
-            if (method.getParameterTypes().length > 1 &&
-                    (type.getMethods()[0].getParameterTypes()[1].equals(ClientInfo.class)
-                    || type.getMethods()[0].getParameterTypes()[1].equals(ChannelInfo.class))) {
+            if (type.isAnnotationPresent(SpecificCallback.class)) {
                 addCallbackType(new CallbackObjectSpecific(myParser, this,
                         type.asSubclass(ICallbackInterface.class)));
             } else {

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

@@ -137,11 +137,14 @@ public class CallbackObjectSpecific extends CallbackObject {
         newArgs[0] = myParser;
 
 		for (ICallbackInterface iface :new ArrayList<ICallbackInterface>(callbackInfo)) {
-            if (args[0] instanceof ClientInfo
-                    && !isValidUser(iface, ((ClientInfo) args[0]).getHost())) {
-                continue;
-            } else if (args[0] instanceof ChannelInfo
-                    && !isValidChan(iface, (ChannelInfo) args[0])) {
+            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[args.length - 1] instanceof String
+                        && !isValidUser(iface, (String) args[args.length - 1])))) {
                 continue;
             }
 

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

@@ -0,0 +1,38 @@
+/*
+ * 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.irc.callbacks;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Used to indicate that a callback interface can be called for specified
+ * objects (hosts/channels/etc).
+ *
+ * @since 0.6.3
+ * @author chris
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SpecificCallback {
+
+}

src/com/dmdirc/parser/irc/callbacks/interfaces/IAwayStateOther.java

@@ -24,10 +24,12 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when we go away, or come back.
  */
+@SpecificCallback
 public interface IAwayStateOther extends ICallbackInterface { 
 	/**
 	 * Called when we go away, or come back.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelAction.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person does an action in a channel.
  * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
  * cChannelClient is null if user is a server, or not on the channel.
  */
+@SpecificCallback
 public interface IChannelAction extends ICallbackInterface {
 	/**
 	 * Called when a person does an action in a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelAwayStateOther.java

@@ -25,10 +25,12 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when we go away, or come back.
  */
+@SpecificCallback
 public interface IChannelAwayStateOther extends ICallbackInterface { 
 	/**
 	 * Called when we go away, or come back.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelCTCP.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person sends a CTCP to a channel.
  * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
  * cChannelClient is null if user is a server.
  */
+@SpecificCallback
 public interface IChannelCTCP extends ICallbackInterface {
 	/**
 	 * Called when a person sends a CTCP to a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelCTCPReply.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person sends a CTCPRReply to a channel.
  * sHost is the hostname of the person sending the CTCPReply. (Can be a server or a person)<br>
  * cChannelClient is null if user is a server.
  */
+@SpecificCallback
 public interface IChannelCTCPReply extends ICallbackInterface {
 	/**
 	 * Called when a person sends a CTCPRReply to a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelGotListModes.java

@@ -24,12 +24,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when all requested ListModes have been sent.
  * This is decided by ProcessListModes, and is called when an "end of list"
  * reply is sent, and the listModeQueue is empty (or non-existant).
  */
+@SpecificCallback
 public interface IChannelGotListModes extends ICallbackInterface {
 	/**
 	 * Called when a ListModes reply is parsed.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelGotNames.java

@@ -24,10 +24,12 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a names reply is parsed.
  */
+@SpecificCallback
 public interface IChannelGotNames extends ICallbackInterface {
 	/**
 	 * Called when a names reply is parsed.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelJoin.java

@@ -25,11 +25,13 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called When we, or another client joins a channel.
  * This is called AFTER client has been added to channel as a ChannelClientInfo
  */
+@SpecificCallback
 public interface IChannelJoin extends ICallbackInterface {
 	/**
 	 * Called When another client joins a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelKick.java

@@ -25,11 +25,13 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person is kicked.
  * cKickedByClient can be null if kicked by a server. sKickedByHost is the hostname of the person/server doing the kicking.
  */
+@SpecificCallback
 public interface IChannelKick extends ICallbackInterface {
 	/**
 	 * Called when a person is kicked.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelMessage.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * 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>
  * cChannelClient is null if user is a server, or not on the channel.
  */
+@SpecificCallback
 public interface IChannelMessage extends ICallbackInterface {
 	/**
 	 * Called when a person sends a message to a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelModeChanged.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
  * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
  */
+@SpecificCallback
 public interface IChannelModeChanged extends ICallbackInterface {
 	/**
 	 * Called when the channel modes are changed or discovered.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelNickChanged.java

@@ -25,11 +25,13 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called when we or another user change nickname (Called once per channel the user is on).
  * This is called after the nickname change has been done internally
  */
+@SpecificCallback
 public interface IChannelNickChanged extends ICallbackInterface {
 	/**
 	 * Called when we or another user change nickname (Called once per channel the user is on).

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelNonUserModeChanged.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
  * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
  */
+@SpecificCallback
 public interface IChannelNonUserModeChanged extends ICallbackInterface {
 	/**
 	 * Called when the channel modes are changed or discovered.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelNotice.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * 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>
  * cChannelClient is null if user is a server, or not on the channel.
  */
+@SpecificCallback
 public interface IChannelNotice extends ICallbackInterface {
 	/**
 	 * Called when a person sends a notice to a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelPart.java

@@ -25,11 +25,13 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called When we, or another client parts a channel.
  * This is called BEFORE client has been removed from the channel.
  */
+@SpecificCallback
 public interface IChannelPart extends ICallbackInterface {
 	/**
 	 * Called When we, or another client parts a channel.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelQuit.java

@@ -25,11 +25,13 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called When we, or another client quits IRC (Called once per channel the user was on).
  * This is called BEFORE client has been removed from the channel.
  */
+@SpecificCallback
 public interface IChannelQuit extends ICallbackInterface {
 	/**
 	 * Called When we, or another client quits IRC (Called once per channel the user was on).

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelSingleModeChanged.java

@@ -25,12 +25,14 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
  * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
  */
+@SpecificCallback
 public interface IChannelSingleModeChanged extends ICallbackInterface {
 	/**
 	 * Called when the channel modes are changed or discovered.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelTopic.java

@@ -24,11 +24,13 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called when the topic is changed or discovered for the first time.
  * bIsNewTopic is true if someone sets the topic, false if the topic is discovered on join
  */
+@SpecificCallback
 public interface IChannelTopic extends ICallbackInterface {
 	/**
 	 * Called when the topic is changed or discovered for the first time.

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelUserModeChanged.java

@@ -25,10 +25,12 @@ package com.dmdirc.parser.irc.callbacks.interfaces;
 import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /** 
  * Called when a users channel mode is changed.
  */
+@SpecificCallback
 public interface IChannelUserModeChanged extends ICallbackInterface {
 	/**
 	 * Called when a users channel mode is changed.

src/com/dmdirc/parser/irc/callbacks/interfaces/IPrivateAction.java

@@ -23,12 +23,14 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person does an action to you (PM).
  * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channel.
  */
+@SpecificCallback
 public interface IPrivateAction extends ICallbackInterface {
 	/**
 	 * Called when a person does an action to you (PM).

src/com/dmdirc/parser/irc/callbacks/interfaces/IPrivateCTCP.java

@@ -23,12 +23,14 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person sends a CTCP to you directly.
  * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channels.
  */
+@SpecificCallback
 public interface IPrivateCTCP extends ICallbackInterface {
 	/**
 	 * Called when a person sends a CTCP to you directly.

src/com/dmdirc/parser/irc/callbacks/interfaces/IPrivateCTCPReply.java

@@ -23,12 +23,14 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person sends a CTCPRReply to you directly.
  * sHost is the hostname of the person sending the CTCPRReply. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channels.
  */
+@SpecificCallback
 public interface IPrivateCTCPReply extends ICallbackInterface {
 	/**
 	 * Called when a person sends a CTCPRReply to you directly.

src/com/dmdirc/parser/irc/callbacks/interfaces/IPrivateMessage.java

@@ -23,12 +23,14 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person sends a message to you directly (PM). 
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channel.
  */
+@SpecificCallback
 public interface IPrivateMessage extends ICallbackInterface {
 	/**
 	 * Called when a person sends a message to you directly (PM). 

src/com/dmdirc/parser/irc/callbacks/interfaces/IPrivateNotice.java

@@ -23,12 +23,14 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a person sends a notice to you.
  * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channel.
  */
+@SpecificCallback
 public interface IPrivateNotice extends ICallbackInterface {
 	/**
 	 * Called when a person sends a notice to you.

src/com/dmdirc/parser/irc/callbacks/interfaces/IWallDesync.java

@@ -23,11 +23,13 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when a Desync message is recieved over wallops.
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  */
+@SpecificCallback
 public interface IWallDesync extends ICallbackInterface {
 	/**
 	 * Called when a Desync message is recieved over wallops.

src/com/dmdirc/parser/irc/callbacks/interfaces/IWallop.java

@@ -23,11 +23,13 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when an oper-only message is recieved over wallops.
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  */
+@SpecificCallback
 public interface IWallop extends ICallbackInterface {
 	/**
 	 * Called when an oper-only message is recieved over wallops.

src/com/dmdirc/parser/irc/callbacks/interfaces/IWalluser.java

@@ -23,11 +23,13 @@
 package com.dmdirc.parser.irc.callbacks.interfaces;
 
 import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.SpecificCallback;
 
 /**
  * Called when an all-users message is recieved over wallops.
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  */
+@SpecificCallback
 public interface IWalluser extends ICallbackInterface {
 	/**
 	 * Called when an all-users message is recieved over wallops.