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

[Gavin King]

  User: gavin   
  Date: 07/05/21 13:31:00

  Modified:    src/main/org/jboss/seam/framework  Query.java
  Log:
  JBSEAM-1055
  
  Revision  Changes    Path
  1.31      +11 -12    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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- Query.java	19 May 2007 15:51:44 -0000	1.30
  +++ Query.java	21 May 2007 17:31:00 -0000	1.31
  @@ -84,9 +84,10 @@
         clearDataModel();
      }
      
  +   @Transactional
      public void last()
      {
  -      setFirstResult( (int) getLastFirstResult() );
  +      setFirstResult( getLastFirstResult().intValue() );
      }
      
      public void next()
  @@ -110,26 +111,24 @@
      }
   
      @Transactional
  -   public long getLastFirstResult()
  +   public Long getLastFirstResult()
      {
  -      return ( getResultCount() / getMaxResults() ) * getMaxResults();
  +      Integer pc = getPageCount();
  +      return pc==null ? null : ( pc.longValue()-1 ) * getMaxResults();
      }
      
      public int getNextFirstResult()
      {
  -      return ( getFirstResult()==null ? 0 : getFirstResult() ) + getMaxResults();
  +      Integer fr = getFirstResult();
  +      return ( fr==null ? 0 : fr ) + getMaxResults();
      }
   
      public int getPreviousFirstResult()
      {
  -      if ( getMaxResults() > ( getFirstResult()==null ? 0 : getFirstResult() ) ) 
  -      {
  -         return 0;
  -      }
  -      else
  -      {
  -         return getFirstResult() - getMaxResults();
  -      }
  +      Integer fr = getFirstResult();
  +      Integer mr = getMaxResults();
  +      return mr >= ( fr==null ? 0 : fr ) ? 
  +               0 : fr - mr;
      }
      
      @Transactional