X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRequestChangeFilter.java;h=3a890218a972e7ad499ffddc7c0c0622dd5b9bfb;hp=fb3171923a67ac94b5d3281a946c74915ceda4c6;hb=0f7a91f4fa689a4084d7db5987a534b4b4fc3866;hpb=33f333b35a73d3d4a4e79f41e9dd7b342db87b1a

diff --git a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
index fb31719..3a89021 100644
--- a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - RequestChangeFilter.java - Copyright © 2010 David Roden
+ * Sone - RequestChangeFilter.java - Copyright © 2010–2012 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
@@ -26,15 +26,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.pterodactylus.sone.web.page.Page.Request;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.TemplateContext;
 
 /**
- * This filter expects a {@link Request} as input and outputs a {@link URI} that
- * is modified by the parameters. The name of the parameter is handed in as
- * “name”, the value may either be stored in “value”, or in a template variable
- * whose key is stored in “key”.
+ * This filter expects a {@link FreenetRequest} as input and outputs a
+ * {@link URI} that is modified by the parameters. The name of the parameter is
+ * handed in as “name”, the new value is stored in “value”.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
@@ -44,24 +43,10 @@ public class RequestChangeFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
-		Request request = (Request) data;
-		String name = parameters.get("name");
-		String nameKey = parameters.get("nameKey");
-		if (nameKey != null) {
-			name = String.valueOf(templateContext.get(nameKey));
-		}
-		String key = parameters.get("key");
-		String value = null;
-		if (key != null) {
-			value = String.valueOf(templateContext.get(key));
-		}
-		if (value == null) {
-			value = parameters.get("value");
-		}
-		if (value == null) {
-			return request.getUri();
-		}
+	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
+		FreenetRequest request = (FreenetRequest) data;
+		String name = String.valueOf(parameters.get("name"));
+		String value = String.valueOf(parameters.get("value"));
 
 		Map<String, String> values = new HashMap<String, String>();
 		Collection<String> parameterNames = request.getHttpRequest().getParameterNames();