Author: rdonkin
Date: Fri Jul 24 15:14:52 2009
New Revision: 797520
URL: http://svn.apache.org/viewvc?rev=797520&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/Arguments.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Arguments.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Arguments.java?rev=797520&r1=797519&r2=797520&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Arguments.java
(original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Arguments.java Fri
Jul 24 15:14:52 2009
@@ -38,7 +38,7 @@
/**
* A List of the parsed Arguments
*/
- private List fieldArgumentList;
+ private List<Argument> fieldArgumentList;
/**
* The parsed tests
@@ -58,7 +58,7 @@
* @param arguments
* @param testList
*/
- public Arguments(List arguments, TestList testList) {
+ public Arguments(List<Argument> arguments, TestList testList) {
this();
setArgumentList(arguments);
setTestList(testList);
@@ -69,7 +69,7 @@
*
* @return List
*/
- public List getArgumentList() {
+ public List<Argument> getArgumentList() {
return fieldArgumentList;
}
@@ -113,7 +113,7 @@
* @return TestList
*/
protected TestList computeTestList() {
- return new TestList(new ArrayList());
+ return new TestList(new ArrayList<Test>());
}
/**
@@ -122,7 +122,7 @@
* @param arguments
* The arguments to set
*/
- protected void setArgumentList(List arguments) {
+ protected void setArgumentList(List<Argument> arguments) {
fieldArgumentList = arguments;
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java?rev=797520&r1=797519&r2=797520&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
Fri Jul 24 15:14:52 2009
@@ -118,15 +118,18 @@
// Extract Tests and TestList from the children
Iterator childrenIter = children.iterator();
TestList testList = null;
- List argList = new ArrayList(children.size());
+ List<Argument> argList = new ArrayList<Argument>(children.size());
while (childrenIter.hasNext()) {
Object next = childrenIter.next();
if (next instanceof Test)
testList = new TestList((Test) next);
else if (next instanceof TestList)
testList = (TestList) next;
- else
- argList.add(next);
+ else if (next instanceof Argument) {
+ argList.add((Argument)next);
+ } else {
+ context.getLog().error("Expected an 'Argument' but was " +
next);
+ }
}
Arguments arguments = new Arguments(argList, testList);
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java?rev=797520&r1=797519&r2=797520&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java
Fri Jul 24 15:14:52 2009
@@ -44,6 +44,7 @@
Arguments dummyArguments;
SieveContext dummyContext;
+ @SuppressWarnings("unchecked")
protected void setUp() throws Exception {
super.setUp();
mockAdapter = new ScriptCheckMailAdapter();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
