Statusbar now shows the highest priority error until the error list is shown

git-svn-id: http://svn.dmdirc.com/trunk@2273 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/logger/ErrorLevel.java

@@ -54,4 +54,40 @@ public enum ErrorLevel {
     public String toString() {
         return value;
     }
+    
+    /**
+     * Returns if the specified error is more important than this one
+     *
+     * @param level Error level to compare
+     *
+     * @return true iif the error is more important
+     */
+    public boolean moreImportant(final ErrorLevel level) {
+        switch (level) {
+            case FATAL:
+                return true;
+            case HIGH:
+                if (this == FATAL) {
+                    return true;
+                }
+                return false;
+            case MEDIUM:
+                if (this == HIGH || this == FATAL) {
+                    return true;
+                }
+                return false;
+            case LOW:
+                if (this == MEDIUM || this == HIGH || this == FATAL) {
+                    return true;
+                }
+                return false;
+            case UNKNOWN:
+                if (this == LOW || this == MEDIUM || this == HIGH || this == FATAL) {
+                    return true;
+                }
+                return false;
+            default:
+                return false;
+        }
+    }
 }

src/com/dmdirc/ui/dummy/DummyStatusBar.java

@@ -62,21 +62,6 @@ public final class DummyStatusBar implements StatusBar {
         System.out.println("DummyStatusBar: message cleared");
     }
 
-    /** {@inheritDoc} */
-    public void setError(final Icon newIcon) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void setError(final Icon newIcon, final StatusErrorNotifier newNotifier) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void clearError() {
-        // Do nothing
-    }
-
     /** {@inheritDoc} */
     public void addComponent(final Component component) {
         // Do nothing

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

@@ -66,28 +66,6 @@ public interface StatusBar {
      */
     void clearMessage();
     
-    /**
-     * sets the icon in the status bar.
-     *
-     * @param newIcon Icon to display
-     */
-    void setError(final Icon newIcon);
-    
-    /**
-     * sets the icon in the status bar with a specified callback event.
-     *
-     * @param newIcon Icon to display
-     * @param newNotifier status error notifier to be notified for events on
-     * this error
-     */
-    void setError(final Icon newIcon,
-            final StatusErrorNotifier newNotifier);
-    
-    /**
-     * Removes the error state from the status bar.
-     */
-    void clearError();
-    
     /**
      * Adds a component to the status bar.
      *

src/com/dmdirc/ui/swing/components/SwingStatusBar.java

@@ -24,11 +24,11 @@ package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.IconManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.interfaces.StatusBar;
-import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
@@ -76,15 +76,12 @@ public final class SwingStatusBar extends JPanel implements MouseListener,
     /** current status bar message notifier. */
     private transient StatusMessageNotifier messageNotifier;
     
-    /** current status bar error notifier. */
-    private transient StatusErrorNotifier errorNotifier;
-    
-    /** Timer to clear the error. */
-    private transient TimerTask errorTimer;
-    
     /** Timer to clear the message. */
     private transient TimerTask messageTimer;
     
+    /** Currently showing error level. */
+    private ErrorLevel errorLevel;
+    
     /**
      * Creates a new instance of SwingStatusBar.
      */
@@ -103,6 +100,7 @@ public final class SwingStatusBar extends JPanel implements MouseListener,
         messageLabel.addMouseListener(this);
         iconLabel.addMouseListener(this);
         ErrorManager.getErrorManager().addErrorListener(this);
+        clearError();
         
         setLayout(new SpringLayout());
         
@@ -155,57 +153,30 @@ public final class SwingStatusBar extends JPanel implements MouseListener,
     }
     
     /** {@inheritDoc} */
-    public void setError(final Icon newIcon) {
-        setError(newIcon, null);
+    public void clearError() {
+        iconLabel.setIcon(DEFAULT_ICON);
+        errorLevel = ErrorLevel.UNKNOWN;
     }
     
     /** {@inheritDoc} */
-    public synchronized void setError(final Icon newIcon,
-            final StatusErrorNotifier newNotifier) {
-        iconLabel.setIcon(newIcon);
-        errorNotifier = newNotifier;
-        
-        if (errorTimer != null && (System.currentTimeMillis()
-        - errorTimer.scheduledExecutionTime()) <= 0) {
-            errorTimer.cancel();
-        }
-        
-        final int displayLength = IdentityManager.getGlobalConfig().getOptionInt("statusBar", "errorDisplayLength", 10000);
-        
-        if (!DEFAULT_ICON.equals(newIcon)) {
-            errorTimer = new TimerTask() {
-                public void run() {
-                    clearError();
-                }
-            };
-            new Timer("SwingStatusBar errorTimer").schedule(errorTimer,
-                    new Date(System.currentTimeMillis() + 250  + displayLength));
+    public void errorAdded(final ProgramError error) {
+        if (error.getLevel().moreImportant(errorLevel)) {
+            errorLevel = error.getLevel();
+            iconLabel.setIcon(getIcon(error));
         }
     }
     
-    /** {@inheritDoc} */
-    public void clearError() {
-        setError(DEFAULT_ICON);
-    }
-    
-    /** {@inheritDoc} */
-    public void errorAdded(final ProgramError error) {
-        final Icon icon;
+    private Icon getIcon(final ProgramError error) {
         switch (error.getLevel()) {
             case HIGH:
-                icon = IconManager.getIconManager().getIcon("error");
-                break;
+                return IconManager.getIconManager().getIcon("error");
             case MEDIUM:
-                icon = IconManager.getIconManager().getIcon("warning");
-                break;
+                return IconManager.getIconManager().getIcon("warning");
             case LOW:
-                icon = IconManager.getIconManager().getIcon("info");
-                break;
+                return IconManager.getIconManager().getIcon("info");
             default:
-                icon = IconManager.getIconManager().getIcon("info");
-                break;
+                return IconManager.getIconManager().getIcon("info");
         }
-        setError(icon);
     }
     
     /** {@inheritDoc} */
@@ -248,6 +219,7 @@ public final class SwingStatusBar extends JPanel implements MouseListener,
         if (mouseEvent.getButton() == MouseEvent.BUTTON1
                 && mouseEvent.getSource() == iconLabel) {
             ErrorListDialog.getErrorListDialog().setVisible(true);
+            clearError();
         }
     }