Author: rdonkin
Date: Sun Jan 4 01:55:11 2009
New Revision: 731214
URL: http://svn.apache.org/viewvc?rev=731214&view=rev
Log:
Convert to Java 1.5
Modified:
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/message/FetchData.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/NoopProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/EnvelopeBuilder.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.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
Modified:
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/message/FetchData.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/message/FetchData.java?rev=731214&r1=731213&r2=731214&view=diff
==============================================================================
---
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/message/FetchData.java
(original)
+++
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/message/FetchData.java
Sun Jan 4 01:55:11 2009
@@ -39,9 +39,9 @@
private boolean setSeen = false;
- private Set bodyElements = new HashSet();
+ private Set<BodyFetchElement> bodyElements = new
HashSet<BodyFetchElement>();
- public Collection getBodyElements() {
+ public Collection<BodyFetchElement> getBodyElements() {
return bodyElements;
}
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java?rev=731214&r1=731213&r2=731214&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
Sun Jan 4 01:55:11 2009
@@ -336,7 +336,7 @@
subscriber.subscribe(user, mailbox);
}
- public Collection subscriptions(String user) throws SubscriptionException {
+ public Collection<String> subscriptions(String user) throws
SubscriptionException {
return subscriber.subscriptions(user);
}
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java?rev=731214&r1=731213&r2=731214&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
Sun Jan 4 01:55:11 2009
@@ -190,5 +190,5 @@
* the user name, not null
* @return a <code>Collection<String></code> of mailbox names
*/
- public Collection subscriptions(String user) throws SubscriptionException;
+ public Collection<String> subscriptions(String user) throws
SubscriptionException;
}
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java?rev=731214&r1=731213&r2=731214&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
Sun Jan 4 01:55:11 2009
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapConstants;
@@ -91,12 +90,11 @@
throws SubscriptionException, MailboxException {
final String userName = ImapSessionUtils.getUserName(session);
final MailboxManager manager = getMailboxManager();
- final Collection mailboxes = manager.subscriptions(userName);
+ final Collection<String> mailboxes = manager.subscriptions(userName);
final MailboxExpression expression = new MailboxExpression(
referenceName, mailboxPattern, '*', '%');
- final Collection mailboxResponses = new ArrayList();
- for (final Iterator it = mailboxes.iterator(); it.hasNext();) {
- final String mailboxName = (String) it.next();
+ final Collection<String> mailboxResponses = new ArrayList<String>();
+ for (final String mailboxName: mailboxes) {
respond(responder, expression, mailboxName, true, mailboxes,
mailboxResponses);
}
@@ -104,8 +102,8 @@
private void respond(Responder responder,
final MailboxExpression expression, final String mailboxName,
- final boolean originalSubscription, final Collection mailboxes,
- final Collection mailboxResponses) {
+ final boolean originalSubscription, final Collection<String>
mailboxes,
+ final Collection<String> mailboxResponses) {
if (expression.isExpressionMatch(mailboxName,
ImapConstants.HIERARCHY_DELIMITER_CHAR)) {
if (!mailboxResponses.contains(mailboxName)) {
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/NoopProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/NoopProcessor.java?rev=731214&r1=731213&r2=731214&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/NoopProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/NoopProcessor.java
Sun Jan 4 01:55:11 2009
@@ -41,10 +41,7 @@
protected void doProcess(ImapRequest message, ImapSession session,
String tag, ImapCommand command, Responder responder) {
- final NoopRequest request = (NoopRequest) message;
- // TODO: untagged responses?
- // TODO: NOOP is used to check for new mail: need to return untagged
- // responses
+ // So, unsolicated responses are returned to check for new mail
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
}
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/EnvelopeBuilder.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/EnvelopeBuilder.java?rev=731214&r1=731213&r2=731214&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/EnvelopeBuilder.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/EnvelopeBuilder.java
Sun Jan 4 01:55:11 2009
@@ -125,7 +125,7 @@
} else {
final AddressList addressList = AddressList.parse(value);
final int size = addressList.size();
- final List addresses = new ArrayList(size);
+ final List<FetchResponse.Envelope.Address> addresses = new
ArrayList<FetchResponse.Envelope.Address>(size);
for (int i = 0; i < size; i++) {
final Address address = addressList.get(i);
if (address instanceof Group) {
@@ -172,7 +172,7 @@
return result;
}
- private void addAddresses(final Group group, final List addresses) {
+ private void addAddresses(final Group group, final
List<FetchResponse.Envelope.Address> addresses) {
final String groupName = group.getName();
final FetchResponse.Envelope.Address start = startGroup(groupName);
addresses.add(start);
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=731214&r1=731213&r2=731214&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
Sun Jan 4 01:55:11 2009
@@ -72,7 +72,7 @@
Mailbox mailbox = getSelectedMailbox(session);
for (int i = 0; i < idSet.length; i++) {
final FetchResponseBuilder builder = new FetchResponseBuilder(
- getLog(), new EnvelopeBuilder(getLog()));
+ new EnvelopeBuilder(getLog()));
final long highVal;
final long lowVal;
if (useUids) {
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=731214&r1=731213&r2=731214&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
Sun Jan 4 01:55:11 2009
@@ -31,7 +31,6 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
-import org.apache.commons.logging.Log;
import org.apache.james.api.imap.message.BodyFetchElement;
import org.apache.james.api.imap.message.FetchData;
import org.apache.james.api.imap.process.ImapSession;
@@ -49,7 +48,6 @@
import org.apache.james.mime4j.field.address.parser.ParseException;
final class FetchResponseBuilder {
- private final Log logger;
private final EnvelopeBuilder envelopeBuilder;
@@ -63,7 +61,7 @@
private Integer size;
- private List elements;
+ private List<FetchResponse.BodyElement> elements;
private FetchResponse.Envelope envelope;
@@ -71,10 +69,8 @@
private FetchResponse.Structure bodystructure;
- public FetchResponseBuilder(final Log logger,
- final EnvelopeBuilder envelopeBuilder) {
+ public FetchResponseBuilder(final EnvelopeBuilder envelopeBuilder) {
super();
- this.logger = logger;
this.envelopeBuilder = envelopeBuilder;
}
@@ -173,7 +169,7 @@
// BODY part responses.
Collection elements = fetch.getBodyElements();
- this.elements = new ArrayList();
+ this.elements = new ArrayList<FetchResponse.BodyElement>();
for (Iterator iterator = elements.iterator(); iterator.hasNext();) {
BodyFetchElement fetchElement = (BodyFetchElement) iterator.next();
final FetchResponse.BodyElement element = bodyFetch(result,
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=731214&r1=731213&r2=731214&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
Sun Jan 4 01:55:11 2009
@@ -86,10 +86,10 @@
}
}
- private static List createParts(final boolean allowExtensions,
+ private static List<MimeDescriptorStructure> createParts(final boolean
allowExtensions,
final MimeDescriptor descriptor, final EnvelopeBuilder builder)
throws MessagingException, ParseException {
- final List results = new ArrayList();
+ final List<MimeDescriptorStructure> results = new
ArrayList<MimeDescriptorStructure>();
for (Iterator it = descriptor.parts(); it.hasNext();) {
final MimeDescriptor partDescriptor = (MimeDescriptor) it.next();
results.add(new MimeDescriptorStructure(allowExtensions,
@@ -100,7 +100,7 @@
private static String[] createParameters(MimeDescriptor descriptor)
throws MailboxException {
- final List results = new ArrayList();
+ final List<String> results = new ArrayList<String>();
// TODO: consider revising this design
for (Iterator it = descriptor.contentTypeParameters(); it.hasNext();) {
final MessageResult.Header header = (MessageResult.Header) it
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
