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

[Gavin King]

  User: gavin   
  Date: 07/05/01 12:43:51

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  migrate to unified EL everywhere
  
  Revision  Changes    Path
  1.246     +14 -14    jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.245
  retrieving revision 1.246
  diff -u -b -r1.245 -r1.246
  --- Component.java	17 Apr 2007 17:40:45 -0000	1.245
  +++ Component.java	1 May 2007 16:43:50 -0000	1.246
  @@ -89,8 +89,8 @@
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Mutable;
  -import org.jboss.seam.core.Expressions.MethodBinding;
  -import org.jboss.seam.core.Expressions.ValueBinding;
  +import org.jboss.seam.core.Expressions.MethodExpression;
  +import org.jboss.seam.core.Expressions.ValueExpression;
   import org.jboss.seam.databinding.DataBinder;
   import org.jboss.seam.databinding.DataSelector;
   import org.jboss.seam.ejb.SeamInterceptor;
  @@ -1676,8 +1676,8 @@
         else
         {
            Init.FactoryMethod factoryMethod = init.getFactory(name);
  -         Init.FactoryBinding methodBinding = init.getFactoryMethodBinding(name);
  -         Init.FactoryBinding valueBinding = init.getFactoryValueBinding(name);
  +         Init.FactoryExpression methodBinding = init.getFactoryMethodExpression(name);
  +         Init.FactoryExpression valueBinding = init.getFactoryValueExpression(name);
            if ( methodBinding!=null && getOutScope( methodBinding.getScope(), null ).isContextActive() ) //let the XML take precedence
            {
               Object result = methodBinding.getMethodBinding().invoke();
  @@ -1878,7 +1878,7 @@
            {
               log.debug("trying to inject with EL expression: " + name);
            }
  -         result = Expressions.instance().createValueBinding(name).getValue();
  +         result = Expressions.instance().createValueExpression(name).getValue();
         }
         else if ( in.scope()==UNSPECIFIED )
         {
  @@ -2070,17 +2070,17 @@
         public Object getValue(Class type)
         {
            Object value;
  -         if ( type.equals(ValueBinding.class) )
  +         if ( type.equals(ValueExpression.class) )
            {
  -            value = createValueBinding();
  +            value = createValueExpression();
            }
  -         else if ( type.equals(MethodBinding.class) )
  +         else if ( type.equals(MethodExpression.class) )
            {
  -            value = createMethodBinding();
  +            value = createMethodExpression();
            }
            else
            {
  -            value = createValueBinding().getValue();
  +            value = createValueExpression().getValue();
            }
   
            if (converter!=null && value instanceof String)
  @@ -2097,14 +2097,14 @@
            }
         }
   
  -      private ValueBinding createValueBinding()
  +      private ValueExpression createValueExpression()
         {
  -         return Expressions.instance().createValueBinding(expression);
  +         return Expressions.instance().createValueExpression(expression);
         }
   
  -      private MethodBinding createMethodBinding()
  +      private MethodExpression createMethodExpression()
         {
  -         return Expressions.instance().createMethodBinding(expression);
  +         return Expressions.instance().createMethodExpression(expression);
         }
   
         @Override