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

[Gavin King]

  User: gavin   
  Date: 07/05/19 01:41:00

  Modified:    src/main/org/jboss/seam/framework  Query.java
  Log:
  JBSEAM-1290
  
  Revision  Changes    Path
  1.29      +8 -7      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.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- Query.java	19 May 2007 01:44:18 -0000	1.28
  +++ Query.java	19 May 2007 05:41:00 -0000	1.29
  @@ -77,25 +77,21 @@
      public void last()
      {
         setFirstResult( (int) getLastFirstResult() );
  -      clearDataModel();
      }
      
      public void next()
      {
         setFirstResult( getNextFirstResult() );
  -      clearDataModel();
      }
   
      public void previous()
      {
         setFirstResult( getPreviousFirstResult() );
  -      clearDataModel();
      }
      
      public void first()
      {
         setFirstResult(0);
  -      clearDataModel();
      }
      
      protected void clearDataModel()
  @@ -145,7 +141,7 @@
      
      protected void parseEjbql()
      {
  -      if (parsedEjbql==null)
  +      if (parsedEjbql==null || parsedRestrictions==null)
         {
            QueryParser qp = new QueryParser( getEjbql() );
            queryParameters = qp.getParameterValueBindings();
  @@ -224,6 +220,8 @@
      public void setEjbql(String ejbql)
      {
         this.ejbql = ejbql;
  +      parsedEjbql = null;
  +      refresh();
      }
   
      public Integer getFirstResult()
  @@ -241,7 +239,7 @@
      public void setFirstResult(Integer firstResult)
      {
         this.firstResult = firstResult;
  -      clearDataModel();
  +      refresh();
      }
   
      public Integer getMaxResults()
  @@ -252,7 +250,7 @@
      public void setMaxResults(Integer maxResults)
      {
         this.maxResults = maxResults;
  -      clearDataModel();
  +      refresh();
      }
   
      public List<String> getRestrictions()
  @@ -263,6 +261,8 @@
      public void setRestrictions(List<String> restrictions)
      {
         this.restrictions = restrictions;
  +      parsedRestrictions = null;
  +      refresh();
      }
   
      public String getOrder()
  @@ -273,6 +273,7 @@
      public void setOrder(String order)
      {
         this.order = order;
  +      refresh();
      }
      
      protected List<ValueExpression> getQueryParameters()