Set Sone of an album in the album builder, use album builder to add albums.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ImageBrowserPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index 766f018..1e881cf 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -27,8 +27,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.google.common.base.Optional;
-
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
@@ -38,6 +36,8 @@ import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
+
 /**
  * The image browser page is the entry page for the image management.
  *
@@ -69,17 +69,17 @@ public class ImageBrowserPage extends SoneTemplatePage {
                super.processTemplate(request, templateContext);
                String albumId = request.getHttpRequest().getParam("album", null);
                if (albumId != null) {
-                       Album album = webInterface.getCore().getAlbum(albumId, false);
+                       Optional<Album> album = webInterface.getCore().getAlbum(albumId);
                        templateContext.set("albumRequested", true);
-                       templateContext.set("album", album);
+                       templateContext.set("album", album.orNull());
                        templateContext.set("page", request.getHttpRequest().getParam("page"));
                        return;
                }
                String imageId = request.getHttpRequest().getParam("image", null);
                if (imageId != null) {
-                       Image image = webInterface.getCore().getImage(imageId, false);
+                       Optional<Image> image = webInterface.getCore().getImage(imageId);
                        templateContext.set("imageRequested", true);
-                       templateContext.set("image", image);
+                       templateContext.set("image", image.orNull());
                        return;
                }
                String soneId = request.getHttpRequest().getParam("sone", null);