Author: rdonkin
Date: Fri Jul 24 14:01:10 2009
New Revision: 797462
URL: http://svn.apache.org/viewvc?rev=797462&view=rev
Log:
JSIEVE-53 Avoid casting by factoring out method
https://issues.apache.org/jira/browse/JSIEVE-53
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Test.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/TestList.java
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Test.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Test.java?rev=797462&r1=797461&r2=797462&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Test.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Test.java Fri Jul
24 14:01:10 2009
@@ -20,6 +20,7 @@
package org.apache.jsieve;
import org.apache.commons.logging.Log;
+import org.apache.jsieve.exception.LookupException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.tests.ExecutableTest;
@@ -44,14 +45,25 @@
*/
public Object execute(MailAdapter mail, SieveContext context)
throws SieveException {
+ return new Boolean(isTestPassed(mail, context));
+ }
+
+ /**
+ * Is this test passed for the given mail?
+ * @param mail not null
+ * @param context not null
+ * @return true when the test passes, false otherwise
+ * @throws LookupException
+ * @throws SieveException
+ */
+ public boolean isTestPassed(MailAdapter mail, SieveContext context) throws
LookupException, SieveException {
Log log = context.getLog();
if (log.isDebugEnabled()) {
log.debug(toString());
}
final String name = getName();
final ExecutableTest test = context.getTest(name);
- final boolean result = test.execute(mail, getArguments(), context);
- return new Boolean(result);
+ return test.execute(mail, getArguments(), context);
}
/**
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/TestList.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/TestList.java?rev=797462&r1=797461&r2=797462&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/TestList.java
(original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/TestList.java Fri
Jul 24 14:01:10 2009
@@ -90,7 +90,7 @@
public boolean isTestPassed(MailAdapter mail, SieveContext context) throws
SieveException {
boolean result = true;
for (Test test:getTests()) {
- result = ((Boolean) test.execute(mail, context)).booleanValue();
+ result = test.isTestPassed(mail, context);
if (!result) {
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
