X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=1b00d815c774d53e6476d74cc5224df45a9c51b8;hp=766f018c770f88a46b539587dbbbfa52c3212587;hb=58497297d2b9a18cd2877a226870acfe9e8837af;hpb=f71df6b5b23b33abd64551c405316f76eb12d91f diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java index 766f018..1b00d81 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. * @@ -77,9 +77,9 @@ public class ImageBrowserPage extends SoneTemplatePage { } String imageId = request.getHttpRequest().getParam("image", null); if (imageId != null) { - Image image = webInterface.getCore().getImage(imageId, false); + Optional 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);