X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=1e881cf2abc8b5ef4774601bb4cd37ad24b3a2d0;hb=414ee1b03f7155ccb5049ede303dd01020ddcd94;hp=766f018c770f88a46b539587dbbbfa52c3212587;hpb=629ddb006542df2b671e172d8f544815bbab639b;p=Sone.git

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
--- 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);