[seam-commits] Seam SVN: r11608 - branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2009-10-21 07:24:33 -0400 (Wed, 21 Oct 2009)
New Revision: 11608

Modified:
   branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/EL.java
   branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/UnifiedELValueBinding.java
Log:
JBPAPP-2967

Modified: branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/EL.java
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/EL.java	2009-10-21 10:12:32 UTC (rev 11607)
+++ branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/EL.java	2009-10-21 11:24:33 UTC (rev 11608)
@@ -35,7 +35,7 @@
       return resolver;
    }
 
-   private static ELContext createELContext()
+   public static ELContext createELContext()
    {
       return new ELContext()
       {

Modified: branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/UnifiedELValueBinding.java
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/UnifiedELValueBinding.java	2009-10-21 10:12:32 UTC (rev 11607)
+++ branches/enterprise/JBPAPP_4_2_CP01/src/main/org/jboss/seam/util/UnifiedELValueBinding.java	2009-10-21 11:24:33 UTC (rev 11608)
@@ -1,7 +1,6 @@
 package org.jboss.seam.util;
 
-import static org.jboss.seam.util.EL.EL_CONTEXT;
-
+import javax.el.ELContext;
 import javax.el.ValueExpression;
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
@@ -9,14 +8,17 @@
 import javax.faces.el.ValueBinding;
 
 import org.jboss.seam.jsf.SeamExpressionFactory;
+import org.jboss.seam.util.EL;
 
 public class UnifiedELValueBinding extends ValueBinding
 {
    private ValueExpression ve;
+   private ELContext elContext;
 
    public UnifiedELValueBinding(String expression)
    {
-      ve = SeamExpressionFactory.INSTANCE.createValueExpression(EL_CONTEXT, expression, Object.class);
+      elContext = EL.createELContext();
+      ve = SeamExpressionFactory.INSTANCE.createValueExpression(elContext, expression, Object.class);
    }
 
    @Override
@@ -27,22 +29,22 @@
 
    @Override
    public Class getType(FacesContext ctx) throws EvaluationException, PropertyNotFoundException {
-      return ve.getType(EL_CONTEXT);
+      return ve.getType(elContext);
    }
 
    @Override
    public Object getValue(FacesContext ctx) throws EvaluationException, PropertyNotFoundException {
-   	return ve.getValue(EL_CONTEXT);
+   	return ve.getValue(elContext);
    }
 
    @Override
    public boolean isReadOnly(FacesContext ctx) throws EvaluationException, PropertyNotFoundException {
-   	return ve.isReadOnly(EL_CONTEXT);
+   	return ve.isReadOnly(elContext);
    }
 
    @Override
    public void setValue(FacesContext ctx, Object value) throws EvaluationException, PropertyNotFoundException {
-      ve.setValue(EL_CONTEXT, value);
+      ve.setValue(elContext, value);
    }
    
    @Override
@@ -50,4 +52,4 @@
    {
       return ve.getExpressionString();
    }
-}
\ No newline at end of file
+}