X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRequestChangeFilter.java;h=a0d80aff57db85b764ccf1996d8cf605a26e0fd4;hb=b0fbeb0fe2184ba9bc0861f4c4507126760fc9b6;hp=d9c453ee3787e003e3b66d50e3d9e84b89934d33;hpb=8c8acd50782b5d64b2a5a57fe8f9a4c2385203fd;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
index d9c453e..a0d80af 100644
--- a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
@@ -26,15 +26,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import net.pterodactylus.sone.web.page.Page.Request;
-import net.pterodactylus.util.template.DataProvider;
+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 value may either be stored in âvalueâ, or in a
+ * template variable whose key is stored in âkeyâ.
*
* @author David âBombeâ Roden
*/
@@ -44,13 +44,17 @@ public class RequestChangeFilter implements Filter {
* {@inheritDoc}
*/
@Override
- public Object format(DataProvider dataProvider, Object data, Map parameters) {
- Request request = (Request) data;
+ public Object format(TemplateContext templateContext, Object data, Map parameters) {
+ FreenetRequest request = (FreenetRequest) 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(dataProvider.getData(key));
+ value = String.valueOf(templateContext.get(key));
}
if (value == null) {
value = parameters.get("value");
@@ -80,7 +84,6 @@ public class RequestChangeFilter implements Filter {
questionMark = oldUri.length();
}
URI u = new URI(oldUri.substring(0, questionMark) + query.toString());
- System.out.println("u: " + u);
return u;
} catch (UnsupportedEncodingException uee1) {
/* UTF-8 not supported? I donât think so. */