Author: norman
Date: Wed May 26 14:36:45 2010
New Revision: 948453
URL: http://svn.apache.org/viewvc?rev=948453&view=rev
Log:
Remove some unnessary copy of MessageReults
Add javadocs
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java?rev=948453&r1=948452&r2=948453&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
Wed May 26 14:36:45 2010
@@ -30,6 +30,10 @@ import org.apache.james.imap.mailbox.Mai
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxSession;
+/**
+ * Default implementation of {...@link SelectedMailbox}
+ *
+ */
public class SelectedMailboxImpl implements SelectedMailbox {
private final MailboxEventAnalyser events;
@@ -61,10 +65,18 @@ public class SelectedMailboxImpl impleme
events.close();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#isSizeChanged()
+ */
public boolean isSizeChanged() {
return events.isSizeChanged();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#msn(long)
+ */
public int msn(long uid) {
return converter.getMsn(uid);
}
@@ -79,10 +91,18 @@ public class SelectedMailboxImpl impleme
return events.isDeletedByOtherSession();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#uid(int)
+ */
public long uid(int msn) {
return converter.getUid(msn);
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.imap.api.process.SelectedMailbox#removeRecent(long)
+ */
public boolean removeRecent(long uid) {
final boolean result = recentUids.remove(new Long(uid));
if (result) {
@@ -91,21 +111,37 @@ public class SelectedMailboxImpl impleme
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#addRecent(long)
+ */
public boolean addRecent(long uid) {
final boolean result = recentUids.add(new Long(uid));
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#getRecent()
+ */
public Collection<Long> getRecent() {
checkExpungedRecents();
return new ArrayList<Long>(recentUids);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#recentCount()
+ */
public int recentCount() {
checkExpungedRecents();
return recentUids.size();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#getName()
+ */
public String getName() {
return events.getMailboxName();
}
@@ -116,6 +152,10 @@ public class SelectedMailboxImpl impleme
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#isRecent(long)
+ */
public boolean isRecent(long uid) {
boolean result = false;
for (final Long recentUid: recentUids) {
@@ -127,28 +167,52 @@ public class SelectedMailboxImpl impleme
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.imap.api.process.SelectedMailbox#isRecentUidRemoved()
+ */
public boolean isRecentUidRemoved() {
return recentUidRemoved;
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.imap.api.process.SelectedMailbox#resetRecentUidRemoved()
+ */
public void resetRecentUidRemoved() {
recentUidRemoved = false;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#resetEvents()
+ */
public void resetEvents() {
events.reset();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#expungedUids()
+ */
public Collection<Long> expungedUids() {
return events.expungedUids();
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.imap.api.process.SelectedMailbox#remove(java.lang.Long)
+ */
public int remove(Long uid) {
final int result = msn(uid);
converter.expunge(uid);
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.api.process.SelectedMailbox#flagUpdateUids()
+ */
public Collection<Long> flagUpdateUids() {
return events.flagUpdateUids();
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java?rev=948453&r1=948452&r2=948453&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java
Wed May 26 14:36:45 2010
@@ -106,10 +106,18 @@ public class MailboxMetaData implements
return unseenCount;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.Mailbox.MetaData#getFirstUnseen()
+ */
public Long getFirstUnseen() {
return firstUnseen;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.Mailbox.MetaData#isWriteable()
+ */
public boolean isWriteable() {
return writeable;
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=948453&r1=948452&r2=948453&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
Wed May 26 14:36:45 2010
@@ -32,9 +32,12 @@ import org.apache.james.imap.mailbox.Mai
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.MimeDescriptor;
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+/**
+ * {...@link Iterator} implementations for {...@link MessageResult}
+ *
+ */
public class ResultIterator<Id> implements Iterator<MessageResult> {
private final List<MailboxMembership<Id>> messages;
@@ -46,7 +49,7 @@ public class ResultIterator<Id> implemen
if (messages == null) {
this.messages = new ArrayList<MailboxMembership<Id>>();
} else {
- this.messages = new ArrayList<MailboxMembership<Id>>(messages);
+ this.messages = messages;
}
this.fetchGroup = fetchGroup;
}
@@ -60,12 +63,20 @@ public class ResultIterator<Id> implemen
return messages.iterator();
}
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#hasNext()
+ */
public boolean hasNext() {
return !messages.isEmpty();
}
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#next()
+ */
public MessageResult next() {
- if (messages.isEmpty()) {
+ if (hasNext() == false) {
throw new NoSuchElementException("No such element.");
}
final MailboxMembership<Id> message = messages.get(0);
@@ -80,10 +91,18 @@ public class ResultIterator<Id> implemen
return result;
}
+ /**
+ * Remove is not supported
+ */
public void remove() {
throw new UnsupportedOperationException("Read only iteration.");
}
+ /**
+ * Return a List which contains {...@link MessageResult} objects which are
left in the {...@link Iterator}
+ *
+ * @return list
+ */
public List<MessageResult> toList() {
final List<MessageResult> results = new
ArrayList<MessageResult>(messages.size());
while(hasNext()) {
@@ -93,8 +112,6 @@ public class ResultIterator<Id> implemen
}
private static final class UnloadedMessageResult<Id> implements
MessageResult {
- private static final FetchGroup FETCH_GROUP = FetchGroupImpl.MINIMAL;
-
private final MailboxException exception;
private final Date internalDate;
@@ -120,10 +137,6 @@ public class ResultIterator<Id> implemen
throw exception;
}
- public FetchGroup getIncludedResults() {
- return FETCH_GROUP;
- }
-
public Date getInternalDate() {
return internalDate;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
