Corrected page numbering.

diff --git a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
index a84c8703c03588acd761df6271146e12e513883d..0b9666d900a9fbd67112c783e7cfa976f0ca5af2 100644 (file)
--- a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
+++ b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
@@ -169,7 +169,7 @@ public class AlbumPanel extends Panel {
         RepeatingView pageLinks = new RepeatingView("pageLinks");
         add(pageLinks);
         Album album = getAlbum();
         RepeatingView pageLinks = new RepeatingView("pageLinks");
         add(pageLinks);
         Album album = getAlbum();

-        for (int i = 0; i < album.size() / MAX_ROWS / MAX_COLUMNS; i++) {
+        for (int i = 0; i < (album.size() + MAX_ROWS * MAX_COLUMNS - 1) / MAX_ROWS / MAX_COLUMNS; i++) {

             final int istart = i * MAX_ROWS * MAX_COLUMNS;
             Link pageLink = new Link("pageLink") {
                 {
             final int istart = i * MAX_ROWS * MAX_COLUMNS;
             Link pageLink = new Link("pageLink") {
                 {


@@ -186,7 +186,7 @@ public class AlbumPanel extends Panel {
                     setResponsePage(HomePage.class, pars);
                 }
             };
                     setResponsePage(HomePage.class, pars);
                 }
             };

-            pageLink.add(new Label("label", i + ""));
+            pageLink.add(new Label("label", (i + 1) + ""));

             pageLinks.add(pageLink);
             WebMarkupContainer container = new WebMarkupContainer(pageLinks.newChildId());
             container.add(pageLink);
             pageLinks.add(pageLink);
             WebMarkupContainer container = new WebMarkupContainer(pageLinks.newChildId());
             container.add(pageLink);