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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/framework   Home.java Query.java
  Log:
  migrate to unified EL everywhere
  
  Revision  Changes    Path
  1.21      +4 -4      jboss-seam/src/main/org/jboss/seam/framework/Home.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Home.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Home.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- Home.java	8 Mar 2007 13:14:58 -0000	1.20
  +++ Home.java	1 May 2007 16:43:51 -0000	1.21
  @@ -9,7 +9,7 @@
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Transactional;
  -import org.jboss.seam.core.Expressions.ValueBinding;
  +import org.jboss.seam.core.Expressions.ValueExpression;
   
   /**
    * Base class for components which provide persistence
  @@ -29,7 +29,7 @@
      private Object id;
      protected E instance;
      private Class<E> entityClass;
  -   protected ValueBinding newInstance;
  +   protected ValueExpression newInstance;
   
      private String deletedMessage = "Successfully deleted";
      private String createdMessage = "Successfully created";
  @@ -174,12 +174,12 @@
         this.instance = instance;
      }
   
  -   public ValueBinding getNewInstance()
  +   public ValueExpression getNewInstance()
      {
         return newInstance;
      }
   
  -   public void setNewInstance(ValueBinding newInstance)
  +   public void setNewInstance(ValueExpression newInstance)
      {
         this.newInstance = newInstance;
      }
  
  
  
  1.26      +8 -8      jboss-seam/src/main/org/jboss/seam/framework/Query.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Query.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Query.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- Query.java	15 Apr 2007 17:41:23 -0000	1.25
  +++ Query.java	1 May 2007 16:43:51 -0000	1.26
  @@ -9,7 +9,7 @@
   
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Transactional;
  -import org.jboss.seam.core.Expressions.ValueBinding;
  +import org.jboss.seam.core.Expressions.ValueExpression;
   import org.jboss.seam.jsf.JsfProvider;
   import org.jboss.seam.persistence.QueryParser;
   
  @@ -39,9 +39,9 @@
      private DataModel dataModel;
      
      private String parsedEjbql;
  -   private List<ValueBinding> queryParameters;
  +   private List<ValueExpression> queryParameters;
      private List<String> parsedRestrictions;
  -   private List<ValueBinding> restrictionParameters;
  +   private List<ValueExpression> restrictionParameters;
      
      private List<Object> queryParameterValues;
      private List<Object> restrictionParameterValues;
  @@ -136,7 +136,7 @@
            
            List<String> restrictionFragments = getRestrictions();
            parsedRestrictions = new ArrayList<String>( restrictionFragments.size() );
  -         restrictionParameters = new ArrayList<ValueBinding>( restrictionFragments.size() );         
  +         restrictionParameters = new ArrayList<ValueExpression>( restrictionFragments.size() );         
            for ( String restriction: restrictionFragments )
            {
               QueryParser rqp = new QueryParser( restriction, queryParameters.size() + restrictionParameters.size() );            
  @@ -262,17 +262,17 @@
         this.order = order;
      }
      
  -   protected List<ValueBinding> getQueryParameters()
  +   protected List<ValueExpression> getQueryParameters()
      {
         return queryParameters;
      }
      
  -   protected List<ValueBinding> getRestrictionParameters()
  +   protected List<ValueExpression> getRestrictionParameters()
      {
         return restrictionParameters;
      }
      
  -   private static boolean isAnyParameterDirty(List<ValueBinding> valueBindings, List<Object> lastParameterValues)
  +   private static boolean isAnyParameterDirty(List<ValueExpression> valueBindings, List<Object> lastParameterValues)
      {
         if (lastParameterValues==null) return true;
         for (int i=0; i<valueBindings.size(); i++)
  @@ -287,7 +287,7 @@
         return false;
      }
      
  -   private static List<Object> getParameterValues(List<ValueBinding> valueBindings)
  +   private static List<Object> getParameterValues(List<ValueExpression> valueBindings)
      {
         List<Object> values = new ArrayList<Object>( valueBindings.size() );
         for (int i=0; i<valueBindings.size(); i++)