X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=95443c8d916d9114400a13e3caa4f8888f83c801;hb=e14e8aff491d7a04e4e04ed9c38bcae630195655;hp=6f43b6f5d86606d61d7b7cfa7a2e1dca980a30f0;hpb=45f92ec63dbf8134d92ceed67294faa38117b195;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index 6f43b6f..95443c8 100644
--- 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
@@ -29,8 +29,11 @@ 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.
  *
@@ -58,9 +61,6 @@ public class LoginPage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
@@ -70,9 +70,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<Sone> 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";
@@ -84,9 +84,6 @@ public class LoginPage extends SoneTemplatePage {
 		templateContext.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected String getRedirectTarget(FreenetRequest request) {
 		if (getCurrentSone(request.getToadletContext(), false) != null) {
@@ -99,9 +96,6 @@ public class LoginPage extends SoneTemplatePage {
 	// SONETEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public boolean isEnabled(ToadletContext toadletContext) {
 		if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {