Changeset 577

Timestamp:

12/30/09 09:14:19 (2 years ago)

Author:

octorian

Message:

Fix for status-related IllegalStateException on OS 4.5 and under.

File:

• trunk/LogicMail/src/org/logicprobe/LogicMail/ui/StandardScreen.java (modified) (4 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/StandardScreen.java

@@ -101 +101 @@
     public void setStatus(Field status) {
         originalStatusField = status;
-        super.setStatus(status);
-    }
-
+        superSetStatusImpl(status);
+    }
+
+    /**
+     * Wrapper for internal calls to {@link MainScreen#setStatus(Field)}
+     * that makes sure <code>IllegalStateException</code>s don't appear
+     * if the field had previously been added.
+     * 
+     * @param status the new status field
+     */
+    private void superSetStatusImpl(Field status) {
+        if(status != null && status.getManager() != null) {
+            status.getManager().delete(status);
+        }
+        super.setStatus(status);
+    }
+    
     /**
      * Update status text, showing or hiding the status bar as necessary.
@@ -112 +126 @@
         statusBarField.setStatusText(statusText);
         if(statusBarField.hasStatus()) {
-                super.setStatus(statusBarField);
+                superSetStatusImpl(statusBarField);
         }
         else {
-                super.setStatus(originalStatusField);
+                superSetStatusImpl(originalStatusField);
         }
     }
@@ -134 +148 @@
     protected void onUndisplay() {
         screenProvider.onUndisplay();
-        super.setStatus(originalStatusField);
+        superSetStatusImpl(originalStatusField);
                 statusBarField.setStatusText(null);
         NotificationHandler.getInstance().cancelNotification();
@@ -153 +167 @@
     protected void onObscured() {
         super.onObscured();
-        super.setStatus(originalStatusField);
+        superSetStatusImpl(originalStatusField);
                 statusBarField.setStatusText(null);
     }