Author: rdonkin
Date: Fri Jan 23 09:36:35 2009
New Revision: 737109
URL: http://svn.apache.org/viewvc?rev=737109&view=rev
Log:
Generify
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimeDescriptorStructure.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
Fri Jan 23 09:36:35 2009
@@ -19,9 +19,11 @@
package org.apache.james.imap.mailbox;
+
import java.util.Iterator;
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.Header;
/**
* TODO: remove when MessageResult is sorted out
@@ -33,5 +35,5 @@
* @return <code>Header</code> <code>Iterator</code>, or null if
* {...@link FetchGroup#HEADERS} was not fetched
*/
- Iterator headers() throws MailboxException;
+ Iterator<Header> headers() throws MailboxException;
}
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
Fri Jan 23 09:36:35 2009
@@ -119,7 +119,7 @@
* @return <code>Set</code> of {...@link PartContentDescriptor}, or
null
* if there is no part content to be fetched
*/
- public Set getPartContentDescriptors();
+ public Set<PartContentDescriptor> getPartContentDescriptors();
/**
* Describes the contents to be fetched for a mail part. All
@@ -198,7 +198,7 @@
* @return <code>Header</code> <code>Iterator</code>, or null if
* {...@link FetchGroup#HEADERS} was not fetched
*/
- Iterator headers() throws MailboxException;
+ Iterator<Header> headers() throws MailboxException;
/**
* Iterates the message headers for the given part in a multipart message.
@@ -210,7 +210,7 @@
* when the mime part cannot be found
* @throws MailboxException
*/
- Iterator iterateHeaders(MimePath path) throws MailboxException;
+ Iterator<Header> iterateHeaders(MimePath path) throws MailboxException;
/**
* Iterates the MIME headers for the given part in a multipart message.
@@ -222,7 +222,7 @@
* when the mime part cannot be found
* @throws MailboxException
*/
- Iterator iterateMimeHeaders(MimePath path) throws MailboxException;
+ Iterator<Header> iterateMimeHeaders(MimePath path) throws MailboxException;
/**
* A header.
@@ -454,7 +454,7 @@
*
* @return <code>Header</code> <code>Iterator</code>, not null
*/
- public Iterator headers();
+ public Iterator<Header> headers();
/**
* Gets MIME body parameters parsed from <code>Content-Type</code>.
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
Fri Jan 23 09:36:35 2009
@@ -31,6 +31,7 @@
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.Header;
/**
* Bean based implementation. {...@link #getIncludedResults()} is updated when
@@ -174,7 +175,7 @@
}
}
- public Iterator headers() {
+ public Iterator<Header> headers() {
return headers.iterator();
}
@@ -260,7 +261,7 @@
return result;
}
- public Iterator iterateHeaders(MimePath path)
+ public Iterator<Header> iterateHeaders(MimePath path)
throws MailboxException {
final Iterator result;
final PartContent partContent = getPartContent(path);
@@ -272,7 +273,7 @@
return result;
}
- public Iterator iterateMimeHeaders(MimePath path)
+ public Iterator<Header> iterateMimeHeaders(MimePath path)
throws MailboxException {
final Iterator result;
final PartContent partContent = getPartContent(path);
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
Fri Jan 23 09:36:35 2009
@@ -170,12 +170,11 @@
* @throws MessagingException
*/
public static MessageResult.Header getMatching(final String name,
- final Iterator iterator) throws MessagingException {
+ final Iterator<MessageResult.Header> iterator) throws
MessagingException {
MessageResult.Header result = null;
if (name != null) {
while (iterator.hasNext()) {
- MessageResult.Header header = (MessageResult.Header) iterator
- .next();
+ MessageResult.Header header = iterator.next();
final String headerName = header.getName();
if (name.equalsIgnoreCase(headerName)) {
result = header;
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
Fri Jan 23 09:36:35 2009
@@ -261,7 +261,7 @@
* @return self, not null
* @throws IOException
*/
- public ImapResponseComposer nillableQuotes(String[] quotes)
+ public ImapResponseComposer nillableQuotes(List<String> quotes)
throws IOException;
/**
@@ -279,7 +279,7 @@
* @throws IOException
*/
public ImapResponseComposer nillableComposition(String masterQuote,
- String[] quotes) throws IOException;
+ List<String> quotes) throws IOException;
public void skipNextSpace() throws IOException;
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
Fri Jan 23 09:36:35 2009
@@ -490,7 +490,7 @@
}
public ImapResponseComposer nillableComposition(String masterQuote,
- String[] quotes) throws IOException {
+ List<String> quotes) throws IOException {
if (masterQuote == null) {
nil();
} else {
@@ -502,14 +502,13 @@
return this;
}
- public ImapResponseComposer nillableQuotes(String[] quotes)
+ public ImapResponseComposer nillableQuotes(List<String> quotes)
throws IOException {
- if (quotes == null || quotes.length == 0) {
+ if (quotes == null || quotes.size() == 0) {
nil();
} else {
openParen();
- for (int i = 0; i < quotes.length; i++) {
- final String string = quotes[i];
+ for (final String string:quotes) {
nillableQuote(string);
}
closeParen();
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java
Fri Jan 23 09:36:35 2009
@@ -42,8 +42,6 @@
public class FetchResponseEncoder extends AbstractChainedImapEncoder {
- private static final String[] EMPTY_STRING_ARRAY = {};
-
public FetchResponseEncoder(final ImapEncoder next) {
super(next);
}
@@ -151,7 +149,7 @@
final ImapResponseComposer composer, final Structure structure)
throws IOException {
final String md5 = structure.getMD5();
- final String[] languages = languages(structure);
+ final List<String> languages = structure.getLanguages();
final String location = structure.getLocation();
composer.nillableQuote(md5);
bodyFldDsp(structure, composer).nillableQuotes(languages)
@@ -203,7 +201,7 @@
private void encodeBodyFields(final ImapResponseComposer composer,
final Structure structure, final String mediaType,
final String subType) throws IOException {
- final String[] bodyParams = structure.getParameters();
+ final List<String> bodyParams = structure.getParameters();
final String id = structure.getId();
final String description = structure.getDescription();
final String encoding = structure.getEncoding();
@@ -219,14 +217,14 @@
final boolean includeExtensions) throws IOException {
composer.openParen();
- for (Iterator it = structure.parts(); it.hasNext();) {
- final Structure part = (Structure) it.next();
+ for (Iterator<Structure> it = structure.parts(); it.hasNext();) {
+ final Structure part = it.next();
encodeStructure(composer, part, includeExtensions, true);
}
composer.quoteUpperCaseAscii(subType);
if (includeExtensions) {
- final String[] languages = languages(structure);
+ final List<String> languages = structure.getLanguages();
composer.nillableQuotes(structure.getParameters());
bodyFldDsp(structure, composer).nillableQuotes(languages)
.nillableQuote(structure.getLocation());
@@ -234,17 +232,6 @@
composer.closeParen();
}
- private String[] languages(Structure structure) {
- final List languageList = structure.getLanguages();
- final String[] languages;
- if (languageList == null) {
- languages = null;
- } else {
- languages = (String[]) languageList.toArray(EMPTY_STRING_ARRAY);
- }
- return languages;
- }
-
private void encodeRfc822Message(ImapResponseComposer composer,
Structure structure, final String mediaType, final String subType,
final boolean includeExtensions) throws IOException {
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java
Fri Jan 23 09:36:35 2009
@@ -177,7 +177,7 @@
*
* @return parameters, or null
*/
- public String[] getParameters();
+ public List<String> getParameters();
/**
* Gets <code>Content-ID</code>.
@@ -247,7 +247,7 @@
* <code>String</code>'s possibly null or null when
* <code>BODY</code> FETCH
*/
- public List getLanguages();
+ public List<String> getLanguages();
/**
* Gets <code>Content-Location</code>.
@@ -263,7 +263,7 @@
* @return <code>Structure</code> <code>Iterator</code> when
* composite type, null otherwise
*/
- public Iterator parts();
+ public Iterator<Structure> parts();
/**
* Gets the envelope of an embedded mail.
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
Fri Jan 23 09:36:35 2009
@@ -331,10 +331,10 @@
return result;
}
- private Iterator getHeaders(final MessageResult messageResult,
+ private Iterator<MessageResult.Header> getHeaders(final MessageResult
messageResult,
final int[] path, final boolean isBase)
throws MailboxException {
- final Iterator headers;
+ final Iterator<MessageResult.Header> headers;
if (isBase) {
headers = messageResult.headers();
} else {
@@ -344,10 +344,10 @@
return headers;
}
- private Iterator getMimeHeaders(final MessageResult messageResult,
+ private Iterator<MessageResult.Header> getMimeHeaders(final MessageResult
messageResult,
final int[] path, final boolean isBase) throws MessagingException {
MessageResult.MimePath mimePath = new MimePathImpl(path);
- final Iterator headers = messageResult.iterateMimeHeaders(mimePath);
+ final Iterator<MessageResult.Header> headers =
messageResult.iterateMimeHeaders(mimePath);
return headers;
}
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimeDescriptorStructure.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimeDescriptorStructure.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimeDescriptorStructure.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimeDescriptorStructure.java
Fri Jan 23 09:36:35 2009
@@ -29,7 +29,6 @@
import javax.mail.MessagingException;
-import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.MessageResult.MimeDescriptor;
@@ -42,7 +41,7 @@
private final MessageResult.MimeDescriptor descriptor;
- private final String[] parameters;
+ private final List<String> parameters;
private final List parts;
@@ -98,7 +97,7 @@
return results;
}
- private static String[] createParameters(MimeDescriptor descriptor)
+ private static List<String> createParameters(MimeDescriptor descriptor)
throws MailboxException {
final List<String> results = new ArrayList<String>();
// TODO: consider revising this design
@@ -111,7 +110,7 @@
results.add(value);
}
- return (String[]) results.toArray(ImapConstants.EMPTY_STRING_ARRAY);
+ return results;
}
public String getDescription() {
@@ -138,7 +137,7 @@
return descriptor.getBodyOctets();
}
- public String[] getParameters() {
+ public List<String> getParameters() {
return parameters;
}
@@ -146,7 +145,7 @@
return descriptor.getMimeSubType();
}
- public Iterator parts() {
+ public Iterator<Structure> parts() {
return parts.iterator();
}
@@ -162,7 +161,7 @@
return md5;
}
- public List getLanguages() {
+ public List<String> getLanguages() {
return languages;
}
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
Fri Jan 23 09:36:35 2009
@@ -190,7 +190,7 @@
private final List languages;
- private final Collection headers;
+ private final Collection<MessageResult.Header> headers;
private final Collection contentTypeParameters;
@@ -209,7 +209,7 @@
public MimeDescriptorImpl(final long bodyOctets,
final String contentDescription, final String contentId,
final long lines, final String subType, final String type,
- final String transferEncoding, final Collection headers,
+ final String transferEncoding, final
Collection<MessageResult.Header> headers,
final Collection contentTypeParameters, final List languages,
String disposition, Map dispositionParams,
final MimeDescriptor embeddedMessage, final
Collection<MimeDescriptor> parts,
@@ -269,7 +269,7 @@
return transferEncoding;
}
- public Iterator headers() {
+ public Iterator<MessageResult.Header> headers() {
return headers.iterator();
}
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
Fri Jan 23 09:36:35 2009
@@ -32,6 +32,7 @@
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.Header;
import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.mailbox.util.MessageFlags;
import org.apache.james.imap.store.mail.model.MailboxMembership;
@@ -159,7 +160,7 @@
return 0;
}
- public Iterator headers() throws MailboxException {
+ public Iterator<Header> headers() throws MailboxException {
throw exception;
}
@@ -180,12 +181,12 @@
throw exception;
}
- public Iterator iterateHeaders(MimePath path)
+ public Iterator<Header> iterateHeaders(MimePath path)
throws MailboxException {
throw exception;
}
- public Iterator iterateMimeHeaders(MimePath path)
+ public Iterator<Header> iterateMimeHeaders(MimePath path)
throws MailboxException {
throw exception;
}
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
Fri Jan 23 09:36:35 2009
@@ -27,7 +27,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import javax.mail.Flags;
@@ -177,11 +176,9 @@
MailboxMembership message, MessageResultImpl messageResult)
throws MailboxException, IOException,
MimeException {
- Collection partContent = fetchGroup.getPartContentDescriptors();
+ Collection<FetchGroup.PartContentDescriptor> partContent =
fetchGroup.getPartContentDescriptors();
if (partContent != null) {
- for (Iterator it = partContent.iterator(); it.hasNext();) {
- FetchGroup.PartContentDescriptor descriptor =
(FetchGroup.PartContentDescriptor) it
- .next();
+ for (FetchGroup.PartContentDescriptor descriptor: partContent) {
addPartContent(descriptor, message, messageResult);
}
}
Modified:
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
(original)
+++
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Fri Jan 23 09:36:35 2009
@@ -89,12 +89,12 @@
private static List getSortedHeaders(MessageRow messageRow)
throws TorqueException {
- final List headers = messageRow.getMessageHeaders();
- Collections.sort(headers, new Comparator() {
+ final List<MessageHeader> headers = messageRow.getMessageHeaders();
+ Collections.sort(headers, new Comparator<MessageHeader>() {
- public int compare(Object one, Object two) {
- return ((MessageHeader) one).getLineNumber()
- - ((MessageHeader) two).getLineNumber();
+ public int compare(MessageHeader one, MessageHeader two) {
+ return one.getLineNumber()
+ - two.getLineNumber();
}
});
@@ -209,11 +209,9 @@
MessageRow row, MessageResultImpl messageResult)
throws TorqueException, MailboxException, IOException,
MimeException {
- Collection partContent = fetchGroup.getPartContentDescriptors();
+ Collection<FetchGroup.PartContentDescriptor> partContent =
fetchGroup.getPartContentDescriptors();
if (partContent != null) {
- for (Iterator it = partContent.iterator(); it.hasNext();) {
- FetchGroup.PartContentDescriptor descriptor =
(FetchGroup.PartContentDescriptor) it
- .next();
+ for (FetchGroup.PartContentDescriptor descriptor:partContent) {
addPartContent(descriptor, row, messageResult);
}
}
Modified:
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
(original)
+++
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
Fri Jan 23 09:36:35 2009
@@ -191,7 +191,7 @@
private final List languages;
- private final Collection headers;
+ private final Collection<MessageResult.Header> headers;
private final Collection contentTypeParameters;
@@ -270,7 +270,7 @@
return transferEncoding;
}
- public Iterator headers() {
+ public Iterator<MessageResult.Header> headers() {
return headers.iterator();
}
Modified:
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=737109&r1=737108&r2=737109&view=diff
==============================================================================
---
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
(original)
+++
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Fri Jan 23 09:36:35 2009
@@ -33,6 +33,7 @@
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.Header;
import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.mailbox.util.MessageFlags;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
@@ -162,7 +163,7 @@
return 0;
}
- public Iterator headers() throws MailboxException {
+ public Iterator<Header> headers() throws MailboxException {
throw exception;
}
@@ -183,12 +184,12 @@
throw exception;
}
- public Iterator iterateHeaders(MimePath path)
+ public Iterator<Header> iterateHeaders(MimePath path)
throws MailboxException {
throw exception;
}
- public Iterator iterateMimeHeaders(MimePath path)
+ public Iterator<Header> iterateMimeHeaders(MimePath path)
throws MailboxException {
throw exception;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
