Return local Sones from core and web interface.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index 6f43b6f..5934497 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - LoginPage.java - Copyright © 2010 David Roden
+ * Sone - LoginPage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,20 +17,24 @@
 
 package net.pterodactylus.sone.web;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
 import freenet.clients.http.ToadletContext;
 
+import com.google.common.base.Optional;
+
 /**
  * The login page manages logging the user in.
  *
@@ -40,7 +44,7 @@ public class LoginPage extends SoneTemplatePage {
 
        /** The logger. */
        @SuppressWarnings("unused")
-       private static final Logger logger = Logging.getLogger(LoginPage.class);
+       private static final Logger logger = getLogger("Sone.Web.Login");
 
        /**
         * Creates a new login page.
@@ -70,9 +74,9 @@ public class LoginPage extends SoneTemplatePage {
                templateContext.set("sones", localSones);
                if (request.getMethod() == Method.POST) {
                        String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
-                       Sone selectedSone = webInterface.getCore().getLocalSone(soneId, false);
-                       if (selectedSone != null) {
-                               setCurrentSone(request.getToadletContext(), selectedSone);
+                       Optional<LocalSone> selectedSone = webInterface.getCore().getLocalSone(soneId);
+                       if (selectedSone.isPresent()) {
+                               setCurrentSone(request.getToadletContext(), selectedSone.get());
                                String target = request.getHttpRequest().getParam("target");
                                if ((target == null) || (target.length() == 0)) {
                                        target = "index.html";
@@ -89,7 +93,7 @@ public class LoginPage extends SoneTemplatePage {
         */
        @Override
        protected String getRedirectTarget(FreenetRequest request) {
-               if (getCurrentSone(request.getToadletContext(), false) != null) {
+               if (getCurrentSone(request.getToadletContext(), false).isPresent()) {
                        return "index.html";
                }
                return null;
@@ -107,7 +111,7 @@ public class LoginPage extends SoneTemplatePage {
                if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
                        return false;
                }
-               return getCurrentSone(toadletContext, false) == null;
+               return !getCurrentSone(toadletContext, false).isPresent();
        }
 
 }