You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/08/05 12:26:28 UTC
svn commit: r801122 - in
/james/jsieve/trunk/main/src/main/java/org/apache/jsieve:
BaseSieveContext.java Command.java SieveContext.java Test.java
commands/Require.java
Author: rdonkin
Date: Wed Aug 5 10:26:28 2009
New Revision: 801122
URL: http://svn.apache.org/viewvc?rev=801122&view=rev
Log:
JSIEVE-62 Expose managers directly rather than delegate to them https://issues.apache.org/jira/browse/JSIEVE-62
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/BaseSieveContext.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Command.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveContext.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Test.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/BaseSieveContext.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/BaseSieveContext.java?rev=801122&r1=801121&r2=801122&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/BaseSieveContext.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/BaseSieveContext.java Wed Aug 5 10:26:28 2009
@@ -20,8 +20,6 @@
package org.apache.jsieve;
import org.apache.commons.logging.Log;
-import org.apache.jsieve.exception.LookupException;
-import org.apache.jsieve.tests.ExecutableTest;
/**
* Bean based implementation of context.
@@ -59,6 +57,7 @@
*
* @return <code>ScriptCoordinate</code>, not null
*/
+ @Override
public ScriptCoordinate getCoordinate() {
return coordinate;
}
@@ -69,6 +68,7 @@
* @param coordinate
* <code>ScriptCoordinate</code>, not null
*/
+ @Override
public void setCoordinate(ScriptCoordinate coordinate) {
this.coordinate = coordinate;
if (coordinate != null) {
@@ -76,26 +76,34 @@
}
}
+ /**
+ * @see SieveContext#getCommandStateManager()
+ */
+ @Override
public CommandStateManager getCommandStateManager() {
return commandStateManager;
}
+ /**
+ * @see SieveContext#getConditionManager()
+ */
+ @Override
public ConditionManager getConditionManager() {
return conditionManager;
}
+ /**
+ * @see SieveContext#setConditionManager(ConditionManager)
+ */
+ @Override
public void setConditionManager(ConditionManager conditionManager) {
this.conditionManager = conditionManager;
}
- public ExecutableCommand getCommand(String name) throws LookupException {
- return commandManager.getCommand(name);
- }
-
- public ExecutableTest getTest(String name) throws LookupException {
- return testManager.getTest(name);
- }
-
+ /**
+ * @see SieveContext#getLog()
+ */
+ @Override
public Log getLog() {
return log;
}
@@ -107,4 +115,22 @@
public ComparatorManager getComparatorManager() {
return comparatorManager;
}
+
+ /**
+ * @see SieveContext#getCommandManager()
+ */
+ @Override
+ public CommandManager getCommandManager() {
+ return commandManager;
+ }
+
+ /**
+ * @see SieveContext#getTestManager()
+ */
+ @Override
+ public TestManager getTestManager() {
+ return testManager;
+ }
+
+
}
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Command.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Command.java?rev=801122&r1=801121&r2=801122&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Command.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/Command.java Wed Aug 5 10:26:28 2009
@@ -154,7 +154,7 @@
// recursively from the top level block
// so need to use the coordinate recorded from the parse
context.setCoordinate(coordinate);
- final ExecutableCommand executable = context.getCommand(getName());
+ final ExecutableCommand executable = context.getCommandManager().getCommand(getName());
final Object result = executable.execute(mail, getArguments(),
getBlock(), context);
return result;
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveContext.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveContext.java?rev=801122&r1=801121&r2=801122&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveContext.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/SieveContext.java Wed Aug 5 10:26:28 2009
@@ -20,8 +20,6 @@
package org.apache.jsieve;
import org.apache.commons.logging.Log;
-import org.apache.jsieve.exception.LookupException;
-import org.apache.jsieve.tests.ExecutableTest;
/**
* Context for sieve operations.
@@ -62,17 +60,27 @@
*/
public abstract void setConditionManager(final ConditionManager manager);
- // TODO: consider whether API can be consolidated
- public abstract ExecutableCommand getCommand(String name) throws LookupException;
-
+ /**
+ * Gets the command manager.
+ * @return command manager, not null
+ */
+ public abstract CommandManager getCommandManager();
+
/**
* Gets the comparator manager.
* @return not null
*/
public abstract ComparatorManager getComparatorManager();
- // TODO: consider whether API can be consolidated
- public abstract ExecutableTest getTest(String name) throws LookupException;
+ /**
+ * Gets the test manager.
+ * @return test manager, not null
+ */
+ public abstract TestManager getTestManager();
+ /**
+ * Gets the log.
+ * @return log, not null
+ */
public abstract Log getLog();
}
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=801122&r1=801121&r2=801122&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 Wed Aug 5 10:26:28 2009
@@ -62,7 +62,7 @@
log.debug(toString());
}
final String name = getName();
- final ExecutableTest test = context.getTest(name);
+ final ExecutableTest test = context.getTestManager().getTest(name);
return test.execute(mail, getArguments(), context);
}
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=801122&r1=801121&r2=801122&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 Wed Aug 5 10:26:28 2009
@@ -112,7 +112,7 @@
*/
protected void validateCommand(String name, SieveContext context)
throws LookupException {
- context.getCommand(name);
+ context.getCommandManager().getCommand(name);
}
/**
@@ -124,7 +124,7 @@
*/
protected void validateTest(String name, SieveContext context)
throws LookupException {
- context.getTest(name);
+ context.getTestManager().getTest(name);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org