Add generics to the statusbar popup panels.

Tidy up up status bar components.

Change-Id: I52ed05574ab06b819ddb33f8abc3d0048b20eba2
Reviewed-on: http://gerrit.dmdirc.com/1888
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -24,11 +24,13 @@ package com.dmdirc.addons.lagdisplay;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
 
+import javax.swing.JLabel;
+
 /**
  * Shows the user's lag in the status bar, and reveals details of all servers
  * when the user hovers over it.
  */
-public class LagDisplayPanel extends StatusbarPopupPanel {
+public class LagDisplayPanel extends StatusbarPopupPanel<JLabel> {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -45,7 +47,7 @@ public class LagDisplayPanel extends StatusbarPopupPanel {
      * @param plugin The plugin that owns this panel
      */
     public LagDisplayPanel(final LagDisplayPlugin plugin) {
-        super();
+        super(new JLabel());
         
         this.plugin = plugin;
     }

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

@@ -174,7 +174,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
             pings.put(((Server) arguments[0]), value);
 
             if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
-                panel.setText(value);
+                panel.getComponent().setText(value);
             }
 
             panel.refreshDialog();
@@ -185,7 +185,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
             pings.put(((Server) arguments[0]), value);
 
             if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
-                panel.setText(value);
+                panel.getComponent().setText(value);
             }
 
             panel.refreshDialog();
@@ -193,7 +193,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
             final FrameContainer active = WindowManager.getActiveWindow();
 
             if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
-                panel.setText("Not connected");
+                panel.getComponent().setText("Not connected");
                 pings.remove((Server) arguments[0]);
             }
 
@@ -201,11 +201,11 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
         } else if (type.equals(CoreActionType.CLIENT_FRAME_CHANGED)) {
             final FrameContainer source = (FrameContainer) arguments[0];
             if (source == null || source.getServer() == null) {
-                panel.setText("Unknown");
+                panel.getComponent().setText("Unknown");
             } else if (source.getServer().getState() != ServerState.CONNECTED) {
-                panel.setText("Not connected");
+                panel.getComponent().setText("Not connected");
             } else {
-                panel.setText(getTime(source.getServer()));
+                panel.getComponent().setText(getTime(source.getServer()));
             }
 
             panel.refreshDialog();
@@ -224,7 +224,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
                 getHistory(((Server) arguments[0])).add(duration);
 
                 if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
-                    panel.setText(value);
+                    panel.getComponent().setText(value);
                 }
             } catch (NumberFormatException ex) {
                 pings.remove((Server) arguments[0]);

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

@@ -46,9 +46,9 @@ import javax.swing.SwingUtilities;
  * Shows error status in the status bar.
  *
  * @since 0.6.3m1
- * @author chris
  */
-public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, ActionListener {
+public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
+        ErrorListener, ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -60,12 +60,10 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** non error state image icon. */
     private static final Icon DEFAULT_ICON = IconManager.getIconManager().
             getIcon("normal");
-    /** Currently showing error level. */
-    private ErrorLevel errorLevel;
     /** Status controller. */
     private final MainFrame mainFrame;
     /** Swing status bar. */
-    private SwingStatusBar statusBar;
+    private final SwingStatusBar statusBar;
     /** Error manager. */
     private final transient ErrorManager errorManager = ErrorManager.getErrorManager();
     /** Dismiss menu. */
@@ -75,14 +73,16 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** Show menu item. */
     private final JMenuItem show;
     /** Swing controller. */
-    private SwingController controller;
+    private final SwingController controller;
+    /** Currently showing error level. */
+    private ErrorLevel errorLevel;
 
     /**
      * Creates a new ErrorPanel for the speicified status bar.
      *
      * @param controller Swing controller
      * @param mainFrame Main frame
-     * @param statusBar Status bar  
+     * @param statusBar Status bar
      */
     public ErrorPanel(final SwingController controller,
             final MainFrame mainFrame, final SwingStatusBar statusBar) {
@@ -91,7 +91,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
         this.controller = controller;
         this.mainFrame = mainFrame;
         this.statusBar = statusBar;
-        
+
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Clear All");
         show = new JMenuItem("Open");
@@ -152,7 +152,8 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
                         if (errorLevel == null ||
                                 !error.getLevel().moreImportant(errorLevel)) {
                             errorLevel = error.getLevel();
-                            label.setIcon(IconManager.getIconManager().getIcon(errorLevel.getIcon()));
+                            label.setIcon(IconManager.getIconManager()
+                                    .getIcon(errorLevel.getIcon()));
                         }
                     }
                     setVisible(true);

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

@@ -41,7 +41,6 @@ import javax.swing.JSeparator;
  * Shows a breakdown of errors that have occured.
  *
  * @since 0.6.3m1
- * @author chris
  */
 public class ErrorPopup extends StatusbarPopupWindow {
 
@@ -65,8 +64,10 @@ public class ErrorPopup extends StatusbarPopupWindow {
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        final List<ProgramError> errors = ErrorManager.getErrorManager().getErrors();
-        final MapList<ErrorLevel, ProgramError> buckets = new MapList<ErrorLevel, ProgramError>();
+        final List<ProgramError> errors = ErrorManager.getErrorManager()
+                .getErrors();
+        final MapList<ErrorLevel, ProgramError> buckets
+                = new MapList<ErrorLevel, ProgramError>();
         final MapList<ErrorReportStatus, ProgramError> statuses
                 = new MapList<ErrorReportStatus, ProgramError>();
 
@@ -88,8 +89,10 @@ public class ErrorPopup extends StatusbarPopupWindow {
                 final int count = buckets.values(level).size();
 
                 panel.add(new JLabel(level.toString(),
-                        IconManager.getIconManager().getIcon(level.getIcon()), JLabel.LEFT));
-                panel.add(new JLabel(String.valueOf(count), JLabel.RIGHT), "growx, pushx, wrap");
+                        IconManager.getIconManager().getIcon(level.getIcon()),
+                        JLabel.LEFT));
+                panel.add(new JLabel(String.valueOf(count), JLabel.RIGHT),
+                        "growx, pushx, wrap");
             }
         }
 
@@ -108,9 +111,9 @@ public class ErrorPopup extends StatusbarPopupWindow {
                 final int count = statuses.values(status).size();
 
                 panel.add(new JLabel(status.toString(), JLabel.LEFT));
-                panel.add(new JLabel(String.valueOf(count), JLabel.RIGHT), "growx, pushx, wrap");
+                panel.add(new JLabel(String.valueOf(count), JLabel.RIGHT),
+                        "growx, pushx, wrap");
             }
         }
     }
