Add some more server events.

Change-Id: Ib12542d236757d76540d57ff54341e3b73ceb598
Reviewed-on: http://gerrit.dmdirc.com/3437
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/Server.java

@@ -28,6 +28,11 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
+import com.dmdirc.events.ServerConnectErrorEvent;
+import com.dmdirc.events.ServerConnectedEvent;
+import com.dmdirc.events.ServerConnectingEvent;
+import com.dmdirc.events.ServerDisconnectedEvent;
+import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
@@ -371,8 +376,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             }
         }
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.SERVER_CONNECTING, null, this);
+        eventBus.post(new ServerConnectingEvent(this));
     }
 
     @Override
@@ -1192,10 +1196,11 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             target = new StringBuffer("numeric_unknown");
         }
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.SERVER_NUMERIC, target, this, numeric, tokens);
+        final ServerNumericEvent event = new ServerNumericEvent(this, numeric, tokens);
+        event.setDisplayFormat(target.toString());
+        eventBus.post(event);
 
-        handleNotification(target.toString(), (Object[]) tokens);
+        handleNotification(event.getDisplayFormat(), (Object[]) tokens);
     }
 
     /**
@@ -1222,8 +1227,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
         handleNotification("socketClosed", getAddress());
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.SERVER_DISCONNECTED, null, this);
+        eventBus.post(new ServerDisconnectedEvent(this));
 
         eventHandler.unregisterCallbacks();
 
@@ -1330,9 +1334,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 }
             }
 
-            ActionManager.getActionManager().triggerEvent(
-                    CoreActionType.SERVER_CONNECTERROR, null, this,
-                    description);
+            eventBus.post(new ServerConnectErrorEvent(this, description));
 
             handleNotification("connectError", getAddress(), description);
 
@@ -1413,8 +1415,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             }, whoTime, whoTime, TimeUnit.MILLISECONDS);
         }
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.SERVER_CONNECTED, null, this);
+        eventBus.post(new ServerConnectedEvent(this));
     }
 
     /**

src/com/dmdirc/actions/ActionManager.java

@@ -182,7 +182,7 @@ public class ActionManager implements ActionController {
             addGroup(wrapper);
         }
 
-        new WhoisNumericFormatter(identityManager.getAddonSettings()).register();
+        new WhoisNumericFormatter(identityManager.getAddonSettings(), eventBus).register();
 
         eventBus.register(this);
     }

src/com/dmdirc/actions/CoreActionType.java

@@ -85,14 +85,19 @@ public enum CoreActionType implements ActionType {
     /** Unknown command. */
     UNKNOWN_COMMAND(ClientEvents.UNKNOWN_COMMAND, "Unknown command entered"),
     /** Server numeric received. */
+    @Deprecated
     SERVER_NUMERIC(ServerEvents.SERVER_NUMERIC, "Numeric event received"),
     /** Server connected. */
+    @Deprecated
     SERVER_CONNECTED(ServerEvents.SERVER_EVENT, "Server connected"),
     /** Server connecting. */
+    @Deprecated
     SERVER_CONNECTING(ServerEvents.SERVER_EVENT, "Server connecting"),
     /** Server connection error. */
+    @Deprecated
     SERVER_CONNECTERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server connection error"),
     /** Server disconnected. */
+    @Deprecated
     SERVER_DISCONNECTED(ServerEvents.SERVER_EVENT, "Server disconnected"),
     /** Marked as away. */
     SERVER_BACK(ServerEvents.SERVER_EVENT, "Marked as 'back'"),

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -22,13 +22,14 @@
 
 package com.dmdirc.actions.internal;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.events.ServerDisconnectedEvent;
+import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,51 +38,44 @@ import java.util.Map;
  *
  * @since 0.6.3
  */
