X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=90744e722b21a7d555bfe9ba6e2d0d8cd1b389c8;hp=b53e969d6619e4024286cc7fc1569ae6179f5c53;hb=689913e068c06d6cd4bdff17f5da30be2000df6c;hpb=43a21f859e9fec31096c1540148bdd44a8e3702f

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index b53e969..90744e7 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ParserFilter.java - Copyright © 2011 David Roden
+ * Sone - ParserFilter.java - Copyright © 2011–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
@@ -60,10 +60,10 @@ public class ParserFilter implements Filter {
 	private final TemplateContextFactory templateContextFactory;
 
 	/** The template for {@link PlainTextPart}s. */
-	private final Template plainTextTemplate = TemplateParser.parse(new StringReader("<%text|html>"));
+	private static final Template plainTextTemplate = TemplateParser.parse(new StringReader("<%text|html>"));
 
 	/** The template for {@link FreenetLinkPart}s. */
-	private final Template linkTemplate = TemplateParser.parse(new StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"));
+	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"));
 
 	/**
 	 * Creates a new filter that runs its input through a {@link SoneTextParser}
@@ -86,20 +86,16 @@ public class ParserFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
 		String text = String.valueOf(data);
-		int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(parameters.get("length")), -1));
-		int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(parameters.get("cut-off-length")), length));
-		String soneKey = parameters.get("sone");
-		if (soneKey == null) {
-			soneKey = "sone";
-		}
-		Sone sone = (Sone) templateContext.get(soneKey);
-		if (sone == null) {
-			sone = core.getSone(soneKey, false);
+		int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("length"))), -1));
+		int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("cut-off-length"))), length));
+		Object sone = parameters.get("sone");
+		if (sone instanceof String) {
+			sone = core.getSone((String) sone, false);
 		}
 		FreenetRequest request = (FreenetRequest) templateContext.get("request");
-		SoneTextParserContext context = new SoneTextParserContext(request, sone);
+		SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone);
 		StringWriter parsedTextWriter = new StringWriter();
 		try {
 			Iterable<Part> parts = soneTextParser.parse(context, new StringReader(text));