Author: rdonkin
Date: Fri Jan 23 07:44:28 2009
New Revision: 737059
URL: http://svn.apache.org/viewvc?rev=737059&view=rev
Log:
Switch API to generics
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractSelectionProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java?rev=737059&r1=737058&r2=737059&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
Fri Jan 23 07:44:28 2009
@@ -100,8 +100,7 @@
* @param set
* the range of messages
* @param mailboxSession not null
- * @return {...@link MessageResult} <code>Iterator</code> containing
messages
- * whose flags have been updated, not null
+ * @return new flags indexed by UID
* @throws MailboxException
*/
Map<Long, Flags> setFlags(Flags flags, boolean value, boolean replace,
@@ -120,21 +119,11 @@
boolean isRecent) throws MailboxException;
/**
- * TODO: consolidate search and getMessages into a single method
- *
+ * Gets messages in the given range.
* @param set
- * @param mailboxSession
- * TODO
- * @return MessageResult with the fields defined by <b>result</b>
- * <ul>
- * <li> IMAP: a set of msn, uid, Flags, header lines, content, mime
- * parts...</li>
- * <li> Javamail Folder: Message[]</li>
- * </ul>
+ * @param mailboxSession not null
+ * @return MessageResult with the fields defined by FetchGroup
* @throws MailboxException
*/
-
- Iterator getMessages(MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxException;
-
+ Iterator<MessageResult> getMessages(MessageRange set, FetchGroup
fetchGroup, MailboxSession mailboxSession) throws MailboxException;
}
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java?rev=737059&r1=737058&r2=737059&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
Fri Jan 23 07:44:28 2009
@@ -194,9 +194,9 @@
private void addFlagsResponses(final ImapSession session, final
SelectedMailbox selected,
final ImapProcessor.Responder responder, boolean useUid,
MessageRange messageSet, Mailbox mailbox, MailboxSession mailboxSession)
throws MailboxException {
- final Iterator it = mailbox.getMessages(messageSet,
FetchGroupImpl.FLAGS, mailboxSession);
+ final Iterator<MessageResult> it = mailbox.getMessages(messageSet,
FetchGroupImpl.FLAGS, mailboxSession);
while (it.hasNext()) {
- MessageResult mr = (MessageResult) it.next();
+ MessageResult mr = it.next();
final long uid = mr.getUid();
int msn = selected.msn(uid);
final Flags flags = mr.getFlags();
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractSelectionProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractSelectionProcessor.java?rev=737059&r1=737058&r2=737059&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractSelectionProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractSelectionProcessor.java
Fri Jan 23 07:44:28 2009
@@ -193,7 +193,7 @@
final MailboxSession mailboxSession, ImapSession session, String
name)
throws MailboxException {
final SelectedMailbox sessionMailbox;
- final Iterator it = mailbox.getMessages(MessageRangeImpl.all(),
+ final Iterator<MessageResult> it =
mailbox.getMessages(MessageRangeImpl.all(),
FetchGroupImpl.MINIMAL, mailboxSession);
final List<Long> uids = new ArrayList<Long>();
while (it.hasNext()) {
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java?rev=737059&r1=737058&r2=737059&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
Fri Jan 23 07:44:28 2009
@@ -88,8 +88,7 @@
highVal);
final MailboxSession mailboxSession = ImapSessionUtils
.getMailboxSession(session);
- final Iterator it = mailbox.getMessages(messageSet,
- resultToFetch, mailboxSession);
+ final Iterator<MessageResult> it =
mailbox.getMessages(messageSet, resultToFetch, mailboxSession);
while (it.hasNext()) {
final MessageResult result = (MessageResult) it.next();
final FetchResponse response = builder.build(fetch,
result, mailbox,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
