Author: norman
Date: Wed May 25 18:57:19 2011
New Revision: 1127631

URL: http://svn.apache.org/viewvc?rev=1127631&view=rev
Log:
Add support for a mod-sequence per message. Also merge the UidProvider with 
MessageMapper as it belongs there. See MAILBOX-74

Modified:
    
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java
    
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
    
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java

Modified: 
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java
URL: 
http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java?rev=1127631&r1=1127630&r2=1127631&view=diff
==============================================================================
--- 
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java
 (original)
+++ 
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java
 Wed May 25 18:57:19 2011
@@ -161,4 +161,12 @@ public class UpdatedFlags {
             return false;
         }
     }
+    
+    public boolean flagsChanged() {
+        if (modifiedFlags.getSystemFlags().length > 0 || 
modifiedFlags.getUserFlags().length > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

Modified: 
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
URL: 
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?rev=1127631&r1=1127630&r2=1127631&view=diff
==============================================================================
--- 
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
 (original)
+++ 
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
 Wed May 25 18:57:19 2011
@@ -433,13 +433,14 @@ public class MaildirMessageMapper extend
                         if (newMessageFile.equals(messageFile) == false) {
                             FileUtils.moveFile(messageFile, newMessageFile );
                             modSeq = newMessageFile.lastModified();
-                            updatedFlags.add(new UpdatedFlags(member.getUid(), 
modSeq, originalFlags, newFlags));
 
                         } else {
                             modSeq = messageFile.lastModified();
                         } 
                         maildirMessage.setModSeq(modSeq);
                         
+                        updatedFlags.add(new UpdatedFlags(member.getUid(), 
modSeq, originalFlags, newFlags));
+
                         long uid = maildirMessage.getUid();
                         folder.update(uid, newMessageName);
                     } catch (IOException e) {

Modified: 
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
URL: 
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java?rev=1127631&r1=1127630&r2=1127631&view=diff
==============================================================================
--- 
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
 (original)
+++ 
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
 Wed May 25 18:57:19 2011
@@ -168,12 +168,13 @@ public abstract class AbstractMessageMap
                         member.setModSeq(nextModSeq(mailbox));
                         save(mailbox, member);
 
-                        UpdatedFlags uFlags = new 
UpdatedFlags(member.getUid(), member.getModSeq(), originalFlags, newFlags);
-                        
-                        updatedFlags.add(uFlags);
-                        
                     }
 
+                    UpdatedFlags uFlags = new UpdatedFlags(member.getUid(), 
member.getModSeq(), originalFlags, newFlags);
+                    
+                    updatedFlags.add(uFlags);
+                    
+
                 }
 
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to