Author: bago
Date: Sat May 10 04:50:22 2008
New Revision: 655058
URL: http://svn.apache.org/viewvc?rev=655058&view=rev
Log:
Extracted common validation code (validateSingleStringArguments) to
AbstractActionCommand (thanx to PMD)
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java?rev=655058&r1=655057&r2=655058&view=diff
==============================================================================
---
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
(original)
+++
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractActionCommand.java
Sat May 10 04:50:22 2008
@@ -19,9 +19,14 @@
package org.apache.jsieve.commands;
+import org.apache.jsieve.Arguments;
import org.apache.jsieve.CommandStateManager;
import org.apache.jsieve.SieveContext;
+import org.apache.jsieve.StringListArgument;
import org.apache.jsieve.exception.CommandException;
+import org.apache.jsieve.exception.SieveException;
+
+import java.util.List;
/**
* Abstract class AbstractActionCommand defines the common state validation and
@@ -66,4 +71,24 @@
"Cannot perform Actions on a rejected message.");
}
+ /**
+ * This is an utility method for subclasses
+ *
+ * @see org.apache.jsieve.commands.Redirect
+ * @see org.apache.jsieve.commands.optional.FileInto
+ * @see org.apache.jsieve.commands.optional.Reject
+ */
+ protected void validateSingleStringArguments(Arguments arguments,
SieveContext context) throws SieveException {
+ List args = arguments.getArgumentList();
+ if (args.size() != 1)
+ throw context.getCoordinate().syntaxException("Exactly 1 argument
permitted. Found " + args.size());
+
+ Object argument = args.get(0);
+ if (!(argument instanceof StringListArgument))
+ throw context.getCoordinate().syntaxException("Expecting a
string-list");
+
+ if (1 != ((StringListArgument) argument).getList().size())
+ throw context.getCoordinate().syntaxException("Expecting exactly
one argument");
+ }
+
}
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java?rev=655058&r1=655057&r2=655058&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java
(original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java
Sat May 10 04:50:22 2008
@@ -19,8 +19,6 @@
package org.apache.jsieve.commands;
-import java.util.List;
-
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
import org.apache.jsieve.SieveContext;
@@ -70,19 +68,7 @@
*/
protected void validateArguments(Arguments arguments, SieveContext context)
throws SieveException {
- List args = arguments.getArgumentList();
- if (args.size() != 1)
- throw context.getCoordinate().syntaxException(
- "Exactly 1 argument permitted. Found " + args.size());
-
- Object argument = args.get(0);
- if (!(argument instanceof StringListArgument))
- throw context.getCoordinate().syntaxException(
- "Expecting a string-list");
-
- if (1 != ((StringListArgument) argument).getList().size())
- throw context.getCoordinate().syntaxException(
- "Expecting exactly one argument");
+ validateSingleStringArguments(arguments, context);
}
}
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java?rev=655058&r1=655057&r2=655058&view=diff
==============================================================================
---
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
(original)
+++
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
Sat May 10 04:50:22 2008
@@ -19,7 +19,6 @@
package org.apache.jsieve.commands.optional;
-import java.util.List;
import java.util.ListIterator;
import org.apache.jsieve.Arguments;
@@ -87,19 +86,7 @@
*/
protected void validateArguments(Arguments arguments, SieveContext context)
throws SieveException {
- List args = arguments.getArgumentList();
- if (args.size() != 1)
- throw context.getCoordinate().syntaxException(
- "Exactly 1 argument permitted. Found " + args.size());
-
- Object argument = args.get(0);
- if (!(argument instanceof StringListArgument))
- throw context.getCoordinate().syntaxException(
- "Expecting a string-list");
-
- if (1 != ((StringListArgument) argument).getList().size())
- throw context.getCoordinate().syntaxException(
- "Expecting exactly one argument");
+ validateSingleStringArguments(arguments, context);
}
}
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java?rev=655058&r1=655057&r2=655058&view=diff
==============================================================================
---
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java
(original)
+++
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java
Sat May 10 04:50:22 2008
@@ -19,8 +19,6 @@
package org.apache.jsieve.commands.optional;
-import java.util.List;
-
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
import org.apache.jsieve.CommandStateManager;
@@ -101,19 +99,7 @@
*/
protected void validateArguments(Arguments arguments, SieveContext context)
throws SieveException {
- List args = arguments.getArgumentList();
- if (args.size() != 1)
- throw context.getCoordinate().syntaxException(
- "Exactly 1 argument permitted. Found " + args.size());
-
- Object argument = args.get(0);
- if (!(argument instanceof StringListArgument))
- throw context.getCoordinate().syntaxException(
- "Expecting a string-list");
-
- if (1 != ((StringListArgument) argument).getList().size())
- throw context.getCoordinate().syntaxException(
- "Expecting exactly one argument");
+ validateSingleStringArguments(arguments, context);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
