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

[Gavin King]

  User: gavin   
  Date: 07/06/01 14:42:43

  Modified:    src/main/org/jboss/seam/util   UnifiedELMethodBinding.java
                        UnifiedELValueBinding.java
  Log:
  minor cleanup
  
  Revision  Changes    Path
  1.4       +4 -7      jboss-seam/src/main/org/jboss/seam/util/UnifiedELMethodBinding.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UnifiedELMethodBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/UnifiedELMethodBinding.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- UnifiedELMethodBinding.java	30 May 2007 00:19:13 -0000	1.3
  +++ UnifiedELMethodBinding.java	1 Jun 2007 18:42:43 -0000	1.4
  @@ -1,8 +1,5 @@
   package org.jboss.seam.util;
   
  -import static org.jboss.seam.el.EL.EL_CONTEXT;
  -import static org.jboss.seam.el.EL.EXPRESSION_FACTORY;
  -
   import javax.el.MethodExpression;
   import javax.faces.context.FacesContext;
   import javax.faces.el.EvaluationException;
  @@ -17,9 +14,9 @@
   
      public UnifiedELMethodBinding() {}
      
  -   public UnifiedELMethodBinding(String expression, Class[] args)
  +   public UnifiedELMethodBinding(MethodExpression me)
      {
  -      me = EXPRESSION_FACTORY.createMethodExpression(EL_CONTEXT, expression, Object.class, args);
  +      this.me = me;
      }
   
      @Override
  @@ -31,13 +28,13 @@
      @Override
      public Class getType(FacesContext ctx) throws MethodNotFoundException
      {
  -      return me.getMethodInfo(EL_CONTEXT).getReturnType();
  +      return me.getMethodInfo( ctx.getELContext() ).getReturnType();
      }
   
      @Override
      public Object invoke(FacesContext ctx, Object[] args) throws EvaluationException, MethodNotFoundException
      {
  -      return me.invoke(EL_CONTEXT, args);
  +      return me.invoke( ctx.getELContext(), args);
      }
   
      @Override
  
  
  
  1.4       +6 -9      jboss-seam/src/main/org/jboss/seam/util/UnifiedELValueBinding.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UnifiedELValueBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/UnifiedELValueBinding.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- UnifiedELValueBinding.java	30 May 2007 00:19:13 -0000	1.3
  +++ UnifiedELValueBinding.java	1 Jun 2007 18:42:43 -0000	1.4
  @@ -1,8 +1,5 @@
   package org.jboss.seam.util;
   
  -import static org.jboss.seam.el.EL.EL_CONTEXT;
  -import static org.jboss.seam.el.EL.EXPRESSION_FACTORY;
  -
   import javax.el.ValueExpression;
   import javax.faces.context.FacesContext;
   import javax.faces.el.EvaluationException;
  @@ -17,9 +14,9 @@
   
      public UnifiedELValueBinding() {}
      
  -   public UnifiedELValueBinding(String expression)
  +   public UnifiedELValueBinding(ValueExpression ve)
      {
  -      ve = EXPRESSION_FACTORY.createValueExpression(EL_CONTEXT, expression, Object.class);
  +      this.ve = ve;
      }
   
      @Override
  @@ -30,22 +27,22 @@
   
      @Override
      public Class getType(FacesContext ctx) throws EvaluationException, PropertyNotFoundException {
  -      return ve.getType(EL_CONTEXT);
  +      return ve.getType( ctx.getELContext() );
      }
   
      @Override
      public Object getValue(FacesContext ctx) throws EvaluationException, PropertyNotFoundException {
  -   	return ve.getValue(EL_CONTEXT);
  +   	return ve.getValue( ctx.getELContext() );
      }
   
      @Override
      public boolean isReadOnly(FacesContext ctx) throws EvaluationException, PropertyNotFoundException {
  -   	return ve.isReadOnly(EL_CONTEXT);
  +   	return ve.isReadOnly( ctx.getELContext() );
      }
   
      @Override
      public void setValue(FacesContext ctx, Object value) throws EvaluationException, PropertyNotFoundException {
  -      ve.setValue(EL_CONTEXT, value);
  +      ve.setValue( ctx.getELContext(), value);
      }
      
      @Override