This is an automated email from the ASF dual-hosted git repository. dashorst pushed a commit to branch archive/wicket-1.1.x in repository https://gitbox.apache.org/repos/asf/wicket.git
commit f2c8ba9cb83a2429ac7ad5737e1647030acf4a3e Author: Igor Vaynberg <[email protected]> AuthorDate: Sun Nov 27 18:59:01 2005 +0000 1367650 bug fix where current page number was not trimmed properly git-svn-id: https://svn.apache.org/repos/asf/incubator/wicket/branches/WICKET_1_1@458136 13f79535-47bb-0310-9956-ffa450edef68 --- .../markup/html/repeater/pageable/AbstractPageableView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/pageable/AbstractPageableView.java b/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/pageable/AbstractPageableView.java index 237fb53cfa..6ec43dc246 100644 --- a/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/pageable/AbstractPageableView.java +++ b/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/pageable/AbstractPageableView.java @@ -374,7 +374,7 @@ public abstract class AbstractPageableView extends OrderedRepeatingView implemen * added/deleted between requests */ - if (page > getPageCount()) + if (page >= getPageCount()) { page = Math.max(page - 1, 0); setCurrentPage(page); @@ -389,9 +389,9 @@ public abstract class AbstractPageableView extends OrderedRepeatingView implemen */ public final void setCurrentPage(int page) { - if (page < 0 || page > getPageCount()) + if (page < 0 || page >= getPageCount()) { - throw new IndexOutOfBoundsException("argument [page]="+page+", must be 0<=page<="+getPageCount()); + throw new IndexOutOfBoundsException("argument [page]="+page+", must be 0<=page<"+getPageCount()); } if (currentPage != page) @@ -451,7 +451,7 @@ public abstract class AbstractPageableView extends OrderedRepeatingView implemen // ///////////////////////////////////////////////////////////////////////// /** - * Iterator adapter that makes sure the only the specified max number of + * Iterator adapter that makes sure only the specified max number of * items can be accessed from its delegate. */ private static class CappedIteratorAdapter implements Iterator