-
 }

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

@@ -49,7 +49,7 @@ import javax.swing.JSeparator;
 /**
  * Invite label.
  */
-public class InviteLabel extends StatusbarPopupPanel implements 
+public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         StatusBarComponent, InviteListener, ActionListener,
         java.awt.event.ActionListener {
 

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

@@ -33,7 +33,6 @@ import javax.swing.JPanel;
  * Shows information about received invites.
  *
  * @since 0.6.3m1
- * @author chris
  */
 public class InvitePopup extends StatusbarPopupWindow {
 
@@ -43,7 +42,6 @@ public class InvitePopup extends StatusbarPopupWindow {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-
     /** The server to show invites for. */
     private final Server server;
 
@@ -54,7 +52,8 @@ public class InvitePopup extends StatusbarPopupWindow {
      * @param server The server to show invites for
      * @param parentWindow Parent window
      */
-    public InvitePopup(final JPanel parent, final Server server, final Window parentWindow) {
+    public InvitePopup(final JPanel parent, final Server server,
+            final Window parentWindow) {
         super(parent, parentWindow);
         this.server = server;
     }
@@ -64,11 +63,12 @@ public class InvitePopup extends StatusbarPopupWindow {
     protected void initContent(final JPanel panel) {
         for (Invite invite : server.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(invite.getSource()[0], JLabel.CENTER),
+                    "growx, pushx, al center");
             panel.add(new JLabel(Formatter.formatDuration((int)
-                    (System.currentTimeMillis() - invite.getTimestamp()) / 1000) + " ago",
-                    JLabel.RIGHT), "growx, pushx, al right, wrap");
+                    (System.currentTimeMillis() - invite.getTimestamp())
+                    / 1000) + " ago", JLabel.RIGHT),
+                    "growx, pushx, al right, wrap");
         }
     }
-
 }

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

@@ -32,10 +32,10 @@ import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -67,7 +67,7 @@ public class MessageLabel extends JLabel implements StatusBarComponent,
      */
     public MessageLabel() {
         super();
-        queue = new ConcurrentLinkedQueue<StatusMessage>();
+        queue = new LinkedList<StatusMessage>();
         defaultMessage = new StatusMessage(null, "Ready.", null, -1,
                 IdentityManager.getGlobalConfig());
         currentMessage = defaultMessage;

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

@@ -28,7 +28,7 @@ import com.dmdirc.ui.interfaces.StatusBarComponent;
 import java.awt.event.MouseListener;
 
 import javax.swing.BorderFactory;
-import javax.swing.JLabel;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
@@ -39,11 +39,11 @@ import net.miginfocom.swing.MigLayout;
  *
  * @since 0.6.3m1
  */
-public abstract class StatusbarPanel extends JPanel
+public abstract class StatusbarPanel<T extends JComponent> extends JPanel
         implements StatusBarComponent, MouseListener {
 
     /** The label we use to show information. */
-    protected final JLabel label;
+    protected final T label;
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -53,19 +53,12 @@ public abstract class StatusbarPanel extends JPanel
     /** The popup window we're using to show extra info. */
     private StatusbarPopupWindow dialog;
 
-    /**
-     * Creates a new {@link StatusbarPanel}, using a default text label.
-     */
-    public StatusbarPanel() {
-        this(new JLabel("Unknown"));
-    }
-
     /**
      * Creates a new {@link StatusbarPanel}, using the specified label.
      *
      * @param label The label to be displayed in the status bar
      */
-    public StatusbarPanel(final JLabel label) {
+    public StatusbarPanel(final T label) {
         super();
 
         this.label = label;
@@ -77,6 +70,15 @@ public abstract class StatusbarPanel extends JPanel
         addMouseListener(this);
     }
 
+    /**
+     * Returns the component associated with this panel.
+     *
+     * @return Assocaited component
+     */
+    public T getComponent() {
+        return label;
+    }
+
     /**
      * Closes and reopens the dialog to update information and border positions.
      */
@@ -131,22 +133,6 @@ public abstract class StatusbarPanel extends JPanel
         }
     }
 
-    /**
-     * Sets the text for this label.
-     *
-     * @param text New text
-     */
-    public void setText(final String text) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                label.setText(text);
-            }
-        });
-    }
-
     /**
      * Retrieves the implementation of {@link StatusbarPopupWindow} that should
      * be shown by this panel when the user mouses over it.

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import java.awt.event.MouseEvent;
 
-import javax.swing.JLabel;
+import javax.swing.JComponent;
 import javax.swing.UIManager;
 import javax.swing.border.EtchedBorder;
 
@@ -34,7 +34,8 @@ import javax.swing.border.EtchedBorder;
  *
  * @since 0.6.3m1
  */
