fixes issue 2284: add StatusBarLabel interface to remove Component import from core

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

@@ -36,51 +36,26 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.addons.ui_swing.UIUtilities;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.util.Date;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.border.EtchedBorder;
-
-import net.miginfocom.swing.MigLayout;
-
 /**
  * Displays the current server's lag in the status bar.
  * @author chris
  */
-public final class LagDisplayPlugin extends Plugin implements ActionListener,
-        MouseListener {
+public final class LagDisplayPlugin extends Plugin implements ActionListener {
     
     /** The panel we use in the status bar. */
-    private final JPanel panel = new JPanel();
+    private final LagDisplayPanel panel = new LagDisplayPanel(this);
     
     /** A cache of ping times. */
     private final Map<Server, String> pings = new WeakHashMap<Server, String>();
     
-    /** The label we use to show lag. */
-    private final JLabel label = new JLabel("Unknown");
-
-    /** The dialog we're using to show extra info. */
-    private ServerInfoDialog dialog;
-    
     /** Creates a new instance of LagDisplayPlugin. */
     public LagDisplayPlugin() {
         super();
-        
-        panel.setBorder(BorderFactory.createEtchedBorder());
-        panel.setLayout(new MigLayout("ins 0 rel 0 rel, aligny center"));
-        panel.add(label);
     }
     
     /** {@inheritDoc} */
@@ -92,8 +67,6 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
                 CoreActionType.SERVER_NOPING, CoreActionType.CLIENT_FRAME_CHANGED,
                 CoreActionType.SERVER_DISCONNECTED, CoreActionType.SERVER_PINGSENT,
                 CoreActionType.SERVER_NUMERIC);
-
-        panel.addMouseListener(this);
     }
     
     /** {@inheritDoc} */
@@ -125,10 +98,10 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
             pings.put(((Server) arguments[0]), value);
             
             if (((Server) arguments[0]).ownsFrame(active)) {
-                label.setText(value);
+                panel.setText(value);
             }
 
-            refreshDialog();
+            panel.refreshDialog();
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
             final Window active = Main.getUI().getActiveWindow();
             final String value = formatTime(arguments[1]) + "+";
@@ -136,30 +109,30 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
             pings.put(((Server) arguments[0]), value);
             
             if (((Server) arguments[0]).ownsFrame(active)) {
-                label.setText(value);
+                panel.setText(value);
             }
 
-            refreshDialog();
+            panel.refreshDialog();
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
             final Window active = Main.getUI().getActiveWindow();
             
             if (((Server) arguments[0]).ownsFrame(active)) {
-                label.setText("Not connected");
+                panel.setText("Not connected");
                 pings.remove(arguments[0]);
             }
 
-            refreshDialog();
+            panel.refreshDialog();
         } else if (type.equals(CoreActionType.CLIENT_FRAME_CHANGED)) {
             final FrameContainer source = (FrameContainer) arguments[0];
             if (source.getServer() == null) {
-                label.setText("Unknown");
+                panel.setText("Unknown");
             } else if (source.getServer().getState() != ServerState.CONNECTED) {
-                label.setText("Not connected");
+                panel.setText("Not connected");
             } else {
-                label.setText(getTime(source.getServer()));
+                panel.setText(getTime(source.getServer()));
             }
 
-            refreshDialog();
+            panel.refreshDialog();
         } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
             ((Server) arguments[0]).getParser().sendLine("LAGCHECK_" + new Date().getTime());
         } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
@@ -174,7 +147,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
                 pings.put((Server) arguments[0], value);
                 
                 if (((Server) arguments[0]).ownsFrame(active)) {
-                    label.setText(value);
+                    panel.setText(value);
                 }                
             } catch (NumberFormatException ex) {
                 pings.remove((Server) arguments[0]);
@@ -184,7 +157,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
                 format.delete(0, format.length());
             }
 
-            refreshDialog();
+            panel.refreshDialog();
         }
     }
 
