Merge branch 'release-0.5'

[Sone.git] / src / main / java / net / pterodactylus / sone / template / ParserFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index 6099ee7..1e274cc 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -21,12 +21,13 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.util.Map;
 
+import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.text.FreenetLinkParser;
 import net.pterodactylus.sone.text.FreenetLinkParserContext;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Filter;
-import net.pterodactylus.util.template.TemplateFactory;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.template.TemplateContextFactory;
 
 /**
  * Filter that filters a given text through a {@link FreenetLinkParser}.
@@ -35,30 +36,40 @@ import net.pterodactylus.util.template.TemplateFactory;
  */
 public class ParserFilter implements Filter {
 
+       /** The core. */
+       private final Core core;
+
        /** The link parser. */
        private final FreenetLinkParser linkParser;
 
        /**
-        * Creates a new parser filter.
+        * Creates a new filter that runs its input through a
+        * {@link FreenetLinkParser}.
         *
-        * @param templateFactory
-        *            The template factory for the link parser
+        * @param core
+        *            The core
+        * @param templateContextFactory
+        *            The context factory for rendering the parts
         */
-       public ParserFilter(TemplateFactory templateFactory) {
-               this.linkParser = new FreenetLinkParser(templateFactory);
+       public ParserFilter(Core core, TemplateContextFactory templateContextFactory) {
+               this.core = core;
+               linkParser = new FreenetLinkParser(templateContextFactory);
        }
 
        /**
         * {@inheritDoc}
         */
        @Override
-       public Object format(DataProvider dataProvider, Object data, Map<String, String> parameters) {
+       public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
                String text = String.valueOf(data);
                String soneKey = parameters.get("sone");
                if (soneKey == null) {
                        soneKey = "sone";
                }
-               Sone sone = (Sone) dataProvider.get(soneKey);
+               Sone sone = (Sone) templateContext.get(soneKey);
+               if (sone == null) {
+                       sone = core.getSone(soneKey, false);
+               }
                FreenetLinkParserContext context = new FreenetLinkParserContext(sone);
                try {
                        return linkParser.parse(context, new StringReader(text));