Changeset 574

Timestamp:

12/29/09 15:34:00 (2 years ago)

Author:

octorian

Message:

Unread count improvements, but still some runtime quirks

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail/model

Files:

• AccountNode.java (modified) (2 diffs)
• MailboxNode.java (modified) (7 diffs)
• MessageNode.java (modified) (1 diff)

trunk/LogicMail/src/org/logicprobe/LogicMail/model/AccountNode.java

@@ -550 +550 @@
             mailboxFolder.setMsgCount(currentFolder.getMsgCount());
             mailboxFolder.setUnseenCount(currentFolder.getUnseenCount());
+            mailboxNode.updateUnseenFolderTreeItem();
             mailboxNode.fireMailboxStatusChanged(MailboxNodeEvent.TYPE_STATUS,
                 null);
@@ -640 +641 @@
 
         if (messageNode != null) {
+            // Set the SEEN bit
+            int flags = messageNode.getFlags();
+            flags |= MessageNode.Flag.SEEN;
+            messageNode.setFlags(flags);
+
                 switch(e.getType()) {
                 case MessageEvent.TYPE_FULLY_LOADED:

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java

@@ -71 +71 @@
         private FolderTreeItem folderTreeItem;
         private boolean hasAppend;
+        private int unseenMessageCount;
         
         private Object fetchLock = new Object();
@@ -472 +473 @@
                 if(messageAdded) {
                         fireMailboxStatusChanged(MailboxNodeEvent.TYPE_NEW_MESSAGES, new MessageNode[] { message });
+                        updateUnseenMessages(true);
                 }
         }
@@ -496 +498 @@
                         addedMessages.copyInto(addedMessagesArray);
                         fireMailboxStatusChanged(MailboxNodeEvent.TYPE_NEW_MESSAGES, addedMessagesArray);
+                        updateUnseenMessages(true);
                 }
         }
@@ -536 +539 @@
                         }
                 }
+        updateUnseenMessages(false);
                 fireMailboxStatusChanged(MailboxNodeEvent.TYPE_STATUS, null);
         }
@@ -554 +558 @@
                         messageTokenMap.clear();
                 }
+        updateUnseenMessages(false);
                 fireMailboxStatusChanged(MailboxNodeEvent.TYPE_STATUS, null);
         }
@@ -685 +690 @@
 
     /**
+     * Update the unseen message count from the local messages collection.
+     * 
+     * @param fireEvent true to fire a status event if the count has changed
+     */
+    void updateUnseenMessages(boolean fireEvent) {
+        boolean updated = false;
+        synchronized(messages) {
+            int newCount = 0;
+            int size = messages.size();
+            for(int i=0; i<size; i++) {
+                int flags = ((MessageNode)messages.elementAt(i)).getFlags();
+                if((flags & MessageNode.Flag.SEEN) == 0) {
+                    newCount++;
+                }
+            }
+            if(newCount != unseenMessageCount) {
+                unseenMessageCount = newCount;
+                updated = true;
+            }
+        }
+        if(updated && fireEvent) {
+            fireMailboxStatusChanged(MailboxNodeEvent.TYPE_STATUS, null);
+        }
+    }
+    
+    /**
+     * Update the unseen message count from the folder tree item.
+     */
+    void updateUnseenFolderTreeItem() {
+        synchronized(messages) {
+            unseenMessageCount = this.folderTreeItem.getUnseenCount();
+        }
+    }
+    
+    /**
      * Gets the unseen message count for this folder.
      * 
@@ -690 +730 @@
      */
     public int getUnseenMessageCount() {
-        return this.folderTreeItem.getUnseenCount();
+        return unseenMessageCount;
     }
         

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MessageNode.java

@@ -347 +347 @@
         public void setFlags(int flags) {
                 cached = false;
-                this.flags = flags;
+                if(this.flags != flags) {
+                    this.flags = flags;
+                    if(this.getParent() != null) {
+                        this.getParent().updateUnseenMessages(true);
+                    }
+                }
         }