Changeset 568

Timestamp:

12/29/09 11:00:56 (2 years ago)

Author:

octorian

Message:

Ordered cache loading

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/model/MailFileComparator.java (added)
• LogicMail/src/org/logicprobe/LogicMail/model/MailFileManager.java (modified) (4 diffs)
• LogicMailTests/src/org/logicprobe/LogicMail/model/MailFileComparatorTest.java (added)
• LogicMailTests/src/org/logicprobe/LogicMail/model/ModelTests.java (modified) (1 diff)

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

@@ -41 +41 @@
 
 import net.rim.device.api.system.EventLogger;
+import net.rim.device.api.util.InvertedOrderComparator;
+import net.rim.device.api.util.SimpleSortingVector;
 
 import org.logicprobe.LogicMail.AppInfo;
@@ -177 +179 @@
                 Vector messageTokenList = new Vector();
                 
-                FileConnection fileConnection = getMailboxFileConnection(mailboxNode);
-                String mailboxUrl = fileConnection.getURL();
-                Enumeration e = fileConnection.list(MSG_FILTER, false);
-                while(e.hasMoreElements()) {
-                        String fileUrl = mailboxUrl + e.nextElement();
-                        MessageToken messageToken = readMessageToken(fileUrl);
-                        if(messageToken != null) {
-                                messageTokenList.addElement(messageToken);
-                        }
-                }
-                fileConnection.close();
-                
+        String[] fileUrls = getMessageFiles(mailboxNode);
+        for(int i=0; i<fileUrls.length; i++) {
+            MessageToken messageToken = readMessageToken(fileUrls[i]);
+            if(messageToken != null) {
+                messageTokenList.addElement(messageToken);
+            }
+        }
+        
                 MessageToken[] result = new MessageToken[messageTokenList.size()];
                 messageTokenList.copyInto(result);
@@ -199 +197 @@
                 Vector messageNodeList = new Vector();
                 
-                FileConnection fileConnection = getMailboxFileConnection(mailboxNode);
-                String mailboxUrl = fileConnection.getURL();
-                Enumeration e = fileConnection.list(MSG_FILTER, false);
-                while(e.hasMoreElements()) {
-                        String fileUrl = mailboxUrl + e.nextElement();
-                        MessageNode messageNode = readMessageNode(fileUrl);
-                        if(messageNode != null) {
-                                messageNodeList.addElement(messageNode);
-                        }
-                }
-                fileConnection.close();
+        String[] fileUrls = getMessageFiles(mailboxNode);
+        for(int i=0; i<fileUrls.length; i++) {
+            MessageNode messageNode = readMessageNode(fileUrls[i]);
+            if(messageNode != null) {
+                messageNodeList.addElement(messageNode);
+            }
+        }
                 
                 MessageNode[] result = new MessageNode[messageNodeList.size()];
@@ -218 +212 @@
     public void readMessageNodes(MailboxNode mailboxNode, MessageNodeCallback callback) throws IOException {
         if(cacheUrl == null) { callback.messageNodeUpdated(null); }
-
-        //TODO: Implement sort ordering in both directions for sane cache loading
+        
+        String[] fileUrls = getMessageFiles(mailboxNode);
+        for(int i=0; i<fileUrls.length; i++) {
+            MessageNode messageNode = readMessageNode(fileUrls[i]);
+            if(messageNode != null) {
+                callback.messageNodeUpdated(messageNode);
+            }
+        }
+        
+        callback.messageNodeUpdated(null);
+    }
+        
+    private String[] getMessageFiles(MailboxNode mailboxNode) throws IOException {
+        SimpleSortingVector fileVector = new SimpleSortingVector();
+        if(mailSettings.getGlobalConfig().getDispOrder()) {
+            fileVector.setSortComparator(new MailFileComparator());
+        }
+        else {
+            fileVector.setSortComparator(new InvertedOrderComparator(new MailFileComparator()));
+        }
+        fileVector.setSort(true);
+        
         FileConnection fileConnection = getMailboxFileConnection(mailboxNode);
         String mailboxUrl = fileConnection.getURL();
         Enumeration e = fileConnection.list(MSG_FILTER, false);
         while(e.hasMoreElements()) {
-            String fileUrl = mailboxUrl + e.nextElement();
-            MessageNode messageNode = readMessageNode(fileUrl);
-            if(messageNode != null) {
-                callback.messageNodeUpdated(messageNode);
-            }
+            fileVector.addElement(e.nextElement());
         }
         fileConnection.close();
-        callback.messageNodeUpdated(null);
+
+        int size = fileVector.size();
+        String[] result = new String[size];
+        for(int i=0; i<size; i++) {
+            result[i] = mailboxUrl + fileVector.elementAt(i);
+        }
+        return result;
     }
-        
+    
         public MessageNode readMessageNode(MailboxNode mailboxNode, MessageToken messageToken, boolean loadContent) throws IOException {
                 if(cacheUrl == null) { return null; }

trunk/LogicMailTests/src/org/logicprobe/LogicMail/model/ModelTests.java

@@ -50 +50 @@
         testSuite.addTest(new MessageNodeTest().suite());
         testSuite.addTest(new MessageNodeWriterTest().suite());
+        testSuite.addTest(new MailFileComparatorTest().suite());
         return testSuite;
     }