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 2010/01/11 23:45:09 UTC
svn commit: r898100 - in /james/imap/trunk:
api/src/main/java/org/apache/james/api/imap/message/
api/src/main/java/org/apache/james/imap/api/message/
decode/src/main/java/org/apache/james/imap/decode/
mailbox/src/main/java/org/apache/james/imap/mailbox...
Author: norman
Date: Mon Jan 11 22:45:08 2010
New Revision: 898100
URL: http://svn.apache.org/viewvc?rev=898100&view=rev
Log:
Only some cleanup (generics, javadocs)
Removed:
james/imap/trunk/api/src/main/java/org/apache/james/api/imap/message/
james/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/
james/imap/trunk/message/src/test/java/org/apache/james/imap/message/response/imap4rev1/
james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java
james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/ProtocolSession.java
james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java Mon Jan 11 22:45:08 2010
@@ -68,10 +68,10 @@
private final int[] path;
- private final Collection fieldNames;
+ private final Collection<String> fieldNames;
public BodyFetchElement(final String name, final int sectionType,
- final int[] path, final Collection fieldNames, Long firstOctet,
+ final int[] path, final Collection<String> fieldNames, Long firstOctet,
Long numberOfOctets) {
this.name = name;
this.sectionType = sectionType;
@@ -91,7 +91,7 @@
* @return <code>String</code> collection, when {@link #HEADER_FIELDS} or
* {@link #HEADER_NOT_FIELDS} or null otherwise
*/
- public final Collection getFieldNames() {
+ public final Collection<String> getFieldNames() {
return fieldNames;
}
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java Mon Jan 11 22:45:08 2010
@@ -498,7 +498,7 @@
* {@link #HEADER_FIELDS} or {@link #HEADER_NOT_FIELDS}, null
* otherwise
*/
- public final List getNames() {
+ public final List<String> getNames() {
return names;
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java Mon Jan 11 22:45:08 2010
@@ -104,7 +104,7 @@
*
* @return <code>Flags.Flag</code> <code>Iterator</code>, not null
*/
- public abstract Iterator flagsIterator();
+ public abstract Iterator<Flags.Flag> flagsIterator();
}
public abstract class Added implements MessageEvent {
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java Mon Jan 11 22:45:08 2010
@@ -57,7 +57,7 @@
*
*/
-public interface MessageResult extends Comparable, Headers {
+public interface MessageResult extends Comparable<MessageResult>, Headers {
/**
* Indicates the results fetched.
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java Mon Jan 11 22:45:08 2010
@@ -98,11 +98,11 @@
partContentDescriptors = new HashSet<PartContentDescriptor>();
}
PartContentDescriptorImpl currentDescriptor = null;
- for (Iterator it = partContentDescriptors.iterator(); it.hasNext();) {
- PartContentDescriptorImpl descriptor = (PartContentDescriptorImpl) it
+ for (Iterator<PartContentDescriptor> it = partContentDescriptors.iterator(); it.hasNext();) {
+ PartContentDescriptor descriptor = (PartContentDescriptor) it
.next();
if (path.equals(descriptor.path())) {
- currentDescriptor = descriptor;
+ currentDescriptor = (PartContentDescriptorImpl) descriptor;
break;
}
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java Mon Jan 11 22:45:08 2010
@@ -70,9 +70,13 @@
event(flags);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener#event(org.apache.james.imap.mailbox.MailboxListener.Event)
+ */
public void event(Event event) {
- for (Iterator iter = listeners.iterator(); iter.hasNext();) {
- MailboxListener mailboxListener = (MailboxListener) iter.next();
+ for (Iterator<MailboxListener> iter = listeners.iterator(); iter.hasNext();) {
+ MailboxListener mailboxListener = iter.next();
mailboxListener.event(event);
}
}
@@ -179,23 +183,39 @@
this.newFlags = newFlags;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.MessageEvent#getSubjectUid()
+ */
public long getSubjectUid() {
return subjectUid;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.Event#getSessionId()
+ */
public long getSessionId() {
return sessionId;
}
- public Iterator flagsIterator() {
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated#flagsIterator()
+ */
+ public Iterator<Flag> flagsIterator() {
return new FlagsIterator();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated#getNewFlags()
+ */
public Flags getNewFlags() {
return newFlags;
}
- private class FlagsIterator implements Iterator {
+ private class FlagsIterator implements Iterator<Flag> {
private int position;
public FlagsIterator() {
@@ -212,11 +232,19 @@
}
}
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#hasNext()
+ */
public boolean hasNext() {
return position < NUMBER_OF_SYSTEM_FLAGS;
}
- public Object next() {
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#next()
+ */
+ public Flag next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
@@ -225,6 +253,10 @@
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see java.util.Iterator#remove()
+ */
public void remove() {
throw new UnsupportedOperationException("Read only");
}
@@ -246,6 +278,10 @@
this.sessionId = sessionId;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.Event#getSessionId()
+ */
public long getSessionId() {
return sessionId;
}
@@ -261,15 +297,27 @@
this.sessionId = sessionId;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.MailboxRenamed#getNewName()
+ */
public String getNewName() {
return newName;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener.Event#getSessionId()
+ */
public long getSessionId() {
return sessionId;
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxListener#isClosed()
+ */
public boolean isClosed() {
return false;
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java Mon Jan 11 22:45:08 2010
@@ -68,19 +68,35 @@
setFlags(flags);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getUid()
+ */
public long getUid() {
return uid;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getUidValidity()
+ */
public long getUidValidity() {
// TODO implement or remove
return 0;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getInternalDate()
+ */
public Date getInternalDate() {
return internalDate;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getFlags()
+ */
public Flags getFlags() {
return flags;
}
@@ -89,6 +105,10 @@
this.uid = uid;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getSize()
+ */
public int getSize() {
return size;
}
@@ -97,8 +117,11 @@
this.flags = flags;
}
- public int compareTo(Object o) {
- MessageResult that = (MessageResult) o;
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(MessageResult that) {
if (this.uid > 0 && that.getUid() > 0) {
// TODO: this seems inefficient
return new Long(uid).compareTo(new Long(that.getUid()));
@@ -121,6 +144,10 @@
this.internalDate = internalDate;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#headers()
+ */
public Iterator<Header> headers() {
return headers.iterator();
}
@@ -136,6 +163,10 @@
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getFullContent()
+ */
public final Content getFullContent() {
return fullContent;
}
@@ -147,6 +178,10 @@
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getBody()
+ */
public final Content getBody() {
return body;
}
@@ -174,6 +209,10 @@
return retValue;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getBody(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ */
public Content getBody(MimePath path) throws MailboxException {
final Content result;
final PartContent partContent = getPartContent(path);
@@ -185,6 +224,10 @@
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getMimeBody(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ */
public Content getMimeBody(MimePath path) throws MailboxException {
final Content result;
final PartContent partContent = getPartContent(path);
@@ -196,6 +239,10 @@
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getFullContent(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ */
public Content getFullContent(MimePath path) throws MailboxException {
final Content result;
final PartContent partContent = getPartContent(path);
@@ -207,6 +254,10 @@
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#iterateHeaders(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ */
public Iterator<Header> iterateHeaders(MimePath path)
throws MailboxException {
final Iterator<Header> result;
@@ -219,6 +270,10 @@
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#iterateMimeHeaders(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ */
public Iterator<Header> iterateMimeHeaders(MimePath path)
throws MailboxException {
final Iterator<Header> result;
@@ -333,6 +388,10 @@
this.mimeDescriptor = mimeDescriptor;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MessageResult#getMimeDescriptor()
+ */
public MimeDescriptor getMimeDescriptor() {
return mimeDescriptor;
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java Mon Jan 11 22:45:08 2010
@@ -22,7 +22,7 @@
import org.apache.james.imap.mailbox.MailboxMetaData;
import org.apache.james.imap.mailbox.StandardMailboxMetaDataComparator;
-public class SimpleMailboxMetaData implements MailboxMetaData, Comparable {
+public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<MailboxMetaData> {
public static MailboxMetaData createNoSelect(String name, String delimiter) {
return new SimpleMailboxMetaData(name, delimiter, Children.CHILDREN_ALLOWED_BUT_UNKNOWN, Selectability.NOSELECT);
@@ -65,14 +65,26 @@
return selectability;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxMetaData#getHierarchyDelimiter()
+ */
public String getHierarchyDelimiter() {
return delimiter;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxMetaData#getName()
+ */
public String getName() {
return name;
}
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
public String toString() {
return "ListResult: " + name;
}
@@ -106,8 +118,12 @@
return true;
}
- public int compareTo(Object o) {
- return StandardMailboxMetaDataComparator.order(this, (MailboxMetaData) o);
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(MailboxMetaData o) {
+ return StandardMailboxMetaDataComparator.order(this, o);
}
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java Mon Jan 11 22:45:08 2010
@@ -94,7 +94,7 @@
found(uid, flags);
}
- for (Iterator iter = expectedSet.iterator(); iter.hasNext();) {
+ for (Iterator<Long> iter = expectedSet.iterator(); iter.hasNext();) {
long uid = ((Long) iter.next()).longValue();
eventDispatcher.expunged(uid, Mailbox.ANONYMOUS_SESSION);
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java Mon Jan 11 22:45:08 2010
@@ -19,7 +19,7 @@
package org.apache.james.imap.mailbox.util;
-public class UidRange implements Comparable {
+public class UidRange implements Comparable<UidRange> {
private long fromUid;
@@ -42,13 +42,13 @@
return fromUid + ":" + toUid;
}
- public int compareTo(Object o) {
- if (!(o instanceof UidRange)) {
- return 1;
- } else {
- UidRange that = (UidRange) o;
- return new Long(fromUid).compareTo(new Long(that.fromUid));
- }
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(UidRange that) {
+ return new Long(fromUid).compareTo(new Long(that.fromUid));
+
}
}
Modified: james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java (original)
+++ james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java Mon Jan 11 22:45:08 2010
@@ -60,7 +60,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
@@ -72,7 +72,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertFalse(iterator.hasNext());
}
@@ -84,7 +84,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.ANSWERED, iterator.next());
@@ -98,7 +98,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.ANSWERED, iterator.next());
@@ -112,7 +112,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DELETED, iterator.next());
@@ -126,7 +126,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DELETED, iterator.next());
@@ -140,7 +140,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DRAFT, iterator.next());
@@ -154,7 +154,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.DRAFT, iterator.next());
@@ -168,7 +168,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.FLAGGED, iterator.next());
@@ -182,7 +182,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.FLAGGED, iterator.next());
@@ -196,7 +196,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.RECENT, iterator.next());
@@ -210,7 +210,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.RECENT, iterator.next());
@@ -224,7 +224,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.SEEN, iterator.next());
@@ -238,7 +238,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.SEEN, iterator.next());
@@ -259,7 +259,7 @@
assertTrue(collector.events.get(0) instanceof MailboxListener.FlagsUpdated);
MailboxListener.FlagsUpdated event = (MailboxListener.FlagsUpdated) collector.events
.get(0);
- Iterator iterator = event.flagsIterator();
+ Iterator<Flags.Flag> iterator = event.flagsIterator();
assertNotNull(iterator);
assertTrue(iterator.hasNext());
assertEquals(Flags.Flag.ANSWERED, iterator.next());
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java Mon Jan 11 22:45:08 2010
@@ -264,11 +264,10 @@
}
private void encodeBodyElements(final ImapResponseComposer composer,
- final List elements) throws IOException {
+ final List<FetchResponse.BodyElement> elements) throws IOException {
if (elements != null) {
- for (final Iterator it = elements.iterator(); it.hasNext();) {
- FetchResponse.BodyElement element = (FetchResponse.BodyElement) it
- .next();
+ for (final Iterator<FetchResponse.BodyElement> it = elements.iterator(); it.hasNext();) {
+ FetchResponse.BodyElement element = it.next();
final String name = element.getName();
composer.message(name);
composer.literal(element);
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java Mon Jan 11 22:45:08 2010
@@ -34,7 +34,7 @@
public static void encodeListingResponse(final String responseTypeName,
final ImapResponseComposer composer,
final AbstractListingResponse response) throws IOException {
- final List attributes = getNameAttributes(response);
+ final List<String> attributes = getNameAttributes(response);
final String name = response.getName();
final String hierarchyDelimiter = response.getHierarchyDelimiter();
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java Mon Jan 11 22:45:08 2010
@@ -41,7 +41,7 @@
private final Integer size;
- private final List elements;
+ private final List<BodyElement> elements;
private final Envelope envelope;
@@ -52,7 +52,7 @@
public FetchResponse(final int messageNumber, final Flags flags,
final Long uid, final Date internalDate, final Integer size,
final Envelope envelope, final Structure body,
- final Structure bodystructure, List elements) {
+ final Structure bodystructure, List<BodyElement> elements) {
super();
this.messageNumber = messageNumber;
this.flags = flags;
@@ -150,7 +150,7 @@
* @return <code>List</code> of <code>BodyElement</code>'s, or null if
* the <code>FETCH</code> did not include body elements
*/
- public final List getElements() {
+ public final List<BodyElement> getElements() {
return elements;
}
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java Mon Jan 11 22:45:08 2010
@@ -119,7 +119,7 @@
}
session.SL(sessionNumber, serverMsg, location, lastClientMsg);
} else if (next.startsWith(OPEN_UNORDERED_BLOCK_TAG)) {
- List unorderedLines = new ArrayList(5);
+ List<String> unorderedLines = new ArrayList<String>(5);
next = reader.readLine();
while (!next.startsWith(CLOSE_UNORDERED_BLOCK_TAG)) {
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/ProtocolSession.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/ProtocolSession.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/ProtocolSession.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/ProtocolSession.java Mon Jan 11 22:45:08 2010
@@ -43,9 +43,9 @@
private int maxSessionNumber;
- protected List testElements = new ArrayList();
+ protected List<ProtocolElement> testElements = new ArrayList<ProtocolElement>();
- private Iterator elementsIterator;
+ private Iterator<ProtocolElement> elementsIterator;
private HostSystem.Session[] sessions;
@@ -138,7 +138,7 @@
/**
* adds a new Server Unordered Block to the test elements.
*/
- public void SUB(List serverLines, String location) {
+ public void SUB(List<String> serverLines, String location) {
testElements
.add(new ServerUnorderedBlockResponse(serverLines, location));
}
@@ -173,7 +173,7 @@
/**
* adds a new Server Unordered Block to the test elements.
*/
- public void SUB(int sessionNumber, List serverLines, String location,
+ public void SUB(int sessionNumber, List<String> serverLines, String location,
String lastClientMessage) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new ServerUnorderedBlockResponse(sessionNumber,
@@ -364,7 +364,7 @@
* non-specified order.
*/
private class ServerUnorderedBlockResponse extends ServerResponse {
- private List expectedLines = new ArrayList();
+ private List<String> expectedLines = new ArrayList<String>();
/**
* Sets up a ServerUnorderedBlockResponse with the list of expected
@@ -376,7 +376,7 @@
* @param location
* A descriptive location string for error messages.
*/
- public ServerUnorderedBlockResponse(List expectedLines, String location) {
+ public ServerUnorderedBlockResponse(List<String> expectedLines, String location) {
this(-1, expectedLines, location, null);
}
@@ -394,7 +394,7 @@
* A descriptive location string for error messages.
*/
public ServerUnorderedBlockResponse(int sessionNumber,
- List expectedLines, String location, String lastClientMessage) {
+ List<String> expectedLines, String location, String lastClientMessage) {
super(sessionNumber, "<Unordered Block>", location,
lastClientMessage);
this.expectedLines = expectedLines;
@@ -413,7 +413,7 @@
*/
protected void checkResponse(HostSystem.Session session,
boolean continueAfterFailure) throws Exception {
- List testLines = new ArrayList(expectedLines);
+ List<String> testLines = new ArrayList<String>(expectedLines);
while (testLines.size() > 0) {
String actualLine = readLine(session);
@@ -431,7 +431,7 @@
StringBuffer errMsg = new StringBuffer().append(
"\nLocation: ").append(location).append(
"\nExpected one of: ");
- Iterator iter = expectedLines.iterator();
+ Iterator<String> iter = expectedLines.iterator();
while (iter.hasNext()) {
errMsg.append("\n ");
errMsg.append(iter.next());
@@ -507,6 +507,7 @@
* An exception which is thrown when the actual response from a server is
* different from that expected.
*/
+ @SuppressWarnings("serial")
public class InvalidServerResponseException extends Exception {
public InvalidServerResponseException(String message) {
super(message);
Modified: james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom (original)
+++ james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom Mon Jan 11 22:45:08 2010
@@ -28,10 +28,9 @@
</description>
<parent>
- <artifactId>james-parent</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-parent</artifactId>
<version>1.3RC3-SNAPSHOT</version>
- <relativePath>../stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom</relativePath>
</parent>
<modules>
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=898100&r1=898099&r2=898100&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 Mon Jan 11 22:45:08 2010
@@ -163,8 +163,7 @@
throw exception;
}
- public int compareTo(Object o) {
- MessageResult that = (MessageResult) o;
+ public int compareTo(MessageResult that) {
// Java 1.5 return (int) Math.signum(uid - that.getUid());
long diff = uid - that.getUid();
return (int) diff == 0 ? 0 : diff > 0 ? 1 : -1;
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java Mon Jan 11 22:45:08 2010
@@ -170,8 +170,7 @@
throw exception;
}
- public int compareTo(Object o) {
- MessageResult that = (MessageResult) o;
+ public int compareTo(MessageResult that) {
// Java 1.5 return (int) Math.signum(uid - that.getUid());
long diff = uid - that.getUid();
return (int) diff == 0 ? 0 : diff > 0 ? 1 : -1;
Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java (original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java Mon Jan 11 22:45:08 2010
@@ -198,14 +198,14 @@
private void checkContentType(String contentType, int[] position)
throws Exception {
- List headers = headers(position);
+ List<Header> headers = headers(position);
assertEquals(1, headers.size());
Header header = (Header) headers.get(0);
assertEquals(CONTENT_TYPE, header.getName());
assertEquals(contentType, header.getValue());
}
- private List headers(int[] position) throws Exception {
+ private List<Header> headers(int[] position) throws Exception {
to(position);
return builder.getMimeHeaders();
}
Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java?rev=898100&r1=898099&r2=898100&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java (original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java Mon Jan 11 22:45:08 2010
@@ -120,14 +120,14 @@
private void checkContentType(String contentType, String mail, int position)
throws Exception {
- List headers = headers(mail, position);
+ List<Header> headers = headers(mail, position);
assertEquals(1, headers.size());
Header header = (Header) headers.get(0);
assertEquals(CONTENT_TYPE, header.getName());
assertEquals(contentType, header.getValue());
}
- private List headers(String mail, int position) throws Exception {
+ private List<Header> headers(String mail, int position) throws Exception {
InputStream in = new ByteArrayInputStream(Charset.forName("us-ascii")
.encode(mail).array());
builder.parse(in);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org