projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Override Object.toString() to get a reasonable String representation.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
RequestChangeFilter.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
index
d9c453e
..
fb31719
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
+++ b/
src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
@@
-27,8
+27,8
@@
import java.util.Map;
import java.util.Map.Entry;
import net.pterodactylus.sone.web.page.Page.Request;
import java.util.Map.Entry;
import net.pterodactylus.sone.web.page.Page.Request;
-import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.Filter;
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
/**
* This filter expects a {@link Request} as input and outputs a {@link URI} that
@@
-44,13
+44,17
@@
public class RequestChangeFilter implements Filter {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public Object format(
DataProvider dataProvider
, Object data, Map<String, String> parameters) {
+ public Object format(
TemplateContext templateContext
, Object data, Map<String, String> parameters) {
Request request = (Request) data;
String name = parameters.get("name");
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) {
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");
}
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());
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. */
return u;
} catch (UnsupportedEncodingException uee1) {
/* UTF-8 not supported? I don’t think so. */