Tidy up invitelabel.

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

@@ -39,10 +39,9 @@ import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
+import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.swing.BorderFactory;
@@ -52,13 +51,11 @@ import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
 
 /**
  * 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 InviteListener, ActionListener {
+public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -70,8 +67,14 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel>
     private final JMenuItem accept;
     /** Parent window that will own popup windows. */
     private final Window parentWindow;
+    /** The client event bus to use for invite events. */
+    private final DMDircMBassador eventBus;
+    /** The swing event bus to use for selection events. */
+    private final SwingEventBus swingEventBus;
     /** Active connection. */
-    private Connection activeConnection;
+    private Optional<Connection> activeConnection;
+    /** Connection manager. */
+    private final ConnectionManager connectionManager;
 
     @Inject
     public InviteLabel(
@@ -83,25 +86,28 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel>
         super(new JLabel());
 
         this.parentWindow = mainFrame;
+        this.connectionManager = connectionManager;
+        this.eventBus = eventBus;
+        this.swingEventBus = swingEventBus;
+        this.activeConnection = Optional.empty();
 
         setBorder(BorderFactory.createEtchedBorder());
         label.setIcon(iconManager.getIcon("invite"));
 
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Dismiss all invites");
-        dismiss.setActionCommand("dismissAll");
-        dismiss.addActionListener(this);
+        dismiss.addActionListener(e -> activeConnection.ifPresent(Connection::removeInvites));
         accept = new JMenuItem("Accept all invites");
-        accept.setActionCommand("acceptAll");
-        accept.addActionListener(this);
-
-        for (final Connection connection : connectionManager.getConnections()) {
-            connection.addInviteListener(this);
-        }
+        accept.addActionListener(e -> activeConnection.ifPresent(Connection::acceptInvites));
+    }
 
+    /**
+     * Initialises the invite label, adding appropriate listeners.
+     */
+    public void init() {
+        connectionManager.getConnections().forEach(c-> c.addInviteListener(this));
         swingEventBus.subscribe(this);
         eventBus.subscribe(this);
-
         update();
     }
 
@@ -116,9 +122,11 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel>
     private void popuplateMenu() {
         menu.removeAll();
 
-        final Collection<Invite> invites = activeConnection.getInvites();
-        for (final Invite invite : invites) {
-            menu.add(new JMenuItem(new InviteAction(invite)));
+        if (activeConnection.isPresent()) {
+            final Collection<Invite> invites = activeConnection.get().getInvites();
+            for (final Invite invite : invites) {
+                menu.add(new JMenuItem(new InviteAction(invite)));
+            }
         }
         menu.add(new JSeparator());
         menu.add(accept);
@@ -130,7 +138,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel>
      */
     private void update() {
         UIUtilities.invokeLater(() -> {
-            if (activeConnection == null || activeConnection.getInvites().isEmpty()) {
+            if (!activeConnection.isPresent() || activeConnection.get().getInvites().isEmpty()) {
                 setVisible(false);
                 closeDialog();
             } else {
@@ -178,26 +186,13 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel>
         }
     }
 
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        switch (e.getActionCommand()) {
-            case "acceptAll":
-                activeConnection.acceptInvites();
-                break;
-            case "dismissAll":
-                activeConnection.removeInvites();
-                break;
-        }
-    }
-
     @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
-            activeConnection = event.getWindow().get().getContainer().getConnection();
+            activeConnection = event.getWindow().get().getContainer().getOptionalConnection();
         } else {
             activeConnection = null;
         }
         update();
     }
-
 }

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

@@ -27,9 +27,11 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.util.DateUtils;
 
 import java.awt.Window;
+import java.util.Optional;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 
 /**
  * Shows information about received invites.
@@ -41,7 +43,7 @@ public class InvitePopup extends StatusbarPopupWindow {
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** The connection to show invites for. */
-    private final Connection connection;
+    private final Optional<Connection> connection;
 
     /**
      * Creates a new InvitePopup for the specified panel and connection.
@@ -51,22 +53,23 @@ public class InvitePopup extends StatusbarPopupWindow {
      * @param parentWindow Parent window
      */
     public InvitePopup(final JPanel parent,
-            final Connection connection, final Window parentWindow) {
+            final Optional<Connection> connection, final Window parentWindow) {
         super(parent, parentWindow);
         this.connection = connection;
     }
 
     @Override
     protected void initContent(final JPanel panel) {
-        for (final Invite invite : connection.getInvites()) {
-            panel.add(new JLabel(invite.getChannel()), "growx, pushx");
-            panel.add(new JLabel(invite.getSource()[0], JLabel.CENTER),
-                    "growx, pushx, al center");
-            panel.add(new JLabel(DateUtils.formatDuration((int) (System.currentTimeMillis()
-                    - invite.getTimestamp())
-                    / 1000) + " ago", JLabel.RIGHT),
-                    "growx, pushx, al right, wrap");
+        if (connection.isPresent()) {
+            for (final Invite invite : connection.get().getInvites()) {
+                panel.add(new JLabel(invite.getChannel()), "growx, pushx");
+                panel.add(new JLabel(invite.getSource()[0], SwingConstants.CENTER),
+                        "growx, pushx, al center");
+                panel.add(new JLabel(DateUtils.formatDuration(
+                                (int) (System.currentTimeMillis() - invite.getTimestamp()) / 1000)
+                                + " ago", SwingConstants.RIGHT),
+                        "growx, pushx, al right, wrap");
+            }
         }
     }
-
 }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 
@@ -47,8 +46,6 @@ public class SwingStatusBar extends JPanel {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 5;
-    /** Event bus to post events to. */
-    private final DMDircMBassador eventBus;
     /** Mig layout component restraints. */
     private final String componentConstraints;
     /** error panel. */
@@ -61,14 +58,12 @@ public class SwingStatusBar extends JPanel {
     /**
      * Creates a new instance of SwingStatusBar.
      *
-     * @param eventBus     The event bus to post events to (should be removed soon)
      * @param inviteLabel  The invite label to add to the status bar.
      * @param updaterLabel The updater label to add to the status bar.
      * @param errorLabel   The error label to add to the status bar.
      * @param messageLabel The message label to add to the status bar.
      */
     public SwingStatusBar(
-            final DMDircMBassador eventBus,
             final InviteLabel inviteLabel,
             final UpdaterLabel updaterLabel,
             final ErrorPanel errorLabel,
@@ -81,11 +76,12 @@ public class SwingStatusBar extends JPanel {
         componentConstraints = "sgy components, hmax " + height + ", hmin " + height
                 + ", wmin 20, shrink 0";
 
-        this.eventBus = eventBus;
         this.errorLabel = errorLabel;
         this.updaterLabel = updaterLabel;
         this.inviteLabel = inviteLabel;
 
+        inviteLabel.init();
+
         setLayout(new MigLayout("fill, ins 0, hidemode 3"));
 
         add(messageLabel, "grow, push, sgy components, hmax " + height