You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/17 13:26:07 UTC

svn commit: r1136845 - in /james/mailbox/trunk: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/ jpa/src/main/java/org/apache/james/mailbox/jpa/mail/ maildir/src/main/java/org/apache/james/mailbox/maildir/mail/ memory/src/main/java/org/apache/james...

Author: norman
Date: Fri Jun 17 11:26:06 2011
New Revision: 1136845

URL: http://svn.apache.org/viewvc?rev=1136845&view=rev
Log:
Move MessageMembershipCallback to MessageMapper and rename it to MessageCallback

Modified:
    james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
    james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
    james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
    james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java

Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java (original)
+++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java Fri Jun 17 11:26:06 2011
@@ -260,7 +260,7 @@ public class JCRMessageMapper extends Ab
      * .james.imap.mailbox.MessageRange)
      */
     public void findInMailbox(Mailbox<String> mailbox, MessageRange set,
-    		MailboxMembershipCallback<String> callback) throws MailboxException {
+    		MessageCallback<String> callback) throws MailboxException {
         try {
         	List<Message<String>> results;
             long from = set.getUidFrom();
@@ -286,7 +286,7 @@ public class JCRMessageMapper extends Ab
 	            }
             
 	            if(results.size() > 0) {
-					callback.onMailboxMembers(results);
+					callback.onMessages(results);
 										
 					// move the start UID behind the last fetched message UID					
 					from = results.get(results.size()-1).getUid()+1;

Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java (original)
+++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java Fri Jun 17 11:26:06 2011
@@ -118,7 +118,7 @@ public class JPAMessageMapper extends Ab
     /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.MessageRange)
      */
-    public void findInMailbox(Mailbox<Long> mailbox, MessageRange set, MailboxMembershipCallback<Long> callback) throws MailboxException {
+    public void findInMailbox(Mailbox<Long> mailbox, MessageRange set, MessageCallback<Long> callback) throws MailboxException {
         try {
             List<Message<Long>> results;
             long from = set.getUidFrom();
@@ -146,7 +146,7 @@ public class JPAMessageMapper extends Ab
                 }
 
                 if (results.size() > 0) {
-                    callback.onMailboxMembers(results);
+                    callback.onMessages(results);
 
                     // move the start UID behind the last fetched message UID
                     from = results.get(results.size() - 1).getUid() + 1;

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=1136845&r1=1136844&r2=1136845&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 Fri Jun 17 11:26:06 2011
@@ -115,7 +115,7 @@ public class MaildirMessageMapper extend
      * (non-Javadoc)
      * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
      */
-    public void findInMailbox(Mailbox<Integer> mailbox, MessageRange set, MailboxMembershipCallback<Integer> callback)
+    public void findInMailbox(Mailbox<Integer> mailbox, MessageRange set, MessageCallback<Integer> callback)
     throws MailboxException {
         final List<Message<Integer>> results;
         final long from = set.getUidFrom();
@@ -141,11 +141,11 @@ public class MaildirMessageMapper extend
         if (batchSize > 0) {
             int i = 0;
             while (i * batchSize < results.size()) {
-                callback.onMailboxMembers(results.subList(i * batchSize, (i + 1) * batchSize < results.size() ? (i + 1) * batchSize : results.size()));
+                callback.onMessages(results.subList(i * batchSize, (i + 1) * batchSize < results.size() ? (i + 1) * batchSize : results.size()));
                 i++;
             }
         } else {
-            callback.onMailboxMembers(results);
+            callback.onMessages(results);
         }
     }
 
@@ -474,9 +474,9 @@ public class MaildirMessageMapper extend
         final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
         final MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
 
-        findInMailbox(mailbox, set, new MailboxMembershipCallback<Integer>() {
+        findInMailbox(mailbox, set, new MessageCallback<Integer>() {
 
-            public void onMailboxMembers(List<Message<Integer>> members) throws MailboxException {
+            public void onMessages(List<Message<Integer>> members) throws MailboxException {
                 for (final Message<Integer> member : members) {
                     Flags originalFlags = member.createFlags();
                     if (replace) {

Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java Fri Jun 17 11:26:06 2011
@@ -90,7 +90,7 @@ public class InMemoryMessageMapper exten
      * (non-Javadoc)
      * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(java.lang.Object, org.apache.james.mailbox.MessageRange)
      */
-    public void findInMailbox(Mailbox<Long> mailbox, MessageRange set, MailboxMembershipCallback<Long> callback) throws MailboxException {
+    public void findInMailbox(Mailbox<Long> mailbox, MessageRange set, MessageCallback<Long> callback) throws MailboxException {
         final List<Message<Long>> results;
         final int batchSize = set.getBatchSize();
         final MessageRange.Type type = set.getType();
@@ -131,11 +131,11 @@ public class InMemoryMessageMapper exten
         if(batchSize > 0) {
 	        int i = 0;
 	        while(i*batchSize < results.size()) {
-	        	callback.onMailboxMembers(results.subList(i*batchSize, (i+1)*batchSize < results.size() ? (i+1)*batchSize : results.size()));
+	        	callback.onMessages(results.subList(i*batchSize, (i+1)*batchSize < results.size() ? (i+1)*batchSize : results.size()));
 	        	i++;
 	        }
         } else {
-        	callback.onMailboxMembers(results);
+        	callback.onMessages(results);
         }
     }
     
@@ -147,9 +147,9 @@ public class InMemoryMessageMapper exten
     public Map<Long, MessageMetaData> expungeMarkedForDeletion(final Mailbox<Long> mailbox, MessageRange set) throws MailboxException {
         final Map<Long, MessageMetaData> filteredResult = new HashMap<Long, MessageMetaData>();
 
-        findInMailbox(mailbox, set, new MailboxMembershipCallback<Long>() {
+        findInMailbox(mailbox, set, new MessageCallback<Long>() {
 
-            public void onMailboxMembers(List<Message<Long>> results) throws MailboxException {
+            public void onMessages(List<Message<Long>> results) throws MailboxException {
                 for (final Iterator<Message<Long>> it = results.iterator(); it.hasNext();) {
                     Message<Long> member = it.next();
                     if (member.isDeleted()) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Fri Jun 17 11:26:06 2011
@@ -58,7 +58,6 @@ import org.apache.james.mailbox.store.st
 import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
 import org.apache.james.mailbox.store.streaming.CountingInputStream;
 import org.apache.james.mailbox.store.transaction.Mapper;
-import org.apache.james.mailbox.store.transaction.Mapper.MailboxMembershipCallback;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
 import org.apache.james.mime4j.message.Header;
@@ -535,8 +534,8 @@ public abstract class StoreMessageManage
      */
     public void getMessages(MessageRange set, final FetchGroup fetchGroup, MailboxSession mailboxSession, final MessageCallback messageCallback) throws MailboxException {
 
-        mapperFactory.getMessageMapper(mailboxSession).findInMailbox(getMailboxEntity(), set, new MailboxMembershipCallback<Id>() {
-            public void onMailboxMembers(List<Message<Id>> rows) throws MailboxException {
+        mapperFactory.getMessageMapper(mailboxSession).findInMailbox(getMailboxEntity(), set, new org.apache.james.mailbox.store.mail.MessageMapper.MessageCallback<Id>() {
+            public void onMessages(List<Message<Id>> rows) throws MailboxException {
                 messageCallback.onMessages(new ResultIterator<Id>(rows.iterator(), fetchGroup));
             }
         });
@@ -630,9 +629,9 @@ public abstract class StoreMessageManage
             MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
 
             final Map<Long, MessageMetaData> copiedMessages = new HashMap<Long, MessageMetaData>();
-            messageMapper.findInMailbox(getMailboxEntity(), set, new MailboxMembershipCallback<Id>() {
+            messageMapper.findInMailbox(getMailboxEntity(), set, new org.apache.james.mailbox.store.mail.MessageMapper.MessageCallback<Id>() {
 
-                public void onMailboxMembers(List<Message<Id>> originalRows) throws MailboxException {
+                public void onMessages(List<Message<Id>> originalRows) throws MailboxException {
                     Iterator<MessageMetaData> ids = to.copy(originalRows, session);
                     while (ids.hasNext()) {
                         MessageMetaData data = ids.next();

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=1136845&r1=1136844&r2=1136845&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 Fri Jun 17 11:26:06 2011
@@ -170,9 +170,9 @@ public abstract class AbstractMessageMap
      */
     public Iterator<UpdatedFlags> updateFlags(final Mailbox<Id> mailbox, final Flags flags, final boolean value, final boolean replace, final MessageRange set) throws MailboxException {
         final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
-        findInMailbox(mailbox, set, new MailboxMembershipCallback<Id>() {
+        findInMailbox(mailbox, set, new MessageCallback<Id>() {
 
-            public void onMailboxMembers(List<Message<Id>> members) throws MailboxException {
+            public void onMessages(List<Message<Id>> members) throws MailboxException {
                 
                 long modSeq = -1;
                 if (members.isEmpty() == false) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java Fri Jun 17 11:26:06 2011
@@ -47,9 +47,9 @@ public interface MessageMapper<Id> exten
      * @param callback callback object 
      * @throws MailboxException
      */
-    public abstract void findInMailbox(Mailbox<Id> mailbox, MessageRange set, MailboxMembershipCallback<Id> callback)
+    public abstract void findInMailbox(Mailbox<Id> mailbox, MessageRange set, MessageCallback<Id> callback)
             throws MailboxException;
-    
+
     /**
      * Return a {@link Iterator} which holds the uids for all deleted Messages for the given {@link MessageRange} which are marked for deletion
      * The list must be ordered
@@ -170,5 +170,17 @@ public interface MessageMapper<Id> exten
      * @throws MailboxException
      */
     public abstract long getHighestModSeq(Mailbox<Id> mailbox) throws MailboxException;
+    
+
+    public interface MessageCallback<Id> {
+        
+        /**
+         * Callback which get executed for a {@link List} of {@link Message}'s
+         * 
+         * @param list
+         * @throws MailboxException
+         */
+        void onMessages(List<Message<Id>> list) throws MailboxException;
+    }
 
 }
\ No newline at end of file

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java Fri Jun 17 11:26:06 2011
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.store.Ma
 import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.transaction.Mapper.MailboxMembershipCallback;
+import org.apache.james.mailbox.store.mail.MessageMapper.MessageCallback;
 
 /**
  * {@link QuotaManager} which will keep track of quota by listing for {@link Event}'s.
@@ -98,11 +98,11 @@ public abstract class ListeningQuotaMana
                 final AtomicLong mSizes = new AtomicLong(0);
                 List<Mailbox> mailboxes = factory.getMailboxMapper(session).findMailboxWithPathLike(new MailboxPath(session.getPersonalSpace(), id, "%"));
                 for (int i = 0; i < mailboxes.size(); i++) {
-                    factory.getMessageMapper(session).findInMailbox(mailboxes.get(i), MessageRange.all(), new MailboxMembershipCallback<Object>() {
+                    factory.getMessageMapper(session).findInMailbox(mailboxes.get(i), MessageRange.all(), new MessageCallback<Object>() {
                         long messageSizes = 0;
 
                         @Override
-                        public void onMailboxMembers(List<Message<Object>> list) throws MailboxException {
+                        public void onMessages(List<Message<Object>> list) throws MailboxException {
                             for (int i = 0; i < list.size(); i++) {
                                 messageSizes += list.get(i).getFullContentOctets();
                             }

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java Fri Jun 17 11:26:06 2011
@@ -28,9 +28,9 @@ import org.apache.james.mailbox.MailboxE
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.store.mail.MessageMapper.MessageCallback;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.transaction.Mapper.MailboxMembershipCallback;
 
 /**
  * {@link ListeningMessageSearchIndex} implementation which wraps another {@link ListeningMessageSearchIndex} and will forward all calls to it.
@@ -83,10 +83,10 @@ public class LazyMessageSearchIndex<Id> 
                 done = oldDone;
             }
             synchronized (done) {
-                getFactory().getMessageMapper(session).findInMailbox(mailbox, MessageRange.all(), new MailboxMembershipCallback<Id>() {
+                getFactory().getMessageMapper(session).findInMailbox(mailbox, MessageRange.all(), new MessageCallback<Id>() {
 
                     @Override
-                    public void onMailboxMembers(List<Message<Id>> list) throws MailboxException {
+                    public void onMessages(List<Message<Id>> list) throws MailboxException {
                         for (int i = 0; i < list.size(); i++) {
                             final Message<Id> message = list.get(i);
 

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java Fri Jun 17 11:26:06 2011
@@ -32,10 +32,10 @@ import org.apache.james.mailbox.store.Ma
 import org.apache.james.mailbox.store.MailboxEventDispatcher.ExpungedImpl;
 import org.apache.james.mailbox.store.MailboxEventDispatcher.FlagsUpdatedImpl;
 import org.apache.james.mailbox.store.MailboxEventDispatcher.MailboxDeletionImpl;
+import org.apache.james.mailbox.store.mail.MessageMapper.MessageCallback;
 import org.apache.james.mailbox.store.mail.MessageMapperFactory;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.transaction.Mapper.MailboxMembershipCallback;
 
 /**
  * {@link MessageSearchIndex} which needs to get registered as global {@link MailboxListener} and so get
@@ -80,10 +80,10 @@ public abstract class ListeningMessageSe
 
                     while (uids.hasNext()) {
                         long next = uids.next();
-                        factory.getMessageMapper(session).findInMailbox(mailbox, MessageRange.one(next), new MailboxMembershipCallback<Id>() {
+                        factory.getMessageMapper(session).findInMailbox(mailbox, MessageRange.one(next), new MessageCallback<Id>() {
 
                             @Override
-                            public void onMailboxMembers(List<Message<Id>> list) throws MailboxException {
+                            public void onMessages(List<Message<Id>> list) throws MailboxException {
                                 for (int i = 0; i < list.size(); i++) {
                                     Message<Id> message = list.get(i);
                                     try {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java Fri Jun 17 11:26:06 2011
@@ -31,10 +31,10 @@ import org.apache.james.mailbox.SearchQu
 import org.apache.james.mailbox.SearchQuery.NumericRange;
 import org.apache.james.mailbox.SearchQuery.UidCriterion;
 import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.mail.MessageMapper.MessageCallback;
 import org.apache.james.mailbox.store.mail.MessageMapperFactory;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.transaction.Mapper.MailboxMembershipCallback;
 
 /**
  * {@link MessageSearchIndex} which just fetch {@link Message}'s from the {@link MessageMapper} and use {@link MessageSearcher}
@@ -64,9 +64,9 @@ public class SimpleMessageSearchIndex<Id
             NumericRange[] ranges = uidCrit.getOperator().getRange();
             for (int i = 0; i < ranges.length; i++) {
                 NumericRange r = ranges[i];
-                mapper.findInMailbox(mailbox, MessageRange.range(r.getLowValue(), r.getHighValue()), new MailboxMembershipCallback<Id>() {
+                mapper.findInMailbox(mailbox, MessageRange.range(r.getLowValue(), r.getHighValue()), new MessageCallback<Id>() {
 
-                    public void onMailboxMembers(List<Message<Id>> list) throws MailboxException {
+                    public void onMessages(List<Message<Id>> list) throws MailboxException {
                         for (int i = 0; i < list.size(); i++) {
                             long uid = list.get(i).getUid();
                             if (uids.contains(uid) == false) {
@@ -84,9 +84,9 @@ public class SimpleMessageSearchIndex<Id
             
             final List<Message<Id>> hits = new ArrayList<Message<Id>>();
 
-            mapper.findInMailbox(mailbox, MessageRange.all(), new MailboxMembershipCallback<Id>() {
+            mapper.findInMailbox(mailbox, MessageRange.all(), new MessageCallback<Id>() {
 
-                public void onMailboxMembers(List<Message<Id>> list) throws MailboxException {
+                public void onMessages(List<Message<Id>> list) throws MailboxException {
                     for (int i = 0; i < list.size(); i++) {
                         Message<Id> m = list.get(i);
                         if (hits.contains(m) == false) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java?rev=1136845&r1=1136844&r2=1136845&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java Fri Jun 17 11:26:06 2011
@@ -19,10 +19,7 @@
 
 package org.apache.james.mailbox.store.transaction;
 
-import java.util.List;
-
 import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.store.mail.model.Message;
 
 /**
  * Mapper which execute units of work in a {@link Transaction}
@@ -57,9 +54,6 @@ public interface Mapper {
         public T run() throws MailboxException;
     }
     
-    public interface MailboxMembershipCallback<Id> {
-    	void onMailboxMembers(List<Message<Id>> list) throws MailboxException;
-    }
     
     public abstract class VoidTransaction implements Transaction<Void> {
         



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org