-public abstract class StatusbarPopupPanel extends StatusbarPanel {
+public abstract class StatusbarPopupPanel<T extends JComponent> extends
+        StatusbarPanel<T> {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -43,19 +44,12 @@ public abstract class StatusbarPopupPanel extends StatusbarPanel {
      */
     private static final long serialVersionUID = 2;
 
-    /**
-     * Creates a new {@link StatusbarPopupPanel}, using a default text label.
-     */
-    public StatusbarPopupPanel() {
-        this(new JLabel("Unknown"));
-    }
-
     /**
      * Creates a new {@link StatusbarPopupPanel}, using the specified label.
      *
      * @param label The label to be displayed in the status bar
      */
-    public StatusbarPopupPanel(final JLabel label) {
+    public StatusbarPopupPanel(final T label) {
         super(label);
     }
 

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

@@ -133,20 +133,16 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
         @Override
         public void paintBorder(final Component c, final Graphics g,
                 final int x, final int y, final int width, final int height) {
-            int w = width;
-            int h = height;
-
             g.translate(x, y);
-
-            g.setColor(etchType == LOWERED? getShadowColor(c) : getHighlightColor(c));
-            g.drawLine(0, 0, w-1, 0);
-            g.drawLine(0, h-1, parent.getLocationOnScreen().x
-                    - getLocationOnScreen().x, h-1);
+            g.setColor(etchType == LOWERED? getShadowColor(c)
+                    : getHighlightColor(c));
+            g.drawLine(0, 0, width-1, 0);
+            g.drawLine(0, height-1, parent.getLocationOnScreen().x
+                    - getLocationOnScreen().x, height-1);
             g.drawLine(parent.getWidth() + parent.getLocationOnScreen().x
-                    - getLocationOnScreen().x - 2, h-1, w-1, h-1);
-            g.drawLine(0, 0, 0, h-1);
-            g.drawLine(w-1, 0, w-1, h-1);
-
+                    - getLocationOnScreen().x - 2, height-1, width-1, height-1);
+            g.drawLine(0, 0, 0, height-1);
+            g.drawLine(width-1, 0, width-1, height-1);
             g.translate(-x, -y);
         }
 

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

@@ -35,13 +35,14 @@ import java.awt.Dialog.ModalityType;
 import java.awt.event.MouseEvent;
 
 import javax.swing.BorderFactory;
+import javax.swing.JLabel;
 
 /**
  * Updater label is responsible for handling the display of updates in the
  * status bar.
  */
-public class UpdaterLabel extends StatusbarPopupPanel implements StatusBarComponent,
-        UpdateCheckerListener {
+public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
+        StatusBarComponent, UpdateCheckerListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -50,16 +51,16 @@ public class UpdaterLabel extends StatusbarPopupPanel implements StatusBarCompon
      */
     private static final long serialVersionUID = 1;
     /** Swing controller. */
-    private MainFrame mainFrame;
+    private final MainFrame mainFrame;
 
     /**
      * Instantiates a new updater label, handles showing updates on the status bar.
-     * 
+     *
      * @param mainFrame Main frame
      */
     public UpdaterLabel(final MainFrame mainFrame) {
-        super();
-        
+        super(new JLabel());
+
         this.mainFrame = mainFrame;
         setBorder(BorderFactory.createEtchedBorder());
         UpdateChecker.addListener(this);
@@ -75,7 +76,7 @@ public class UpdaterLabel extends StatusbarPopupPanel implements StatusBarCompon
     @Override
     public void mouseReleased(final MouseEvent mouseEvent) {
         super.mouseClicked(mouseEvent);
-        
+
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
             if (UpdateChecker.getStatus().equals(UpdateChecker.STATE.RESTART_REQUIRED)) {
                 SwingRestartDialog.showSwingRestartDialog(mainFrame, ModalityType.MODELESS);

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

@@ -24,8 +24,10 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.updater.Update;
 import com.dmdirc.updater.UpdateChecker;
+
 import java.awt.Window;
 import java.util.List;
+
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
@@ -34,7 +36,6 @@ import javax.swing.JSeparator;
  * Information popup for the updater label.
  *
  * @since 0.6.3
- * @author chris
  */
 public class UpdaterPopup extends StatusbarPopupWindow {
 
@@ -66,12 +67,14 @@ public class UpdaterPopup extends StatusbarPopupWindow {
             final List<Update> updates = UpdateChecker.getAvailableUpdates();
 
             if (state.equals(UpdateChecker.STATE.RESTART_REQUIRED)) {
-                panel.add(new JLabel("A restart is required to install updates."), "span,wrap");
+                panel.add(new JLabel("A restart is required to install updates."),
+                        "span,wrap");
             } else if (state.equals(UpdateChecker.STATE.UPDATING)) {
                 panel.add(new JLabel("Update in progress..."), "span,wrap");
             } else {
-                panel.add(new JLabel(updates.size() == 1 ? "There is one update available"
-                        : "There are " + updates.size() + " updates available"), "span,wrap");
+                panel.add(new JLabel(updates.size() == 1
+                        ? "There is one update available" : "There are "
+                        + updates.size() + " updates available"), "span,wrap");
             }
 
             panel.add(new JSeparator(), "span, growx, pushx, wrap");