You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2006/12/07 20:19:54 UTC
svn commit: r483616 -
/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractPagerTool.java
Author: nbubna
Date: Thu Dec 7 11:19:53 2006
New Revision: 483616
URL: http://svn.apache.org/viewvc?view=rev&rev=483616
Log:
fix one off problem with getLastIndex() and update javadoc example
Modified:
velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractPagerTool.java
Modified: velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractPagerTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractPagerTool.java?view=diff&rev=483616&r1=483615&r2=483616
==============================================================================
--- velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractPagerTool.java (original)
+++ velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractPagerTool.java Thu Dec 7 11:19:53 2006
@@ -66,19 +66,19 @@
* #end
* <br>
* #if ( $pager.pagesAvailable > 1 )
- * #set( $pagelink = $link.setRelative('pager.vm').addQueryData("find",$!pager.criteria).addQueryData("show",$!pager.itemsPerPage) )
+ * #set( $pagelink = $link.self.param("show",$!pager.itemsPerPage) )
* #if( $pager.prevIndex )
- * <a href="$pagelink.addQueryData('index',$!pager.prevIndex)">Prev</a>
+ * <a href="$pagelink.param('index',$!pager.prevIndex)">Prev</a>
* #end
* #foreach( $index in $pager.slip )
* #if( $index == $pager.index )
* <b>$pager.pageNumber</b>
* #else
- * <a href="$pagelink.addQueryData('index',$!index)">$!pager.getPageNumber($index)</a>
+ * <a href="$pagelink.param('index',$!index)">$!pager.getPageNumber($index)</a>
* #end
* #end
* #if( $pager.nextIndex )
- * <a href="$pagelink.addQueryData('index',$!pager.nextIndex)">Next</a>
+ * <a href="$pagelink.param('index',$!pager.nextIndex)">Next</a>
* #end
* #end
* #else
@@ -311,7 +311,7 @@
{
return null;
}
- return new Integer(Math.min(getTotal() - 1, index + itemsPerPage));
+ return new Integer(Math.min(getTotal() - 1, index + itemsPerPage - 1));
}
/**