Author: rdonkin
Date: Fri Jul 24 15:47:24 2009
New Revision: 797543
URL: http://svn.apache.org/viewvc?rev=797543&view=rev
Log:
JSIEVE-53 Generify https://issues.apache.org/jira/browse/JSIEVE-53
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Body.java
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java?rev=797543&r1=797542&r2=797543&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java
(original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java Fri
Jul 24 15:47:24 2009
@@ -21,6 +21,7 @@
import java.util.ListIterator;
+import org.apache.jsieve.Argument;
import org.apache.jsieve.Arguments;
import org.apache.jsieve.NumberArgument;
import org.apache.jsieve.SieveContext;
@@ -56,13 +57,13 @@
SieveContext context) throws SyntaxException, SieveMailException {
String comparator = null;
Integer size = null;
- ListIterator argumentsIter =
arguments.getArgumentList().listIterator();
+ ListIterator<Argument> argumentsIter =
arguments.getArgumentList().listIterator();
// First argument MUST be a tag of ":under" or ":over"
if (argumentsIter.hasNext()) {
- Object argument = argumentsIter.next();
+ Argument argument = argumentsIter.next();
if (argument instanceof TagArgument) {
- String tag = ((TagArgument) argument).getTag();
+ final String tag = ((TagArgument) argument).getTag();
if (tag.equals(":under") || tag.equals(":over"))
comparator = tag;
else
@@ -75,7 +76,7 @@
// Second argument MUST be a number
if (argumentsIter.hasNext()) {
- Object argument = argumentsIter.next();
+ final Argument argument = argumentsIter.next();
if (argument instanceof NumberArgument)
size = ((NumberArgument) argument).getInteger();
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Body.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Body.java?rev=797543&r1=797542&r2=797543&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Body.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/optional/Body.java
Fri Jul 24 15:47:24 2009
@@ -20,8 +20,8 @@
package org.apache.jsieve.tests.optional;
import java.util.List;
-import java.util.ListIterator;
+import org.apache.jsieve.Argument;
import org.apache.jsieve.Arguments;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.StringListArgument;
@@ -48,7 +48,7 @@
protected void validateArguments(Arguments args, SieveContext ctx)
throws SieveException {
- List arglist = args.getArgumentList();
+ final List<Argument> arglist = args.getArgumentList();
if (arglist.size() != 2) {
throw new SyntaxException(
"Currently body-test can only two arguments");
@@ -56,7 +56,7 @@
// FIXME: As this is a limited implementation force the use of
// ':contains'.
- Object arg = arglist.get(0);
+ Argument arg = arglist.get(0);
if (!(arg instanceof TagArgument)) {
throw new SyntaxException("Body expects a :contains tag");
}
@@ -84,9 +84,7 @@
}
// Compare each test string with body, ignoring case
- ListIterator iter = strings.getList().listIterator();
- while (iter.hasNext()) {
- String phrase = (String) iter.next();
+ for (final String phrase:strings.getList()) {
if (mail.isInBodyText(phrase)) {
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
