X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUnlockSonePage.java;h=a2be6184ecc8f6526a23dd4124ccc1a46e338a25;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=35d69ff31714b0937343982c968c0b1fdc77da03;hpb=f4ea1e1b3526175e255831c975d6eea813589f25;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
index 35d69ff..a2be618 100644
--- a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - LockSonePage.java - Copyright © 2010 David Roden
+ * Sone - UnlockSonePage.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,8 +18,11 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.util.template.DataProvider;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+
+import com.google.common.base.Optional;
 
 /**
  * This page lets the user unlock a {@link Sone} to allow its insertion.
@@ -44,16 +47,13 @@ public class UnlockSonePage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-		super.processTemplate(request, dataProvider);
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
 		String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
-		Sone sone = webInterface.getCore().getLocalSone(soneId, false);
-		if (sone != null) {
-			webInterface.getCore().unlockSone(sone);
+		Optional<Sone> sone = webInterface.getCore().getLocalSone(soneId);
+		if (sone.isPresent()) {
+			webInterface.getCore().unlockSone(sone.get());
 		}
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		throw new RedirectException(returnPage);