Away state listeners and formatters

git-svn-id: http://svn.dmdirc.com/trunk@2667 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Server.java

@@ -28,6 +28,7 @@ import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -1054,26 +1055,6 @@ public final class Server extends WritableFrameContainer implements Serializable
                 Integer.valueOf(numeric), tokens);
     }
 
-    /**
-     * Called when our away state changes.
-     *
-     * @param currentState The new aray state
-     * @param reason Our away reason, if applicable
-     */
-    public void onAwayState(final boolean currentState, final String reason) {
-        if (currentState) {
-            awayMessage = reason;
-
-            ActionManager.processEvent(CoreActionType.SERVER_AWAY, null, this, awayMessage);
-        } else {
-            awayMessage = "";
-
-            ActionManager.processEvent(CoreActionType.SERVER_BACK, null, this);
-        }
-
-        window.setAwayIndicator(isAway());
-    }
-
     /**
      * Called when the socket has been closed.
      */
@@ -1254,5 +1235,45 @@ public final class Server extends WritableFrameContainer implements Serializable
             listener.inviteExpired(this, invite);
         }
     }
+    
+    // ----------------------------------------------- AWAY STATE HANDLING -----
+    
+    /**
+     * Adds an away state lisener to this server.
+     * 
+     * @param listener The listener to be added
+     */
+    public void addAwayStateListener(final AwayStateListener listener) {
+        listeners.add(AwayStateListener.class, listener);
+    }
+    
+    /**
+     * Removes an away state lisener from this server.
+     * 
+     * @param listener The listener to be removed
+     */
+    public void removeAwayStateListener(final AwayStateListener listener) {
+        listeners.remove(AwayStateListener.class, listener);
+    }
+    
+    /**
+     * Updates our away state and fires the relevant listeners.
+     * 
+     * @param message The away message to use, or an empty string if we're not
+     * away
+     */
+    public void updateAwayState(final String message) {
+        awayMessage = message;
+        
+        if (message.isEmpty()) {
+            for (AwayStateListener listener : listeners.get(AwayStateListener.class)) {
+                listener.onBack();
+            }
+        } else {
+            for (AwayStateListener listener : listeners.get(AwayStateListener.class)) {
+                listener.onAway(message);
+            }            
+        }
+    }
 
 }

src/com/dmdirc/ServerEventHandler.java

@@ -205,7 +205,14 @@ public final class ServerEventHandler extends EventHandler
     public void onAwayState(final IRCParser tParser, final boolean currentState,
             final String reason) {
         checkParser(tParser);
-        owner.onAwayState(currentState, reason);
+        
+        owner.updateAwayState(currentState ? reason : "");
+        
+        if (currentState) {
+            owner.doNotification("away", CoreActionType.SERVER_AWAY, reason);
+        } else {
+            owner.doNotification("back", CoreActionType.SERVER_BACK);
+        }
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/config/defaults/default/defaults

@@ -32,6 +32,8 @@ general.port=7000
 general.password=
 
 notifications.authNotice=server
+notifications.away=server
+notifications.back=server
 notifications.unknownNotice=server
 notifications.connectError=server
 notifications.connectRetry=server

src/com/dmdirc/config/defaults/default/formatter

@@ -148,9 +148,13 @@ formatter.connectError = \u00032Error connecting: %2$s
 formatter.connectRetry = \u00032Reconnecting in %2$s seconds...
 formatter.serverConnecting = Connecting to %1$s:%2$s...
 
+# Type: Argless
+formatter.back = \u000314You are no longer marked as away.
+
 # Type: Miscellaneous
 #    1: Miscellaneous data
 formatter.authNotice = \u00035-AUTH- %1$s
+formatter.away = \u000314You are now marked as away (%1$s\u000F\u000314).
 formatter.channelNoTopic = \u00033* There is no topic set for %1$s\u000F.
 formatter.rawCommand = \u000310>>> %1$s
 formatter.unknownCommand = \u000314Unknown command %1$s\u000F.

src/com/dmdirc/interfaces/AwayStateListener.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006-2007 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.interfaces;
+
+/**
+ * AwayStateListeners are informed of changes to our away state.
+ * 
+ * @author chris
+ */
+public interface AwayStateListener {
+    
+    /**
+     * Called when we're marked as away.
+     * 
+     * @param reason The reason that we're away
+     */
+    void onAway(String reason);
+    
+    /**
+     * Called when we're marked as back.
+     */
+    void onBack();
+
+}