Adds callbacks for server notices issue 2993

Change-Id: Ic28eb35b5b606584ce76e08034b643c1e9f31d7c
Reviewed-on: http://gerrit.dmdirc.com/491
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <devs-public@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/parser/common/CallbackManager.java

@@ -67,6 +67,7 @@ public abstract class CallbackManager<T extends Parser> {
         UnknownMessageListener.class, UnknownNoticeListener.class,
         UserModeChangeListener.class, UserModeDiscoveryListener.class,
         WallDesyncListener.class, WallopListener.class, WalluserListener.class,
+        ServerNoticeListener.class, UnknownServerNoticeListener.class,
     };
     
     /** Hashtable used to store the different types of callback known. */

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006-2010 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.callbacks;
+
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.SpecificCallback;
+
+/**
+ * Called when a server sends a notice to you.
+ * sHost is the hostname of the server sending the notice.<br>
+ */
+@SpecificCallback
+public interface ServerNoticeListener extends CallbackInterface {
+	/**
+	 * Called when a server sends a notice to you.
+	 * sHost is the hostname of the server sending the notice.<br>
+	 * 
+	 * @param tParser Reference to the parser object that made the callback.
+	 * @param sMessage Notice contents
+	 * @param sHost Hostname of sender
+	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
+	 */
+	void onServerNotice(Parser tParser, String sMessage, String sHost);
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006-2010 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.callbacks;
+
+import com.dmdirc.parser.interfaces.Parser;
+
+/**
+ * Called when a server sends a notice not aimed specifically at you or a channel (ie $*).
+ * sHost is the hostname of the server sending the message.<br>
+ */
+public interface UnknownServerNoticeListener extends CallbackInterface {
+	/**
+	 * Called when a server sends a notice not aimed specifically at you or a channel (ie $*).
+	 * sHost is the hostname of the server sending the message.<br>
+	 * cClient is null if user is a server, or not on any common channel.
+	 * 
+	 * @param tParser Reference to the parser object that made the callback.
+	 * @param sMessage Notice contents
+	 * @param sTarget Actual target of notice
+	 * @param sHost Hostname of sender
+	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownServerNotice
+	 */
+	void onUnknownServerNotice(Parser tParser, String sMessage, String sTarget, String sHost);
+}

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

@@ -37,11 +37,13 @@ import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpReplyListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ServerNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownActionListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownCtcpListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownCtcpReplyListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.UnknownNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownServerNoticeListener;
 
 import java.util.regex.PatternSyntaxException;
 
@@ -207,7 +209,11 @@ public class ProcessMessage extends IRCProcessor {
                 if (isCTCP) {
                     callPrivateCTCPReply(sCTCP, sMessage, token[0]);
                 } else {
-                    callPrivateNotice(sMessage, token[0]);
+                    if (token[0].indexOf("@") == -1) {
+                        callServerNotice(sMessage, token[0]);
+                    } else {
+                        callPrivateNotice(sMessage, token[0]);
+                    }
                 }
             }
         } else {
@@ -226,7 +232,11 @@ public class ProcessMessage extends IRCProcessor {
                 if (isCTCP) {
                     callUnknownCTCPReply(sCTCP, sMessage, token[2], token[0]);
                 } else {
-                    callUnknownNotice(sMessage, token[2], token[0]);
+                    if (token[0].indexOf("@") == -1) {
+                        callUnknownServerNotice(sMessage, token[2], token[0]);
+                    } else {
+                        callUnknownNotice(sMessage, token[2], token[0]);
+                    }
                 }
             }
         }
@@ -395,6 +405,18 @@ public class ProcessMessage extends IRCProcessor {
     protected boolean callPrivateNotice(final String sMessage, final String sHost) {
         return getCallbackManager().getCallbackType(PrivateNoticeListener.class).call(sMessage, sHost);
     }
+
+    /**
+     * Callback to all objects implementing the ServerNotice Callback.
+     *
+     * @see com.dmdirc.parser.irc.callbacks.interfaces.ServerNotice
+     * @param sMessage Notice contents
+     * @param sHost Hostname of sender (or servername)
+     * @return true if a method was called, false otherwise
+     */
+    protected boolean callServerNotice(final String sMessage, final String sHost) {
+        return getCallbackManager().getCallbackType(ServerNoticeListener.class).call(sMessage, sHost);
+    }
     
     /**
      * Callback to all objects implementing the UnknownAction Callback.
@@ -463,6 +485,19 @@ public class ProcessMessage extends IRCProcessor {
         return getCallbackManager().getCallbackType(UnknownNoticeListener.class).call(sMessage, sTarget, sHost);
     }
 
+    /**
+     * Callback to all objects implementing the UnknownNotice Callback.
+     *
+     * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownNotice
+     * @param sMessage Notice contents
+     * @param sTarget Actual target of notice
+     * @param sHost Hostname of sender (or servername)
+     * @return true if a method was called, false otherwise
+     */
+    protected boolean callUnknownServerNotice(final String sMessage, final String sTarget, final String sHost) {
+        return getCallbackManager().getCallbackType(UnknownServerNoticeListener.class).call(sMessage, sTarget, sHost);
+    }
+
     
     /**
      * What does this IRCProcessor handle.