Author: rdonkin
Date: Fri Jul 24 20:25:53 2009
New Revision: 797638
URL: http://svn.apache.org/viewvc?rev=797638&view=rev
Log:
JSIEVE-53 Generification https://issues.apache.org/jira/browse/JSIEVE-53
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/optional/EnvelopeAccessors.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Envelope.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/optional/EnvelopeAccessors.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/optional/EnvelopeAccessors.java?rev=797638&r1=797637&r2=797638&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/optional/EnvelopeAccessors.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/optional/EnvelopeAccessors.java
Fri Jul 24 20:25:53 2009
@@ -37,7 +37,7 @@
* @return List
* @throws SieveMailException
*/
- public List getEnvelope(String name) throws SieveMailException;
+ public List<String> getEnvelope(String name) throws SieveMailException;
/**
* Method getEnvelopeNames answers a List of the names of the envelope
@@ -46,7 +46,7 @@
* @return List
* @throws SieveMailException
*/
- public List getEnvelopeNames() throws SieveMailException;
+ public List<String> getEnvelopeNames() throws SieveMailException;
/**
* <p>
@@ -66,6 +66,6 @@
* @return List
* @throws SieveMailException
*/
- public List getMatchingEnvelope(String name) throws SieveMailException;
+ public List<String> getMatchingEnvelope(String name) throws
SieveMailException;
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Envelope.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Envelope.java?rev=797638&r1=797637&r2=797638&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Envelope.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Envelope.java
Fri Jul 24 20:25:53 2009
@@ -19,7 +19,6 @@
package org.apache.jsieve.tests.optional;
-import java.util.Iterator;
import java.util.List;
import org.apache.jsieve.SieveContext;
@@ -43,11 +42,7 @@
super();
}
- /**
- * @see org.apache.jsieve.tests.Address#getMatchingValues(MailAdapter,
- * String)
- */
- protected List getMatchingValues(MailAdapter mail, String valueName)
+ protected List<String> getMatchingValues(MailAdapter mail, String
valueName)
throws SieveMailException {
return ((EnvelopeAccessors) mail).getMatchingEnvelope(valueName);
}
@@ -108,12 +103,13 @@
protected boolean match(MailAdapter mail, String addressPart,
String comparator, String matchType, String headerName, String key,
SieveContext context) throws SieveException {
- Iterator headerValuesIter = getMatchingValues(mail, headerName)
- .iterator();
+ final List<String> headerValues = getMatchingValues(mail, headerName);
boolean isMatched = false;
- while (!isMatched && headerValuesIter.hasNext()) {
- isMatched = match(addressPart, comparator, matchType,
- ((String) headerValuesIter.next()), key, context);
+ for (final String value:headerValues) {
+ isMatched = match(addressPart, comparator, matchType, value, key,
context);
+ if (isMatched) {
+ break;
+ }
}
return isMatched;
}
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java?rev=797638&r1=797637&r2=797638&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
Fri Jul 24 20:25:53 2009
@@ -68,8 +68,8 @@
*
* @return Map
*/
- protected Map getEnvelopes() {
- Map envelopes = new HashMap(2);
+ protected Map<String, String> getEnvelopes() {
+ Map<String, String> envelopes = new HashMap<String, String>(2);
if (null != getEnvelopeFrom())
envelopes.put("From", getEnvelopeFrom());
if (null != getEnvelopeTo())
@@ -80,9 +80,9 @@
/**
* @see
org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelope(String)
*/
- public List getEnvelope(String name) throws SieveMailException {
- List values = new ArrayList(1);
- Object value = getEnvelopes().get(name);
+ public List<String> getEnvelope(String name) throws SieveMailException {
+ List<String> values = new ArrayList<String>(1);
+ String value = getEnvelopes().get(name);
if (null != value)
values.add(value);
return values;
@@ -91,16 +91,16 @@
/**
* @see
org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelopeNames()
*/
- public List getEnvelopeNames() throws SieveMailException {
- return new ArrayList(getEnvelopes().keySet());
+ public List<String> getEnvelopeNames() throws SieveMailException {
+ return new ArrayList<String>(getEnvelopes().keySet());
}
/**
* @see
org.apache.jsieve.mail.optional.EnvelopeAccessors#getMatchingEnvelope(String)
*/
- public List getMatchingEnvelope(String name) throws SieveMailException {
+ public List<String> getMatchingEnvelope(String name) throws
SieveMailException {
Iterator envelopeNamesIter = getEnvelopeNames().iterator();
- List matchedEnvelopeValues = new ArrayList(32);
+ List<String> matchedEnvelopeValues = new ArrayList<String>(32);
while (envelopeNamesIter.hasNext()) {
String envelopeName = (String) envelopeNamesIter.next();
if (envelopeName.trim().equalsIgnoreCase(name))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
