Author: rdonkin
Date: Fri Jan 23 10:13:16 2009
New Revision: 737130
URL: http://svn.apache.org/viewvc?rev=737130&view=rev
Log:
Generify
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.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/MimeDescriptorStructure.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
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=737130&r1=737129&r2=737130&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 10:13:16 2009
@@ -400,7 +400,7 @@
*
* @return <code>List</code> of <code>String</code> names
*/
- public List getLanguages();
+ public List<String> getLanguages();
/**
* Gets MIME <code>Content-Disposition</code>.
@@ -415,7 +415,7 @@
*
* @return <code>Content-Disposition</code> values indexed by names
*/
- public Map getDispositionParams();
+ public Map<String,String> getDispositionParams();
/**
* Gets the number of lines of text in a part of type <code>TEXT</code>
@@ -439,7 +439,7 @@
* @return <code>MimeDescriptor</code> <code>Iterator</code> when a
* composite top level MIME media type, null otherwise
*/
- public Iterator parts();
+ public Iterator<MimeDescriptor> parts();
/**
* Gets embedded message.
@@ -461,6 +461,6 @@
*
* @return <code>Header</code> <code>Iterator</code>, not null
*/
- public Iterator contentTypeParameters();
+ public Iterator<Header> contentTypeParameters();
}
}
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=737130&r1=737129&r2=737130&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 10:13:16 2009
@@ -164,24 +164,24 @@
} else {
composer.openParen();
composer.quote(disposition);
- final Map params = structure.getDispositionParams();
+ final Map<String, String> params =
structure.getDispositionParams();
bodyFldParam(params, composer);
composer.closeParen();
}
return composer;
}
- private void bodyFldParam(final Map params,
+ private void bodyFldParam(final Map<String,String> params,
final ImapResponseComposer composer) throws IOException {
if (params == null || params.isEmpty()) {
composer.nil();
} else {
composer.openParen();
- final Set keySet = params.keySet();
- final Collection names = new TreeSet(keySet);
- for (Iterator iter = names.iterator(); iter.hasNext();) {
- final String name = (String) iter.next();
- final String value = (String) params.get(name);
+ final Set<String> keySet = params.keySet();
+ final Collection<String> names = new TreeSet<String>(keySet);
+ for (Iterator<String> iter = names.iterator(); iter.hasNext();) {
+ final String name = iter.next();
+ final String value = params.get(name);
if (value == null) {
final Log logger = getLog();
logger.warn("Disposition parameter name has no value.");
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=737130&r1=737129&r2=737130&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 10:13:16 2009
@@ -230,7 +230,7 @@
* name <code>String</code> or null if <code>BODY</code>
* FETCH or not present
*/
- public Map getDispositionParams();
+ public Map<String, String> getDispositionParams();
/**
* Gets header field-value from <code>Content-Disposition</code>.
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=737130&r1=737129&r2=737130&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 10:13:16 2009
@@ -43,17 +43,17 @@
private final List<String> parameters;
- private final List parts;
+ private final List<Structure> parts;
private final String disposition;
- private final Map dispositionParams;
+ private final Map<String, String> dispositionParams;
private final String location;
private final String md5;
- private final List languages;
+ private final List<String> languages;
private final Structure embeddedMessageStructure;
@@ -85,12 +85,12 @@
}
}
- private static List<MimeDescriptorStructure> createParts(final boolean
allowExtensions,
+ private static List<Structure> createParts(final boolean allowExtensions,
final MimeDescriptor descriptor, final EnvelopeBuilder builder)
throws MessagingException, ParseException {
- final List<MimeDescriptorStructure> results = new
ArrayList<MimeDescriptorStructure>();
- for (Iterator it = descriptor.parts(); it.hasNext();) {
- final MimeDescriptor partDescriptor = (MimeDescriptor) it.next();
+ final List<Structure> results = new ArrayList<Structure>();
+ for (Iterator<MimeDescriptor> it = descriptor.parts(); it.hasNext();) {
+ final MimeDescriptor partDescriptor = it.next();
results.add(new MimeDescriptorStructure(allowExtensions,
partDescriptor, builder));
}
@@ -169,7 +169,7 @@
return embeddedMessageStructure;
}
- public Map getDispositionParams() {
+ public Map<String, String> getDispositionParams() {
return dispositionParams;
}
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=737130&r1=737129&r2=737130&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 10:13:16 2009
@@ -233,7 +233,7 @@
this.md5 = md5;
}
- public Iterator contentTypeParameters() {
+ public Iterator<MessageResult.Header> contentTypeParameters() {
return contentTypeParameters.iterator();
}
@@ -273,7 +273,7 @@
return headers.iterator();
}
- public Iterator parts() {
+ public Iterator<MimeDescriptor> parts() {
return parts.iterator();
}
@@ -281,7 +281,7 @@
parts.add(descriptor);
}
- public List getLanguages() {
+ public List<String> getLanguages() {
return languages;
}
@@ -289,7 +289,7 @@
return disposition;
}
- public Map getDispositionParams() {
+ public Map<String,String> getDispositionParams() {
return dispositionParams;
}
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=737130&r1=737129&r2=737130&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 10:13:16 2009
@@ -193,7 +193,7 @@
private final Collection<MessageResult.Header> headers;
- private final Collection contentTypeParameters;
+ private final Collection<MessageResult.Header> contentTypeParameters;
private final String disposition;
@@ -234,7 +234,7 @@
this.md5 = md5;
}
- public Iterator contentTypeParameters() {
+ public Iterator<MessageResult.Header> contentTypeParameters() {
return contentTypeParameters.iterator();
}
@@ -274,7 +274,7 @@
return headers.iterator();
}
- public Iterator parts() {
+ public Iterator<MimeDescriptor> parts() {
return parts.iterator();
}
@@ -282,7 +282,7 @@
parts.add(descriptor);
}
- public List getLanguages() {
+ public List<String> getLanguages() {
return languages;
}
@@ -290,7 +290,7 @@
return disposition;
}
- public Map getDispositionParams() {
+ public Map<String,String> getDispositionParams() {
return dispositionParams;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
