Author: rdonkin
Date: Fri Jul 24 15:29:39 2009
New Revision: 797531
URL: http://svn.apache.org/viewvc?rev=797531&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/commands/extensions/Log.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/Reject.java
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java?rev=797531&r1=797530&r2=797531&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java
Fri Jul 24 15:29:39 2009
@@ -22,6 +22,7 @@
import java.util.List;
import java.util.ListIterator;
+import org.apache.jsieve.Argument;
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
import org.apache.jsieve.SieveContext;
@@ -62,14 +63,14 @@
// First MAY be a tag argument of fatal, error, warn, info, debug or
// trace.
// default is info.
- ListIterator argumentsIter =
arguments.getArgumentList().listIterator();
+ final ListIterator<Argument> argumentsIter =
arguments.getArgumentList().listIterator();
boolean stop = false;
// Tag processing
while (!stop && argumentsIter.hasNext()) {
- Object argument = argumentsIter.next();
+ final Argument argument = argumentsIter.next();
if (argument instanceof TagArgument) {
- String tag = ((TagArgument) argument).getTag();
+ final String tag = ((TagArgument) argument).getTag();
// LogLevel?
if (null == logLevel
@@ -90,11 +91,11 @@
// Next MUST be a String
if (argumentsIter.hasNext()) {
- Object argument = argumentsIter.next();
+ final Argument argument = argumentsIter.next();
if (argument instanceof StringListArgument) {
- List strings = ((StringListArgument) argument).getList();
+ List<String> strings = ((StringListArgument)
argument).getList();
if (1 == strings.size())
- message = (String) strings.get(0);
+ message = strings.get(0);
}
}
if (null == message)
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/FileInto.java?rev=797531&r1=797530&r2=797531&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
Fri Jul 24 15:29:39 2009
@@ -58,7 +58,7 @@
*/
protected Object executeBasic(MailAdapter mail, Arguments arguments,
Block block, SieveContext context) throws SieveException {
- String destination = (String) ((StringListArgument) arguments
+ final String destination = ((StringListArgument) arguments
.getArgumentList().get(0)).getList().get(0);
// Only one fileinto per destination allowed, others should be
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/Reject.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/Reject.java?rev=797531&r1=797530&r2=797531&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/Reject.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/optional/Reject.java
Fri Jul 24 15:29:39 2009
@@ -64,7 +64,7 @@
*/
protected Object executeBasic(MailAdapter mail, Arguments arguments,
Block block, SieveContext context) throws SieveException {
- String message = (String) ((StringListArgument) arguments
+ final String message = ((StringListArgument) arguments
.getArgumentList().get(0)).getList().get(0);
mail.addAction(new ActionReject(message));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
