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

[Gavin King]

  User: gavin   
  Date: 07/06/01 15:47:12

  Modified:    src/main/org/jboss/seam/jsf  SeamApplication.java
  Log:
  refactorings and a bug fix
  
  Revision  Changes    Path
  1.14      +5 -5      jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamApplication.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- SeamApplication.java	1 Jun 2007 19:33:17 -0000	1.13
  +++ SeamApplication.java	1 Jun 2007 19:47:12 -0000	1.14
  @@ -29,7 +29,7 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Init;
  -import org.jboss.seam.el.EL;
  +import org.jboss.seam.el.SeamExpressionFactory;
   
   @SuppressWarnings("deprecation")
   public class SeamApplication extends Application
  @@ -123,8 +123,7 @@
      public MethodBinding createMethodBinding(String expression, Class[] params)
            throws ReferenceSyntaxException
      {
  -      //TODO: if ( paramTypes.length==1 && FacesEvent.class.isAssignableFrom( paramTypes[0] ) )
  -      //      return new OptionalParamMethodBinding(expression,params)       
  +      //TODO: proxy this, if we want JBoss EL to be usable     
         return application.createMethodBinding(expression, params);
   
      }
  @@ -147,6 +146,7 @@
      public ValueBinding createValueBinding(String ref)
            throws ReferenceSyntaxException
      {
  +      //TODO: proxy this, if we want JBoss EL to be usable
         return application.createValueBinding(ref);
      }
   
  @@ -323,7 +323,7 @@
      @Override
      public Object evaluateExpressionGet(FacesContext ctx, String expr, Class type) throws ELException
      {
  -      return application.evaluateExpressionGet(ctx, expr, type);
  +      return getExpressionFactory().createValueExpression( ctx.getELContext(), expr, type).getValue( ctx.getELContext() );
      }
   
      @Override
  @@ -336,7 +336,7 @@
      public ExpressionFactory getExpressionFactory()
      {
         //JBoss EL
  -      return EL.EXPRESSION_FACTORY;
  +      return SeamExpressionFactory.INSTANCE;
      }
   
      @Override