Author: rdonkin
Date: Sun Aug 31 09:21:36 2008
New Revision: 690719
URL: http://svn.apache.org/viewvc?rev=690719&view=rev
Log:
Consolidate by removing unneccessary indirection.
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveValidationVisitor.java
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java?rev=690719&r1=690718&r2=690719&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java Sun Aug 31
09:21:36 2008
@@ -32,16 +32,6 @@
* <code>command = identifier arguments ( ";" / block )</code>
*/
public class Command implements Executable {
-
- /**
- * Looks up an executable command with the given name.
- * @param name not null
- * @return <code>ExecutableCommand</code>, not null
- * @throws LookupException if the command is not available
- */
- public static ExecutableCommand lookup(final String name) throws
LookupException {
- return CommandManager.getInstance().newInstance(name);
- }
/** The name of this Command */
private String fieldName;
@@ -172,6 +162,6 @@
private ExecutableCommand getExecutable() throws LookupException {
final String name = getName();
- return lookup(name);
+ return CommandManager.getInstance().newInstance(name);
}
}
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveValidationVisitor.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveValidationVisitor.java?rev=690719&r1=690718&r2=690719&view=diff
==============================================================================
---
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveValidationVisitor.java
(original)
+++
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveValidationVisitor.java
Sun Aug 31 09:21:36 2008
@@ -67,7 +67,7 @@
public Object visit(ASTcommand node, Object data) throws SieveException {
final String name = node.getName();
- Command.lookup(name);
+ CommandManager.getInstance().newInstance(name);
if ("require".equalsIgnoreCase(name)) {
if (requireAllowed) {
isInRequire = true;
@@ -109,7 +109,7 @@
final String quotedName = (String) value;
final String name = quotedName.substring(1,
quotedName.length()-1);
try {
- Command.lookup(name);
+ CommandManager.getInstance().newInstance(name);
} catch (LookupException e) {
//TODO: catching is inefficient, should just check
Test.lookup(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
