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/10/04 07:47:03 UTC
svn commit: r1178690 -
/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Author: norman
Date: Tue Oct 4 05:47:02 2011
New Revision: 1178690
URL: http://svn.apache.org/viewvc?rev=1178690&view=rev
Log:
Replace tabs with spaces
Modified:
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
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=1178690&r1=1178689&r2=1178690&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 Tue Oct 4 05:47:02 2011
@@ -632,45 +632,43 @@ public class StoreMessageManager<Id> imp
return index.search(mailboxSession, getMailboxEntity(), query);
}
-
private Iterator<MessageMetaData> copy(final Iterator<Message<Id>> originalRows, final MailboxSession session) throws MailboxException {
- final List<MessageMetaData> copiedRows = new ArrayList<MessageMetaData>();
- final MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
+ final List<MessageMetaData> copiedRows = new ArrayList<MessageMetaData>();
+ final MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
- while(originalRows.hasNext()) {
- final Message<Id> originalMessage = originalRows.next();
- MessageMetaData data = messageMapper.execute(new Mapper.Transaction<MessageMetaData>() {
- public MessageMetaData run() throws MailboxException {
- return messageMapper.copy(getMailboxEntity(), originalMessage);
-
- }
-
- });
- copiedRows.add(data);
- }
- return copiedRows.iterator();
+ while (originalRows.hasNext()) {
+ final Message<Id> originalMessage = originalRows.next();
+ MessageMetaData data = messageMapper.execute(new Mapper.Transaction<MessageMetaData>() {
+ public MessageMetaData run() throws MailboxException {
+ return messageMapper.copy(getMailboxEntity(), originalMessage);
+
+ }
+
+ });
+ copiedRows.add(data);
+ }
+ return copiedRows.iterator();
}
-
+
/*
* (non-Javadoc)
* @see org.apache.james.mailbox.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
*/
private SortedMap<Long, MessageMetaData> copy(MessageRange set, final StoreMessageManager<Id> to, final MailboxSession session) throws MailboxException {
- MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
+ MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
- final SortedMap<Long, MessageMetaData> copiedMessages = new TreeMap<Long, MessageMetaData>();
- Iterator<Message<Id>> originalRows = messageMapper.findInMailbox(mailbox, set, FetchType.Full, -1);
- Iterator<MessageMetaData> ids = to.copy(originalRows, session);
- while (ids.hasNext()) {
- MessageMetaData data = ids.next();
- copiedMessages.put(data.getUid(), data);
- }
+ final SortedMap<Long, MessageMetaData> copiedMessages = new TreeMap<Long, MessageMetaData>();
+ Iterator<Message<Id>> originalRows = messageMapper.findInMailbox(mailbox, set, FetchType.Full, -1);
+ Iterator<MessageMetaData> ids = to.copy(originalRows, session);
+ while (ids.hasNext()) {
+ MessageMetaData data = ids.next();
+ copiedMessages.put(data.getUid(), data);
+ }
- return copiedMessages;
+ return copiedMessages;
}
-
/**
* Return the count of unseen messages
*
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org