Author: rdonkin
Date: Sun Sep 7 09:12:15 2008
New Revision: 692887
URL: http://svn.apache.org/viewvc?rev=692887&view=rev
Log:
Collections dependency not worthwhile for a couple of convenience methods.
Modified:
james/protocols/imap/trunk/build-tools/common-build.xml
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
Modified: james/protocols/imap/trunk/build-tools/common-build.xml
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/common-build.xml?rev=692887&r1=692886&r2=692887&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/common-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/common-build.xml Sun Sep 7 09:12:15
2008
@@ -184,7 +184,6 @@
<sequential>
<path id='classpath.base'>
<fileset dir="${lib.dir}">
- <include name="${commons-collections.jar}"/>
<include name="${javax-mail.jar}"/>
<include name="${javax-activation.jar}"/>
<include name="${commons-logging.jar}"/>
@@ -198,6 +197,7 @@
<path id='classpath.torque'>
<fileset dir="${lib.dir}">
+ <include name="${commons-collections.jar}"/>
<include name="${commons-dbcp.jar}"/>
<include name="${commons-pool.jar}"/>
<include name="${torque.jar}"/>
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java?rev=692887&r1=692886&r2=692887&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
Sun Sep 7 09:12:15 2008
@@ -19,6 +19,7 @@
package org.apache.james.mailboxmanager.impl;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,7 +29,6 @@
import javax.mail.Flags;
import javax.mail.internet.MimeMessage;
-import org.apache.commons.collections.IteratorUtils;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.util.MessageResultUtils;
@@ -75,7 +75,7 @@
setInternalDate(result.getInternalDate());
}
if (MessageResultUtils.isHeadersIncluded(result)) {
- setHeaders(IteratorUtils.toList(result.headers()));
+ setHeaders(toList(result.headers()));
}
if (MessageResultUtils.isFullContentIncluded(result)) {
setFullContent(result.getFullContent());
@@ -85,7 +85,17 @@
}
}
- public MessageResult.FetchGroup getIncludedResults() {
+ private List toList(Iterator iterator) {
+ final List results = new ArrayList();
+ if (iterator != null) {
+ while (iterator.hasNext()) {
+ results.add(iterator.next());
+ }
+ }
+ return results;
+ }
+
+ public MessageResult.FetchGroup getIncludedResults() {
final FetchGroupImpl fetchGroup = new FetchGroupImpl(includedResults);
return fetchGroup;
}
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java?rev=692887&r1=692886&r2=692887&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java
Sun Sep 7 09:12:15 2008
@@ -26,7 +26,6 @@
import javax.mail.MessagingException;
-import org.apache.commons.collections.IteratorUtils;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
@@ -42,7 +41,12 @@
* @throws MessagingException
*/
public static List getAll(final Iterator iterator) {
- List results = IteratorUtils.toList(iterator);
+ final List results = new ArrayList();
+ if (iterator != null) {
+ while(iterator.hasNext()) {
+ results.add(iterator.next());
+ }
+ }
return results;
}
Modified:
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java?rev=692887&r1=692886&r2=692887&view=diff
==============================================================================
---
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
(original)
+++
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
Sun Sep 7 09:12:15 2008
@@ -20,10 +20,10 @@
package org.apache.james.experimental.imapserver;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.ListUtils;
import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapSessionState;
@@ -55,7 +55,7 @@
final List results;
final SelectedImapMailbox selected = getSelected();
if (selected == null) {
- results = ListUtils.EMPTY_LIST;
+ results = Collections.EMPTY_LIST;
} else {
results = selected.unsolicitedResponses(omitExpunged, useUid);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
