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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/persistence  
                        HibernatePersistenceProvider.java QueryParser.java
  Log:
  migrate to unified EL everywhere
  
  Revision  Changes    Path
  1.8       +2 -2      jboss-seam/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernatePersistenceProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- HibernatePersistenceProvider.java	8 Mar 2007 07:48:20 -0000	1.7
  +++ HibernatePersistenceProvider.java	1 May 2007 16:43:52 -0000	1.8
  @@ -17,7 +17,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.core.Filter;
   import org.jboss.seam.core.ManagedPersistenceContext;
  -import org.jboss.seam.core.Expressions.ValueBinding;
  +import org.jboss.seam.core.Expressions.ValueExpression;
   
   /**
    * Support for non-standardized features of Hibernate, when
  @@ -55,7 +55,7 @@
      public void enableFilter(Filter f, EntityManager entityManager)
      {
         org.hibernate.Filter filter = getSession(entityManager).enableFilter( f.getName() );
  -      for ( Map.Entry<String, ValueBinding> me: f.getParameters().entrySet() )
  +      for ( Map.Entry<String, ValueExpression> me: f.getParameters().entrySet() )
         {
            filter.setParameter( me.getKey(), me.getValue().getValue() );
         }
  
  
  
  1.2       +4 -4      jboss-seam/src/main/org/jboss/seam/persistence/QueryParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: QueryParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/QueryParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- QueryParser.java	26 Feb 2007 19:24:50 -0000	1.1
  +++ QueryParser.java	1 May 2007 16:43:52 -0000	1.2
  @@ -4,13 +4,13 @@
   import java.util.List;
   import java.util.StringTokenizer;
   
  -import org.jboss.seam.core.Expressions.ValueBinding;
  +import org.jboss.seam.core.Expressions.ValueExpression;
   
   import org.jboss.seam.core.Expressions;
   
   public class QueryParser
   {
  -   private List<ValueBinding> parameterValueBindings = new ArrayList<ValueBinding>();
  +   private List<ValueExpression> parameterValueBindings = new ArrayList<ValueExpression>();
      private StringBuilder ejbqlBuilder;
      
      public static String getParameterName(int loc)
  @@ -23,7 +23,7 @@
         return ejbqlBuilder.toString();
      }
      
  -   public List<ValueBinding> getParameterValueBindings()
  +   public List<ValueExpression> getParameterValueBindings()
      {
         return parameterValueBindings;
      }
  @@ -57,7 +57,7 @@
               }
               String expression = token + expressionToken + tokens.nextToken();
               ejbqlBuilder.append(':').append( getParameterName( startingParameterNumber + parameterValueBindings.size() ) );
  -            parameterValueBindings.add( Expressions.instance().createValueBinding(expression) );
  +            parameterValueBindings.add( Expressions.instance().createValueExpression(expression) );
            }
            else
            {