From e6a6862698024f1e32cbd8de30d0a312728236d4 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Fri, 11 Apr 2008 13:54:42 +0000 Subject: [PATCH] polish --- .../binding/expression/el/DefaultELResolver.java | 10 ++++++++++ .../webflow/JsfManagedBeanAwareELExpressionParser.java | 2 +- .../expression/el/WebFlowELExpressionParser.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java index f48f6524..bec8cffb 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java @@ -27,9 +27,19 @@ public class DefaultELResolver extends CompositeELResolver { private Object target; + /** + * Creates a new default EL resolver for resolving properties of the root object. Assumes a null target and expect + * that the base object has already been resolved by the time this resolver runs. + * @customResolvers the custom resolvers to apply before this resolver + */ + public DefaultELResolver(List customResolvers) { + this(null, customResolvers); + } + /** * Creates a new default EL resolver for resolving properties of the root object. * @param target the target, or "root", object of the expression + * @customResolvers the custom resolvers to apply before this resolver */ public DefaultELResolver(Object target, List customResolvers) { this.target = target; diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java index bde6f56f..e4fed730 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java @@ -59,7 +59,7 @@ public class JsfManagedBeanAwareELExpressionParser extends ELExpressionParser { customResolvers.add(new SpringBeanWebFlowELResolver(context)); customResolvers.add(new ActionMethodELResolver()); customResolvers.add(new JsfManagedBeanResolver()); - ELResolver resolver = new DefaultELResolver(null, customResolvers); + ELResolver resolver = new DefaultELResolver(customResolvers); return new WebFlowELContext(resolver); } } 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 06494a85..575a1e73 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 @@ -60,7 +60,7 @@ public class WebFlowELExpressionParser extends ELExpressionParser { customResolvers.add(new ScopeSearchingELResolver(context)); customResolvers.add(new SpringBeanWebFlowELResolver(context)); customResolvers.add(new ActionMethodELResolver()); - ELResolver resolver = new DefaultELResolver(null, customResolvers); + ELResolver resolver = new DefaultELResolver(customResolvers); return new WebFlowELContext(resolver); } }