-public class WhoisNumericFormatter implements ActionListener {
+public class WhoisNumericFormatter {
 
     /** The name of the target of any current whois requests. */
     private final Map<Connection, String> targets = new HashMap<>();
     /** The identity to add formatters to. */
     private final ConfigProvider identity;
+    /** Event bus to subscribe to events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new whois numeric formatter that will add automatic formats to the specified
      * identity. This will normally be a temporary global identity.
      *
      * @param identity The identity to write formatters to
+     * @param eventBus The event bus to subscribe to events on
      */
-    public WhoisNumericFormatter(final ConfigProvider identity) {
+    public WhoisNumericFormatter(final ConfigProvider identity,
+            final EventBus eventBus) {
         this.identity = identity;
+        this.eventBus = eventBus;
     }
 
     /**
      * Registers this this whois numeric formatter with the global actions manager.
      */
     public void register() {
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_NUMERIC,
-                CoreActionType.SERVER_DISCONNECTED);
-    }
-
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (CoreActionType.SERVER_DISCONNECTED == type) {
-            handleServerDisconnected((Connection) arguments[0]);
-        } else {
-            handleNumeric((Connection) arguments[0], (Integer) arguments[1],
-                    (String[]) arguments[2], format);
-        }
+        eventBus.register(this);
     }
 
     /**
      * Handles a server disconnected event. This clears any entry for that server in the
      * {@link #targets} map.
      *
-     * @param server The server that was disconnected
+     * @param event The server disconnected event to process
      */
-    private void handleServerDisconnected(final Connection server) {
-        targets.remove(server);
+    @Subscribe
+    public void handleServerDisconnected(final ServerDisconnectedEvent event) {
+        targets.remove(event.getConnection());
     }
 
     /**
@@ -90,13 +84,13 @@ public class WhoisNumericFormatter implements ActionListener {
      * without formatters for events which look like WHOIS information, and formats them
      * automatically.
      *
-     * @param server    The server on which the event was received
-     * @param numeric   The numeric code of the event
-     * @param arguments The arguments to the numeric event
-     * @param format    The format that should be used to display the event
+     * @param event The server numeric event to process
      */
-    private void handleNumeric(final Connection server, final int numeric,
-            final String[] arguments, final StringBuffer format) {
+    @Subscribe
+    public void handleNumeric(final ServerNumericEvent event) {
+        final Connection server = event.getConnection();
+        final int numeric = event.getNumeric();
+        final String[] arguments = event.getArgs();
         switch (numeric) {
             case 311: // RPL_WHOISUSER
                 targets.put(server, arguments[3]);
@@ -110,17 +104,17 @@ public class WhoisNumericFormatter implements ActionListener {
                         && arguments[3].equals(targets.get(server))) {
                     // This numeric should be automatically formatted.
 
-                    if (format.length() > 0) {
+                    if (!event.getDisplayFormat().isEmpty()) {
                         // There's a custom format. We'll see if we need to
                         // add a formatter or notification settings for it
                         // anyway.
-                        ensureExists(format.toString(), arguments.length);
+                        ensureExists(event.getDisplayFormat(), arguments.length);
                     } else {
                         // No custom formatter, switch it to an auto whois
                         // format and target.
                         final String target = "numeric_autowhois_" + (arguments.length - 4);
                         ensureExists(target, arguments.length);
-                        format.replace(0, format.length(), target);
+                        event.setDisplayFormat(target);
                     }
                 }
                 break;

src/com/dmdirc/events/ServerConnectErrorEvent.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Fire when a server errored whilst connecting.
+ */
+public class ServerConnectErrorEvent extends ServerEvent {
+
+    private final String message;
+
+    public ServerConnectErrorEvent(final Connection connection, final String message) {
+        super(connection);
+        this.message = message;
+    }
+
+    public ServerConnectErrorEvent(final long timestamp, final Connection connection,
+            final String message) {
+        super(timestamp, connection);
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

src/com/dmdirc/events/ServerConnectedEvent.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Fire when a server is connected.
+ */
+public class ServerConnectedEvent extends ServerEvent {
+
+    public ServerConnectedEvent(final Connection connection) {
+        super(connection);
+    }
+
+    public ServerConnectedEvent(final long timestamp, final Connection connection) {
+        super(timestamp, connection);
+    }
+
+}

src/com/dmdirc/events/ServerConnectingEvent.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Fire when a server is connecting.
+ */
+public class ServerConnectingEvent extends ServerEvent {
+
+    public ServerConnectingEvent(final Connection connection) {
+        super(connection);
+    }
+
+    public ServerConnectingEvent(final long timestamp, final Connection connection) {
+        super(timestamp, connection);
+    }
+
+}

src/com/dmdirc/events/ServerDisconnectedEvent.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Fire when a server disconnects.
+ */
+public class ServerDisconnectedEvent extends ServerEvent {
+
+    public ServerDisconnectedEvent(final Connection connection) {
+        super(connection);
+    }
+
+    public ServerDisconnectedEvent(final long timestamp, final Connection connection) {
+        super(timestamp, connection);
+    }
+
+}

src/com/dmdirc/events/ServerDisplayableEvent.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+
+/**
+ * Base type for events that occur on a connection.
+ */
+public abstract class ServerDisplayableEvent extends ServerEvent implements DisplayableEvent {
+
+    /** The display format to use for this event. */
+    private final AtomicReference<String> displayFormatRef = new AtomicReference<>("");
+
+    public ServerDisplayableEvent(final long timestamp, final Connection connection) {
+        super(timestamp, connection);
+    }
+
+    public ServerDisplayableEvent(final Connection connection) {
+        super(connection);
+    }
+
+    @Override
+    public String getDisplayFormat() {
+        return displayFormatRef.get();
+    }
+
+    @Override
+    public void setDisplayFormat(String format) {
+        this.displayFormatRef.set(format);
+    }
+}

src/com/dmdirc/events/ServerEvent.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Base type for events that occur on a connection.
+ */
+public abstract class ServerEvent extends DMDircEvent {
+
+    /** The connection that this event occurred on. */
+    private final Connection connection;
+
+    public ServerEvent(final long timestamp, final Connection connection) {
+        super(timestamp);
+        this.connection = checkNotNull(connection);
+    }
+
+    public ServerEvent(final Connection connection) {
+        this.connection = checkNotNull(connection);
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+}

src/com/dmdirc/events/ServerNumericEvent.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.events;
+
+import com.dmdirc.Server;
+
+/**
+ * Event raised when a server numeric occurs.
+ */
+public class ServerNumericEvent extends ServerDisplayableEvent {
+
+    private final int numeric;
+    private final String[] args;
+
+    public ServerNumericEvent(final long timestamp, final Server server, final int numeric,
+            final String[] args) {
+        super(timestamp, server);
+        this.numeric = numeric;
+        this.args = args;
+    }
+
+    public ServerNumericEvent(final Server server, final int numeric, final String[] args) {
+        super(server);
+        this.numeric = numeric;
+        this.args = args;
+    }
+
+    public int getNumeric() {
+        return numeric;
+    }
+
+    public String[] getArgs() {
+        return args;
+    }
+
+}