X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FLockSoneAjaxPage.java;h=516db2d483fe68711d1c52bc78ec3e8723c6eadc;hb=30ef483c663ded175b66b50b652a0497e04bd493;hp=d1a21d3ba8916778cc2c11edd9a3734bb70afe54;hpb=c93070476a62e3db94f175576e3cdabf49db1086;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java
index d1a21d3..516db2d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - LockSoneAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - LockSoneAjaxPage.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
@@ -18,9 +18,12 @@
 package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+
+import com.google.common.base.Optional;
 
 /**
  * Lets the user {@link Core#lockSone(Sone) lock} a {@link Sone}.
@@ -36,21 +39,29 @@ public class LockSoneAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public LockSoneAjaxPage(WebInterface webInterface) {
-		super("ajax/lockSone.ajax", webInterface);
+		super("lockSone.ajax", webInterface);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		Sone sone = webInterface.getCore().getLocalSone(soneId, false);
-		if (sone == null) {
+		Optional<LocalSone> sone = webInterface.getCore().getLocalSone(soneId);
+		if (!sone.isPresent()) {
 			return createErrorJsonObject("invalid-sone-id");
 		}
-		webInterface.getCore().lockSone(sone);
+		webInterface.getCore().lockSone(sone.get());
 		return createSuccessJsonObject();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean requiresLogin() {
+		return false;
+	}
+
 }