[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/05/04 01:58:23

  Modified:    src/main/org/jboss/seam/core  Expressions.java
  Log:
  JBSEAM-1079
  
  Revision  Changes    Path
  1.24      +5 -2      jboss-seam/src/main/org/jboss/seam/core/Expressions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Expressions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Expressions.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- Expressions.java	1 May 2007 16:43:51 -0000	1.23
  +++ Expressions.java	4 May 2007 05:58:23 -0000	1.24
  @@ -1,4 +1,4 @@
  -//$Id: Expressions.java,v 1.23 2007/05/01 16:43:51 gavin Exp $
  +//$Id: Expressions.java,v 1.24 2007/05/04 05:58:23 sbryzak2 Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -14,6 +14,7 @@
   
   import org.hibernate.validator.ClassValidator;
   import org.hibernate.validator.InvalidValue;
  +import org.jboss.el.lang.EvaluationContext;
   import org.jboss.seam.Component;
   import org.jboss.seam.Model;
   import org.jboss.seam.ScopeType;
  @@ -21,6 +22,7 @@
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  +import org.jboss.seam.jsf.SeamELFunctionMapper;
   
   /**
    * Factory for method and value bindings
  @@ -44,7 +46,8 @@
      public ELContext getELContext()
      {
         FacesContext facesContext = FacesContext.getCurrentInstance();
  -      return facesContext==null ? EL_CONTEXT : facesContext.getELContext();
  +      return facesContext==null ? EL_CONTEXT : new EvaluationContext(facesContext.getELContext(),
  +               new SeamELFunctionMapper(), facesContext.getELContext().getVariableMapper());
      }
      
      public ValueExpression<Object> createValueExpression(String expression)