X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FLockSoneAjaxPage.java;h=20490f122dc8978d3be1c8b5f8c00c74816c3302;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=bca9a3551d2d2b11c8780b25b2e1ebce932c160e;hpb=f4ea1e1b3526175e255831c975d6eea813589f25;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 bca9a35..20490f1 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
@@ -20,7 +20,9 @@ package net.pterodactylus.sone.web.ajax;
 import net.pterodactylus.sone.core.Core;
 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}.
@@ -39,23 +41,17 @@ public class LockSoneAjaxPage extends JsonPage {
 		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<Sone> 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;