From 6a0e6027293a06d33a73c914a498c6a93c88f9c0 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Tue, 4 Mar 2008 23:11:22 +0000 Subject: [PATCH] polish --- ...LResolver.java => ActionMethodELResolver.java} | 15 +++++++++++---- .../expression/el/WebFlowELExpressionParser.java | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) rename spring-webflow/src/main/java/org/springframework/webflow/expression/el/{ActionExecutingELResolver.java => ActionMethodELResolver.java} (73%) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionExecutingELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java similarity index 73% rename from spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionExecutingELResolver.java rename to spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java index 2989bc68..14ec6042 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionExecutingELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java @@ -9,7 +9,14 @@ import javax.el.PropertyNotWritableException; import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.execution.Action; -public class ActionExecutingELResolver extends ELResolver { +/** + * Resolves the method to invoke on a resolved Web Flow Action instance. The resolved Action is usually a + * {@link org.springframework.webflow.action.MultiAction}. Returns an AnnotatedAction wrapper around the target Action + * configured with the appropriate method dispatching rules. + * + * @author Keith Donald + */ +public class ActionMethodELResolver extends ELResolver { public Class getCommonPropertyType(ELContext elContext, Object base) { return Action.class; @@ -32,9 +39,9 @@ public class ActionExecutingELResolver extends ELResolver { if (base instanceof Action) { Action action = (Action) base; elContext.setPropertyResolved(true); - AnnotatedAction decorator = new AnnotatedAction(action); - decorator.setMethod((String) property); - return decorator; + AnnotatedAction annotated = new AnnotatedAction(action); + annotated.setMethod(property.toString()); + return annotated; } else { return null; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/WebFlowELExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/WebFlowELExpressionParser.java index 940c365b..dade2a40 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/WebFlowELExpressionParser.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/WebFlowELExpressionParser.java @@ -45,7 +45,7 @@ public class WebFlowELExpressionParser extends ELExpressionParser { List customResolvers = new ArrayList(); customResolvers.add(new RequestContextELResolver()); customResolvers.add(new SpringBeanWebFlowELResolver()); - customResolvers.add(new ActionExecutingELResolver()); + customResolvers.add(new ActionMethodELResolver()); customResolvers.add(new ScopeSearchingELResolver()); ELResolver resolver = new DefaultELResolver(target, customResolvers); return new WebFlowELContext(resolver);