Working upload of photos (individual and zip)

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

diff --git a/src/main/java/org/wamblee/photos/wicket/HomePage.java b/src/main/java/org/wamblee/photos/wicket/HomePage.java
index 0a55e869c56cac75a824584ac5c073dda930b14e..4a34bc0da750792de94ece9fb53d7a0605f90e0d 100644 (file)
--- a/src/main/java/org/wamblee/photos/wicket/HomePage.java
+++ b/src/main/java/org/wamblee/photos/wicket/HomePage.java
@@ -20,7 +20,6 @@ import java.util.logging.Logger;
 import javax.inject.Inject;
 
 import org.apache.wicket.PageParameters;
-import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
 import org.wamblee.photos.model.Album;
 import org.wamblee.photos.model.Photo;
@@ -66,7 +65,6 @@ public class HomePage extends BasePage {
 
         @Override
         public void onClick() {
-            System.out.println("Entry " + path + " was clicked");
             PageParameters pars = new PageParameters();
             pars.put("path", path);
             setResponsePage(HomePage.class, pars);
@@ -89,8 +87,6 @@ public class HomePage extends BasePage {
             path = "/";
         }
 
-        add(new Label("message", "Hello world!"));
-
         System.out.println("Currently logged in user: " + user);
 
         List<String> usernames = userAdmin.getUsers();
@@ -114,11 +110,9 @@ public class HomePage extends BasePage {
         PhotoEntry current = authorized.getEntry(path);
 
         if (current instanceof Photo) {
-            throw new RuntimeException("Photo entry viewing not yet implemented");
+            add(new PhotoPanel("content", parameters));
+        } else {
+            add(new AlbumPanel("content", parameters));
         }
-
-        Album album = (Album) current;
-
-        add(new AlbumPanel("content", parameters));
     }
 }
\ No newline at end of file