Add some more server events.

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

src/com/dmdirc/addons/identd/IdentdManager.java

@@ -23,20 +23,22 @@
 package com.dmdirc.addons.identd;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.events.ServerConnectErrorEvent;
+import com.dmdirc.events.ServerConnectedEvent;
+import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
-public class IdentdManager implements ActionListener {
+public class IdentdManager {
 
     /** List of all the connections that need ident replies. */
     private final List<Connection> connections;
@@ -46,18 +48,18 @@ public class IdentdManager implements ActionListener {
     private final String domain;
     /** Ident server. */
     private final IdentdServer server;
-    /** Action controller to register action listeners with. */
-    private final ActionController actionController;
+    /** Event bus to subscribe to events on. */
+    private final EventBus eventBus;
 
     @Inject
     public IdentdManager(@GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain,
-            final IdentdServer server, final ActionController actionController) {
+            final IdentdServer server, final EventBus eventBus) {
         connections = new ArrayList<>();
         this.config = config;
         this.domain = domain;
         this.server = server;
-        this.actionController = actionController;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -65,10 +67,7 @@ public class IdentdManager implements ActionListener {
      */
     public void onLoad() {
         // Add action hooks
-        actionController.registerListener(this,
-                CoreActionType.SERVER_CONNECTED,
-                CoreActionType.SERVER_CONNECTING,
-                CoreActionType.SERVER_CONNECTERROR);
+        eventBus.register(this);
 
         if (config.getOptionBool(domain, "advanced.alwaysOn")) {
             server.startServer();
@@ -79,38 +78,39 @@ public class IdentdManager implements ActionListener {
      * Called when this plugin is unloaded.
      */
     public void onUnload() {
-        actionController.unregisterListener(this);
+        eventBus.unregister(this);
         server.stopServer();
         connections.clear();
     }
 
-    /**
-     * Process an event of the specified type.
-     *
-     * @param type      The type of the event to process
-     * @param format    Format of messages that are about to be sent. (May be null)
-     * @param arguments The arguments for the event
-     */
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type == CoreActionType.SERVER_CONNECTING) {
-            synchronized (connections) {
+    @Subscribe
+    public void handleServerConnecting(final ServerConnectingEvent event) {
+        synchronized (connections) {
                 if (connections.isEmpty()) {
                     server.startServer();
                 }
-                connections.add((Connection) arguments[0]);
+                connections.add(event.getConnection());
             }
-        } else if (type == CoreActionType.SERVER_CONNECTED
-                || type == CoreActionType.SERVER_CONNECTERROR) {
-            synchronized (connections) {
-                connections.remove((Connection) arguments[0]);
+    }
+
+    @Subscribe
+    public void handleServerConnected(final ServerConnectedEvent event) {
+        handleServerRemoved(event.getConnection());
+    }
+
+    @Subscribe
+    public void handleServerConnectError(final ServerConnectErrorEvent event) {
+        handleServerRemoved(event.getConnection());
+    }
+
+    private void handleServerRemoved(final Connection connection) {
+        synchronized (connections) {
+                connections.remove(connection);
 
                 if (connections.isEmpty() && !config.getOptionBool(domain, "advanced.alwaysOn")) {
                     server.stopServer();
                 }
             }
-        }
     }
 
 }

src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
@@ -31,6 +32,8 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.events.ServerDisconnectedEvent;
+import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -39,6 +42,9 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.collections.RollingList;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -54,6 +60,8 @@ import javax.inject.Singleton;
 @Singleton
 public class LagDisplayManager implements ActionListener, ConfigChangeListener, SelectionListener {
 
+    /** Event bus to receive events on. */
+    private final EventBus eventBus;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** Status bar to add panels to. */
@@ -78,11 +86,13 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
 
     @Inject
     public LagDisplayManager(
+            final EventBus eventBus,
             final ActiveFrameManager activeFrameManager,
             final SwingStatusBar statusBar,
             final Provider<LagDisplayPanel> panelProvider,
             @PluginDomain(LagDisplayPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
+        this.eventBus = eventBus;
         this.activeFrameManager = activeFrameManager;
         this.statusBar = statusBar;
         this.panelProvider = panelProvider;
@@ -98,8 +108,8 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
         readConfig();
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.SERVER_GOTPING, CoreActionType.SERVER_NOPING,
-                CoreActionType.SERVER_DISCONNECTED,
-                CoreActionType.SERVER_PINGSENT, CoreActionType.SERVER_NUMERIC);
+                CoreActionType.SERVER_PINGSENT);
+        eventBus.register(this);
     }
 
     public void unload() {
@@ -164,6 +174,51 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
         panel.refreshDialog();
     }
 
+    @Subscribe
+    public void handleServerNumeric(final ServerNumericEvent event) {
+        if (event.getNumeric() != 421) {
+            return;
+        }
+        boolean useAlternate = ((Server) event.getConnection()).getConfigManager()
+                .getOptionBool(domain, "usealternate");
+        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
+        final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
+        final boolean isActive = active != null && event.getConnection().equals(active.
+                getConnection());
+        final String[] args = event.getArgs();
+        if (useAlternate && args[3].startsWith("LAGCHECK_")) {
+            try {
+                final long sent = Long.parseLong(args[3].substring(9));
+                final Long duration = new Date().getTime() - sent;
+                final String value = formatTime(duration);
+                pings.put(event.getConnection(), value);
+                getHistory(event.getConnection()).add(duration);
+                if (isActive) {
+                    panel.getComponent().setText(value);
+                }
+            } catch (NumberFormatException ex) {
+                pings.remove(event.getConnection());
+            }
+            event.setDisplayFormat("");
+
+            panel.refreshDialog();
+        }
+    }
+
+    @Subscribe
+    public void handleServerDisconnected(final ServerDisconnectedEvent event) {
+        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
+        final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
+        final boolean isActive = active != null && event.getConnection().equals(active.
+                getConnection());
+        if (isActive) {
+                panel.getComponent().setText("Not connected");
+                pings.remove(event.getConnection());
+            }
+
+            panel.refreshDialog();
+    }
+
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
@@ -205,40 +260,10 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
                 panel.getComponent().setText(value);
             }
 
-            panel.refreshDialog();
-        } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
-            if (isActive) {
-                panel.getComponent().setText("Not connected");
-                pings.remove(arguments[0]);
-            }
-
             panel.refreshDialog();
         } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
             ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().
                     getTime());
-        } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
-                && ((Integer) arguments[1]) == 421
-                && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
-            try {
-                final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
-                final Long duration = new Date().getTime() - sent;
-                final String value = formatTime(duration);
-
-                pings.put((Connection) arguments[0], value);
-                getHistory(((Connection) arguments[0])).add(duration);
-
-                if (isActive) {
-                    panel.getComponent().setText(value);
-                }
-            } catch (NumberFormatException ex) {
-                pings.remove(arguments[0]);
-            }
-
-            if (format != null) {
-                format.delete(0, format.length());
-            }
-
-            panel.refreshDialog();
         }
     }
 

src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -22,41 +22,42 @@
 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
 
-public class ParserDebugManager implements ActionListener, DebugInfoListener {
+public class ParserDebugManager implements DebugInfoListener {
 
+    /** Event bus to subscribe to events on. */
+    private final EventBus eventBus;
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers;
-    /** Action controller. */
-    private final ActionController actionController;
     /** URL Builder. */
     private final URLBuilder urlBuilder;
     /** Window manager. */
     private final WindowManager windowManager;
 
     @Inject
-    public ParserDebugManager(final ActionController actionController,
+    public ParserDebugManager(
             final URLBuilder urlBuilder,
-            final WindowManager windowManager) {
-        this.actionController = actionController;
+            final WindowManager windowManager,
+            final EventBus eventBus) {
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
+        this.eventBus = eventBus;
         registeredParsers = new HashMap<>();
     }
 
@@ -64,14 +65,14 @@ public class ParserDebugManager implements ActionListener, DebugInfoListener {
      * Adds action listener.
      */
     public void addActionListener() {
-        actionController.registerListener(this, CoreActionType.SERVER_DISCONNECTED);
+        eventBus.register(this);
     }
 
     /**
      * Remove action listener.
      */
     public void removeActionListener() {
-        actionController.unregisterListener(this);
+        eventBus.unregister(this);
     }
 
     /**
@@ -145,15 +146,12 @@ public class ParserDebugManager implements ActionListener, DebugInfoListener {
         }
     }
 
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type == CoreActionType.SERVER_DISCONNECTED) {
-            final Parser parser = ((Connection) arguments[0]).getParser();
+    @Subscribe
+    public void handleServerDisconnected(final ServerDisconnectedEvent event) {
+            final Parser parser = event.getConnection().getParser();
             if (registeredParsers.containsKey(parser)) {
                 removeParser(parser, false);
             }
-        }
     }
 
     @Override

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -25,20 +25,23 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.Invite;
 import com.dmdirc.ServerManager;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.events.ServerConnectErrorEvent;
+import com.dmdirc.events.ServerConnectedEvent;
+import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
 
@@ -52,9 +55,8 @@ import javax.swing.JSeparator;
 /**
  * A status bar component to show invites to the user and enable them to accept or dismiss them.
  */
-public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
-        StatusBarComponent, InviteListener, ActionListener,
-        java.awt.event.ActionListener, SelectionListener {
+public class InviteLabel extends StatusbarPopupPanel<JLabel> implements StatusBarComponent,
+        InviteListener, ActionListener, SelectionListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -72,12 +74,14 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     /**
      * Instantiates a new invite label.
      *
+     * @param eventBus      The event bus to subscribe to events on
      * @param iconManager   The manager to retrieve the invite icon from.
      * @param serverManager The manager to use to iterate servers.
      * @param mainFrame     Main frame
      */
     @Inject
     public InviteLabel(
+            final EventBus eventBus,
             @GlobalConfig final IconManager iconManager,
             final ServerManager serverManager,
             final MainFrame mainFrame) {
@@ -101,12 +105,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         }
 
         mainFrame.addSelectionListener(this);
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_CONNECTED);
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_DISCONNECTED);
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_CONNECTERROR);
+        eventBus.register(this);
 
         update();
     }
@@ -160,18 +159,23 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         update();
     }
 
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type == CoreActionType.SERVER_CONNECTED) {
-            if (arguments[0] instanceof Connection) {
-                ((Connection) arguments[0]).addInviteListener(this);
-            }
-        } else {
-            if (arguments[0] instanceof Connection) {
-                ((Connection) arguments[0]).removeInviteListener(this);
-            }
-        }
+    @Subscribe
+    public void handleServerConnected(final ServerConnectedEvent event) {
+        event.getConnection().addInviteListener(this);
+    }
+
+    @Subscribe
+    public void handleServerDisconnected(final ServerDisconnectedEvent event) {
+        handleServerRemoved(event.getConnection());
+    }
+
+    @Subscribe
+    public void handleServerConnectError(final ServerConnectErrorEvent event) {
+        handleServerRemoved(event.getConnection());
+    }
+
+    private void handleServerRemoved(final Connection connection) {
+        connection.removeInviteListener(this);
     }
 
     /**