Invite label popup

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

@@ -38,7 +38,6 @@ import com.dmdirc.util.MapList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,11 +49,12 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
+
 /**
  * Invite label.
  */
-public class InviteLabel extends JLabel implements StatusBarComponent, 
-        InviteListener, ActionListener, MouseListener {
+public class InviteLabel extends StatusbarPopupPanel implements StatusBarComponent,
+        InviteListener, ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -77,10 +77,10 @@ public class InviteLabel extends JLabel implements StatusBarComponent,
      * Instantiates a new invite label.
      */
     public InviteLabel() {
-        super();
+        super(new JLabel());
 
         setBorder(BorderFactory.createEtchedBorder());
-        setIcon(IconManager.getIconManager().getIcon("invite"));
+        label.setIcon(IconManager.getIconManager().getIcon("invite"));
 
         inviteList = new MapList<Server, Invite>();
         menu = new JPopupMenu();
@@ -120,11 +120,16 @@ public class InviteLabel extends JLabel implements StatusBarComponent,
         }
 
         ActionManager.addListener(this, CoreActionType.CLIENT_FRAME_CHANGED);
-        addMouseListener(this);
 
         update();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected StatusbarPopupWindow getWindow() {
+        return new InvitePopup(this, activeServer);
+    }
+
     /**
      * Popuplates the menu.
      */
@@ -161,7 +166,9 @@ public class InviteLabel extends JLabel implements StatusBarComponent,
 
         if (activeServer == null || inviteList.get(activeServer).isEmpty()) {
             setVisible(false);
+            closeDialog();
         } else {
+            refreshDialog();
             setVisible(true);
             setToolTipText(inviteList.get(activeServer).size() +
                     " pending invites.");
@@ -206,53 +213,14 @@ public class InviteLabel extends JLabel implements StatusBarComponent,
      */
     @Override
     public void mouseClicked(final MouseEvent e) {
+        super.mouseClicked(e);
         popuplateMenu();
         if (menu.getComponentCount() > 0) {
             menu.show(this, e.getX(), e.getY());
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Mouse event
-     */
-    @Override
-    public void mousePressed(final MouseEvent e) {
-        //Ignore
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Mouse event
-     */
-    @Override
-    public void mouseReleased(final MouseEvent e) {
-        //Ignore
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Mouse event
-     */
-    @Override
-    public void mouseEntered(final MouseEvent e) {
-        //Ignore
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Mouse event
-     */
-    @Override
-    public void mouseExited(final MouseEvent e) {
-        //Ignore
-    }
 }
-
 /**
  * Invite action.
  */

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2006-2008 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.addons.ui_swing.components.statusbar;
+
+import com.dmdirc.Invite;
+import com.dmdirc.Server;
+import com.dmdirc.ui.messages.Formatter;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ * Shows information about received invites.
+ *
+ * @since 0.6.3
+ * @author chris
+ */
+public class InvitePopup extends StatusbarPopupWindow {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /** The server to show invites for. */
+    private final Server server;
+
+    /**
+     * Creates a new InvitePopup for the specified panel and server.
+     * 
+     * @param parent The parent of this popup
+     * @param server The server to show invites for
+     */
+    public InvitePopup(final JPanel parent, final Server server) {
+        super(parent);
+        this.server = server;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void initContent(final JPanel panel) {
+        for (Invite invite : server.getInvites()) {
+            panel.add(new JLabel(invite.getChannel()), "growx");
+            panel.add(new JLabel(invite.getSource()[0], JLabel.CENTER), "growx, al center");
+            panel.add(new JLabel(Formatter.formatDuration((int)
+                    (System.currentTimeMillis() - invite.getTimestamp()) / 1000) + " ago",
+                    JLabel.RIGHT), "growx, al right, wrap");
+        }
+    }
+
+}