X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=479b3b2b0175173fa917a615331d0c7e103e72c1;hb=c5715384489bab302e209de0313aeb962d774c2e;hp=ac092d8892683e4d7fcf1c44103416573d6e58da;hpb=8ee3de9a7ed7c65b5f695dd60da6e55d94c1125e;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java index ac092d8..479b3b2 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–2015 David Roden + * Sone - ParserFilter.java - Copyright © 2011–2016 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 @@ -20,7 +20,6 @@ package net.pterodactylus.sone.template; import static java.lang.String.valueOf; import static net.pterodactylus.sone.utils.NumberParsers.parseInt; -import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; @@ -101,7 +100,7 @@ public class ParserFilter implements Filter { FreenetRequest request = (FreenetRequest) templateContext.get("request"); SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone); StringWriter parsedTextWriter = new StringWriter(); - Iterable parts = soneTextParser.parse(context, text); + Iterable parts = soneTextParser.parse(text, context); if (length > -1) { int allPartsLength = 0; List shortenedParts = new ArrayList(); @@ -248,7 +247,7 @@ public class ParserFilter implements Filter { private void render(Writer writer, PostPart postPart) { SoneTextParser parser = new SoneTextParser(core, core); SoneTextParserContext parserContext = new SoneTextParserContext(null, postPart.getPost().getSone()); - Iterable parts = parser.parse(parserContext, postPart.getPost().getText()); + Iterable parts = parser.parse(postPart.getPost().getText(), parserContext); StringBuilder excerpt = new StringBuilder(); for (Part part : parts) { excerpt.append(part.getText());