Author: rdonkin
Date: Fri Jul 24 15:19:31 2009
New Revision: 797523
URL: http://svn.apache.org/viewvc?rev=797523&view=rev
Log:
JSIEVE-53 Generify Argument https://issues.apache.org/jira/browse/JSIEVE-53
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Redirect.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java?rev=797523&r1=797522&r2=797523&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
Fri Jul 24 15:19:31 2009
@@ -21,6 +21,7 @@
import java.util.List;
+import org.apache.jsieve.Argument;
import org.apache.jsieve.Arguments;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.StringListArgument;
@@ -85,12 +86,12 @@
*/
protected void validateSingleStringArguments(Arguments arguments,
SieveContext context) throws SieveException {
- List args = arguments.getArgumentList();
+ List<Argument> args = arguments.getArgumentList();
if (args.size() != 1)
throw context.getCoordinate().syntaxException(
"Exactly 1 argument permitted. Found " + args.size());
- Object argument = args.get(0);
+ Argument argument = args.get(0);
if (!(argument instanceof StringListArgument))
throw context.getCoordinate().syntaxException(
"Expecting a string-list");
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Redirect.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Redirect.java?rev=797523&r1=797522&r2=797523&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Redirect.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Redirect.java
Fri Jul 24 15:19:31 2009
@@ -54,7 +54,7 @@
*/
protected Object executeBasic(MailAdapter mail, Arguments arguments,
Block block, SieveContext context) throws SieveException {
- String recipient = (String) ((StringListArgument) arguments
+ String recipient = ((StringListArgument) arguments
.getArgumentList().get(0)).getList().get(0);
mail.addAction(new ActionRedirect(recipient));
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java?rev=797523&r1=797522&r2=797523&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java
Fri Jul 24 15:19:31 2009
@@ -22,6 +22,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.jsieve.Argument;
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
import org.apache.jsieve.SieveContext;
@@ -125,12 +126,12 @@
*/
protected void validateArguments(Arguments arguments, SieveContext context)
throws SieveException {
- List args = arguments.getArgumentList();
+ List<Argument> args = arguments.getArgumentList();
if (args.size() != 1)
throw context.getCoordinate().syntaxException(
"Exactly 1 argument permitted. Found " + args.size());
- Object argument = args.get(0);
+ Argument argument = args.get(0);
if (!(argument instanceof StringListArgument))
throw context.getCoordinate().syntaxException(
"Expecting a string-list");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
