X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=e245b6a945fb238eb621c087835bb7cc4b945019;hb=0aa389b2493e19484530698e2ce056372dc2a1e9;hp=f3b77e919858e9e79e6ba26303f04d40013e4a40;hpb=4b9052a10d998339deec2f9b567d2913a9442f8b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index f3b77e9..e245b6a 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import static java.util.logging.Logger.getLogger;
 import static net.pterodactylus.util.template.TemplateParser.parse;
 
 import java.io.IOException;
@@ -63,6 +64,7 @@ import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
 import net.pterodactylus.sone.core.event.UpdateFoundEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
@@ -128,7 +130,6 @@ import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.notify.TemplateNotification;
@@ -152,6 +153,7 @@ import net.pterodactylus.util.web.RedirectPage;
 import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.eventbus.Subscribe;
@@ -173,7 +175,7 @@ import freenet.support.api.HTTPRequest;
 public class WebInterface {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(WebInterface.class);
+	private static final Logger logger = getLogger("Sone.Web.Main");
 
 	/** The notification manager. */
 	private final NotificationManager notificationManager = new NotificationManager();
@@ -360,37 +362,16 @@ public class WebInterface {
 		return templateContextFactory;
 	}
 
-	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
 	public Session getCurrentSession(ToadletContext toadletContenxt) {
-		return getCurrentSession(toadletContenxt, true);
+		return getCurrentSession(toadletContenxt, true).get();
 	}
 
-	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session and {@code create} is {@code true}.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if there is no current
-	 *            session, {@code false} otherwise
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	public Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
+	public Optional<Session> getCurrentSession(ToadletContext toadletContenxt, boolean createSession) {
 		Session session = getSessionManager().useSession(toadletContenxt);
-		if (create && (session == null)) {
+		if (createSession && (session == null)) {
 			session = getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 		}
-		return session;
+		return Optional.fromNullable(session);
 	}
 
 	/**
@@ -401,7 +382,7 @@ public class WebInterface {
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	public Sone getCurrentSone(ToadletContext toadletContext) {
+	public Optional<LocalSone> getCurrentSone(ToadletContext toadletContext) {
 		return getCurrentSone(toadletContext, true);
 	}
 
@@ -410,18 +391,18 @@ public class WebInterface {
 	 *
 	 * @param toadletContext
 	 *            The toadlet context
-	 * @param create
+	 * @param createSession
 	 *            {@code true} to create a new session if no session exists,
 	 *            {@code false} to not create a new session
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	public Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
-		Collection<Sone> localSones = getCore().getLocalSones();
+	public Optional<LocalSone> getCurrentSone(ToadletContext toadletContext, boolean createSession) {
+		Collection<LocalSone> localSones = getCore().getLocalSones();
 		if (localSones.size() == 1) {
-			return localSones.iterator().next();
+			return Optional.of(localSones.iterator().next());
 		}
-		return getCurrentSone(getCurrentSession(toadletContext, create));
+		return getCurrentSone(getCurrentSession(toadletContext, createSession));
 	}
 
 	/**
@@ -432,15 +413,15 @@ public class WebInterface {
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	public Sone getCurrentSone(Session session) {
-		if (session == null) {
-			return null;
+	public Optional<LocalSone> getCurrentSone(Optional<Session> session) {
+		if (!session.isPresent()) {
+			return Optional.absent();
 		}
-		String soneId = (String) session.getAttribute("Sone.CurrentSone");
+		String soneId = (String) session.get().getAttribute("Sone.CurrentSone");
 		if (soneId == null) {
-			return null;
+			return Optional.absent();
 		}
-		return getCore().getLocalSone(soneId, false);
+		return getCore().getLocalSone(soneId);
 	}
 
 	/**
@@ -642,6 +623,7 @@ public class WebInterface {
 		Template deleteImageTemplate = parseTemplate("/templates/deleteImage.html");
 		Template noPermissionTemplate = parseTemplate("/templates/noPermission.html");
 		Template emptyImageTitleTemplate = parseTemplate("/templates/emptyImageTitle.html");
+		Template emptyAlbumTitleTemplate = parseTemplate("/templates/emptyAlbumTitle.html");
 		Template optionsTemplate = parseTemplate("/templates/options.html");
 		Template rescueTemplate = parseTemplate("/templates/rescue.html");
 		Template aboutTemplate = parseTemplate("/templates/about.html");
@@ -694,6 +676,7 @@ public class WebInterface {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyImageTitle.html", emptyImageTitleTemplate, "Page.EmptyImageTitle.Title", this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyAlbumTitle.html", emptyAlbumTitleTemplate, "Page.EmptyAlbumTitle.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationPage(emptyTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("invalid.html", invalidTemplate, "Page.Invalid.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage<FreenetRequest>("css/", "/static/css/", "text/css")));