Corrected page numbering.

[photos] / src / main / java / org / wamblee / photos / wicket / AlbumPanel.java

diff --git a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
index c351180e68dbb178cd77b9bb12be435bfac53cc1..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();
-        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") {
                 {
@@ -186,7 +186,7 @@ public class AlbumPanel extends Panel {
                     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);
@@ -245,14 +245,12 @@ public class AlbumPanel extends Panel {
         add(row);
 
         // upload panel
-        if (path.equals("/"))
-
-        {
+        if (path.equals("/")) {
             add(new WebMarkupContainer("uploadPanel"));
-        } else
-
-        {
+            add(new WebMarkupContainer("createFolderPanel"));
+        } else {
             add(new UploadPanel("uploadPanel", path));
+            add(new CreateFolderPanel("createFolderPanel", path));
         }
     }