@@ -213,44 +186,6 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void mouseClicked(final MouseEvent e) {
-        // Don't care
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void mousePressed(final MouseEvent e) {
-        // Don't care
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void mouseReleased(final MouseEvent e) {
-        // Don't care
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void mouseEntered(final MouseEvent e) {
-        panel.setBackground(UIManager.getColor("ToolTip.background"));
-        panel.setForeground(UIManager.getColor("ToolTip.foreground"));
-        panel.setBorder(new ToplessEtchedBorder());
-
-        openDialog();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void mouseExited(final MouseEvent e) {
-        panel.setBackground(null);
-        panel.setForeground(null);
-        panel.setBorder(new EtchedBorder());
-
-        closeDialog();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
@@ -262,78 +197,4 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
                 + "lag which bypasses bouncers or proxies that may reply."));
         manager.getCategory("Plugins").addSubCategory(cat);
     }
-
-    /**
-     * Closes and reopens the dialog to update information and border positions.
-     */
-    protected void refreshDialog() {
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                synchronized (ServerInfoDialog.class) {
-                    if (dialog != null) {
-                        closeDialog();
-                        openDialog();
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Opens the information dialog.
-     */
-    protected void openDialog() {
-        synchronized (ServerInfoDialog.class) {
-            dialog = new ServerInfoDialog(this, panel);
-            dialog.setVisible(true);
-        }
-    }
-
-    /**
-     * Closes the information dialog.
-     */
-    protected void closeDialog() {
-        synchronized (ServerInfoDialog.class) {
-            if (dialog != null) {
-                dialog.setVisible(false);
-                dialog.dispose();
-                dialog = null;
-            }
-        }
-    }
-
-    /**
-     * An {@link EtchedBorder} with no top.
-     */
-    private static class ToplessEtchedBorder extends EtchedBorder {
-
-        /**
-         * 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;
-
-        @Override
-        public void paintBorder(Component c, Graphics g, int x, int y, int width,
-                                int height) {
-            int w = width;
-            int h = height;
-
-            g.translate(x, y);
-
-            g.setColor(etchType == LOWERED? getShadowColor(c) : getHighlightColor(c));
-            g.drawLine(0, h-2, w, h-2);
-            g.drawLine(0, 0, 0, h-1);
-            g.drawLine(w-2, 0, w-2, h-1);
-
-            g.setColor(Color.WHITE);
-            g.drawLine(0, h-1, w, h-1);
-            g.drawLine(w-1, 0, w-1, h-1);
-
-            g.translate(-x, -y);
-        }
-
-    }
 }

src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java

@@ -23,11 +23,9 @@
 package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.ui.interfaces.StatusBar;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 
-import java.awt.Component;
-import javax.swing.Icon;
-
 /**
  * Dummy status bar, used for testing.
  */
@@ -59,18 +57,18 @@ public final class DummyStatusBar implements StatusBar {
     }
     
     @Override
-    public void setMessage(Icon icon, String newMessage) {
+    public void setMessage(String iconType, String newMessage) {
         System.out.println("DummyStatusBar: " + newMessage);
     }
 
     @Override
-    public void setMessage(Icon icon, String newMessage,
+    public void setMessage(String iconType, String newMessage,
             StatusMessageNotifier newNotifier) {
         System.out.println("DummyStatusBar: " + newMessage);
     }
 
     @Override
-    public void setMessage(Icon icon, String newMessage,
+    public void setMessage(String iconType, String newMessage,
             StatusMessageNotifier newNotifier, int timeout) {
         System.out.println("DummyStatusBar: " + newMessage);
     }
@@ -83,13 +81,13 @@ public final class DummyStatusBar implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public void addComponent(final Component component) {
+    public void addComponent(final StatusBarComponent component) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeComponent(final Component component) {
+    public void removeComponent(final StatusBarComponent component) {
         // Do nothing
     }
 

src/com/dmdirc/addons/ui_swing/components/FeedbackNag.java

@@ -26,6 +26,7 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -41,8 +42,8 @@ import javax.swing.JPopupMenu;
 /**
  * Feedback nag icon.
  */
-public class FeedbackNag extends JLabel implements MouseListener,
-        ActionListener {
+public class FeedbackNag extends JLabel implements StatusBarComponent, 
+        MouseListener, ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class

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

@@ -28,6 +28,7 @@ import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -46,8 +47,8 @@ import javax.swing.SwingUtilities;
 /**
  * Error label, responsible for showing errors in the status bar.
  */
-public class ErrorLabel extends JLabel implements MouseListener, ErrorListener,
-        ActionListener {
+public class ErrorLabel extends JLabel implements StatusBarComponent, 
+        MouseListener, ErrorListener, ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class

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

@@ -26,6 +26,7 @@ import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -41,8 +42,8 @@ import javax.swing.JPopupMenu;
 /**
  * Feedback nag icon.
  */
-public class FeedbackNag extends JLabel implements MouseListener,
-        ActionListener {
+public class FeedbackNag extends JLabel implements StatusBarComponent, 
+        MouseListener, ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class

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

@@ -33,6 +33,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.InviteListener;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.util.MapList;
 
 import java.awt.event.ActionEvent;
@@ -52,8 +53,8 @@ import javax.swing.JSeparator;
 /**
  * Invite label.
  */
-public class InviteLabel extends JLabel implements InviteListener,
-        ActionListener, MouseListener {
+public class InviteLabel extends JLabel implements StatusBarComponent, 
+        InviteListener, ActionListener, MouseListener {
 
     /**
      * A version number for this class. It should be changed whenever the class

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

@@ -23,6 +23,8 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 
 import java.awt.event.MouseEvent;
@@ -39,7 +41,8 @@ import javax.swing.SwingUtilities;
 /**
  * Message label handles showing messages in the status bar.
  */
-public class MessageLabel extends JLabel implements MouseListener {
+public class MessageLabel extends JLabel implements StatusBarComponent, 
+        MouseListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -65,7 +68,7 @@ public class MessageLabel extends JLabel implements MouseListener {
     }
 
     public void setMessage(final String newMessage) {
-        setMessage(newMessage, null);
+        setMessage(newMessage, (StatusMessageNotifier) null);
     }
 
     public void setMessage(final String newMessage,
@@ -73,16 +76,16 @@ public class MessageLabel extends JLabel implements MouseListener {
         setMessage(null, newMessage, newNotifier);
     }
 
-    public void setMessage(final Icon icon, final String newMessage) {
-        setMessage(icon, newMessage, null);
+    public void setMessage(final String iconType, final String newMessage) {
+        setMessage(iconType, newMessage, null);
     }
 
-    public void setMessage(final Icon icon, final String newMessage,
+    public void setMessage(final String iconType, final String newMessage,
             final StatusMessageNotifier newNotifier) {
         final int timeout =
                 IdentityManager.getGlobalConfig().
                 getOptionInt("statusBar", "messageDisplayLength");
-        setMessage(icon, newMessage, newNotifier, timeout);
+        setMessage(iconType, newMessage, newNotifier, timeout);
     }
 
     public void setMessage(final String newMessage,
@@ -90,8 +93,9 @@ public class MessageLabel extends JLabel implements MouseListener {
         setMessage(null, newMessage, newNotifier, timeout);
     }
 
-    public synchronized void setMessage(final Icon icon, final String newMessage,
+    public synchronized void setMessage(final String iconType, final String newMessage,
             final StatusMessageNotifier newNotifier, final int timeout) {
+        final Icon icon = IconManager.getIconManager().getIcon(iconType);
         SwingUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */

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

@@ -22,13 +22,15 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.StatusBar;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 
 import java.awt.Component;
 import java.util.Arrays;
 
-import javax.swing.Icon;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
@@ -86,15 +88,15 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(final Icon icon, final String newMessage) {
-        messageLabel.setMessage(icon, newMessage);
+    public void setMessage(final String iconType, final String newMessage) {
+        messageLabel.setMessage(iconType, newMessage);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(final Icon icon, final String newMessage,
+    public void setMessage(final String iconType, final String newMessage,
             final StatusMessageNotifier newNotifier) {
-        messageLabel.setMessage(icon, newMessage, newNotifier);
+        messageLabel.setMessage(iconType, newMessage, newNotifier);
     }
 
     /** {@inheritDoc} */
@@ -106,10 +108,10 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public synchronized void setMessage(final Icon icon,
+    public synchronized void setMessage(final String iconType, 
             final String newMessage,
             final StatusMessageNotifier newNotifier, final int timeout) {
-        messageLabel.setMessage(icon, newMessage, newNotifier, timeout);
+        messageLabel.setMessage(iconType, newMessage, newNotifier, timeout);
     }
 
     /** {@inheritDoc} */
@@ -120,7 +122,13 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public void addComponent(final Component component) {
+    public void addComponent(final StatusBarComponent component) {
+        if (!(component instanceof Component)) {
+            Logger.appError(ErrorLevel.HIGH, "Error adding status bar component", 
+                    new IllegalArgumentException("Component must be an " +
+                    "instance of java.awt.component"));
+            return;
+        }
         if (!Arrays.asList(getComponents()).contains(component)) {
             SwingUtilities.invokeLater(new Runnable() {
 
@@ -130,7 +138,7 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
                     remove(updateLabel);
                     remove(errorLabel);
                     remove(inviteLabel);
-                    add(component,
+                    add((Component) component,
                             "sgy components, hmax 20, hmin 20, wmin 20, shrink 0");
                     add(updateLabel,
                             "sgy components, hmax 20, hmin 20, wmin 20, shrink 0");
@@ -146,13 +154,19 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public void removeComponent(final Component component) {
+    public void removeComponent(final StatusBarComponent component) {
+        if (!(component instanceof Component)) {
+            Logger.appError(ErrorLevel.HIGH, "Error adding status bar component", 
+                    new IllegalArgumentException("Component must be an " +
+                    "instance of java.awt.component"));
+            return;
+        }
         SwingUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                remove(component);
+                remove((Component) component);
                 validate();
             }
             });

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.interfaces.UpdateCheckerListener;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateChecker.STATE;
 
@@ -38,8 +39,8 @@ import javax.swing.JLabel;
  * Updater label is responsible for handling the display of updates in the
  * status bar.
  */
-public class UpdaterLabel extends JLabel implements MouseListener,
-        UpdateCheckerListener {
+public class UpdaterLabel extends JLabel implements StatusBarComponent, 
+        MouseListener, UpdateCheckerListener {
 
     /**
      * A version number for this class. It should be changed whenever the class

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -48,12 +48,6 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
-
 /**
  * Displays information related to the current window in the status bar.
  *
@@ -65,17 +59,11 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 	private static final String MY_DOMAIN = "plugin-Logging";
 
 	/** The panel we use in the status bar. */
-	private final JPanel panel = new JPanel();
-
-	/** The label we use to show window status. */
-	private final JLabel label = new JLabel("???");
+	private final WindowStatusPanel panel = new WindowStatusPanel();
 
 	/** Creates a new instance of WindowStatusPlugin. */
 	public WindowStatusPlugin() {
 		super();
-		panel.setBorder(BorderFactory.createEtchedBorder());
-		panel.setLayout(new MigLayout("ins 0 rel 0 rel, aligny center"));
-		panel.add(label);
 	}
 
 	/**
@@ -207,7 +195,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener {
 		} else {
 			textString.append("???");
 		}
-		label.setText(textString.toString());
+		panel.setText(textString.toString());
 	}
 
 	/** {@inheritDoc} */

src/com/dmdirc/ui/interfaces/StatusBar.java

@@ -22,10 +22,6 @@
 
 package com.dmdirc.ui.interfaces;
 
-import java.awt.Component;
-
-import javax.swing.Icon;
-
 /**
  * Status bar interface.
  */
@@ -41,12 +37,12 @@ public interface StatusBar {
     /**
      * sets the message in the status bar.
      *
-     * @param icon Message icon
+     * @param iconType Message icon
      * @param newMessage Message to display
      * 
      * @since 0.6
      */
-    void setMessage(final Icon icon, final String newMessage);
+    void setMessage(final String iconType, final String newMessage);
     
     /**
      * Sets the message in the status bar with a specified callback event
@@ -65,14 +61,14 @@ public interface StatusBar {
      * Sets the message in the status bar with a specified callback event
      * using the default timeout.
      *
-     * @param icon Message icon
+     * @param iconType Message icon
      * @param newMessage Message to display
      * @param newNotifier status message notifier to be notified for events on
      * this message
      * 
      * @since 0.6
      */
-    void setMessage(final Icon icon, final String newMessage, 
+    void setMessage(final String iconType, final String newMessage, 
             final StatusMessageNotifier newNotifier);
     
     /**
@@ -91,7 +87,7 @@ public interface StatusBar {
      * Sets the message in the status bar with a specified callback event for
      * a specified time.
      *
-     * @param icon Message icon
+     * @param iconType Message icon
      * @param newMessage Message to display
      * @param newNotifier status message notifier to be notified for events on
      * this message
@@ -99,7 +95,7 @@ public interface StatusBar {
      * 
      * @since 0.6
      */
-    void setMessage(final Icon icon, final String newMessage,
+    void setMessage(final String iconType, final String newMessage,
             final StatusMessageNotifier newNotifier, final int timeout);
     
     /**
@@ -112,14 +108,14 @@ public interface StatusBar {
      *
      * @param component component to add
      */
-    void addComponent(final Component component);
+    void addComponent(final StatusBarComponent component);
     
     /**
      * Removes a component to the status bar.
      *
      * @param component component to add
      */
-    void removeComponent(final Component component);
+    void removeComponent(final StatusBarComponent component);
     
     /**
      * Returns true if the status bar is visible.

src/com/dmdirc/ui/interfaces/Window.java

@@ -28,8 +28,6 @@ import com.dmdirc.config.ConfigManager;
 
 import java.beans.PropertyVetoException;
 
-import javax.swing.Icon;
-
 /**
  * The Window interface specifies common methods that should be implemented
  * by all windows. It is assumed that all windows have a main text area.