projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove hasRecipient method.
[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
4a9548e
..
53c22f2
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@
-22,6
+22,8
@@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
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;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
@@
-77,9
+79,9
@@
public class ImageBrowserPage extends SoneTemplatePage {
}
String soneId = request.getHttpRequest().getParam("sone", null);
if (soneId != null) {
}
String soneId = request.getHttpRequest().getParam("sone", null);
if (soneId != null) {
-
Sone sone = webInterface.getCore().getSone(soneId, false
);
+
Optional<Sone> sone = webInterface.getCore().getSone(soneId
);
templateContext.set("soneRequested", true);
templateContext.set("soneRequested", true);
- templateContext.set("sone", sone);
+ templateContext.set("sone", sone
.orNull()
);
return;
}
String mode = request.getHttpRequest().getParam("mode", null);
return;
}
String mode = request.getHttpRequest().getParam("mode", null);