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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  migrate to unified EL everywhere
  
  Revision  Changes    Path
  1.170     +5 -6      jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.169
  retrieving revision 1.170
  diff -u -b -r1.169 -r1.170
  --- Initialization.java	24 Apr 2007 09:30:00 -0000	1.169
  +++ Initialization.java	1 May 2007 16:43:52 -0000	1.170
  @@ -7,6 +7,7 @@
   
   import java.io.IOException;
   import java.io.InputStream;
  +import java.lang.reflect.Constructor;
   import java.net.URL;
   import java.util.ArrayList;
   import java.util.Enumeration;
  @@ -18,7 +19,6 @@
   import java.util.Set;
   import java.util.StringTokenizer;
   import java.util.TreeSet;
  -import java.lang.reflect.Constructor;
   
   import javax.servlet.ServletContext;
   import javax.servlet.http.HttpSession;
  @@ -37,7 +37,6 @@
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
  -import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Jbpm;
  @@ -56,7 +55,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.169 $
  + * @version $Revision: 1.170 $
    */
   public class Initialization
   {
  @@ -821,12 +820,12 @@
         {
            if (factoryDescriptor.isValueBinding())
            {
  -            init.addFactoryValueBinding(factoryDescriptor.getName(), factoryDescriptor.getValue(),
  +            init.addFactoryValueExpression(factoryDescriptor.getName(), factoryDescriptor.getValue(),
                        factoryDescriptor.getScope());
            }
            else
            {
  -            init.addFactoryMethodBinding(factoryDescriptor.getName(),
  +            init.addFactoryMethodExpression(factoryDescriptor.getName(),
                        factoryDescriptor.getMethod(), factoryDescriptor.getScope());
            }
            if (factoryDescriptor.isAutoCreate())
  @@ -839,7 +838,7 @@
         {
            for (String expression: listenerDescriptor.getListenerMethodBindings())
            {
  -            init.addObserverMethodBinding( listenerDescriptor.getType(), Expressions.instance().createMethodBinding(expression) );
  +            init.addObserverMethodExpression( listenerDescriptor.getType(), Expressions.instance().createMethodExpression(expression) );
            }
         }
      }