X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyAccessor.java;h=41fbf4ed35a09fc9403e95cc366ec52a87c5fa44;hb=8871424239966323798a4ebd1c7d2c27ba830f1e;hp=1ec4e042e4a7547b37bcd60601e595b32bd19d59;hpb=6db033602e7c17efc40a4a19efe705d67832fc1a;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java index 1ec4e04..41fbf4e 100644 --- a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java @@ -17,17 +17,12 @@ package net.pterodactylus.sone.template; -import java.io.IOException; -import java.io.StringReader; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.text.FreenetLinkParser; import net.pterodactylus.util.template.Accessor; import net.pterodactylus.util.template.DataProvider; import net.pterodactylus.util.template.ReflectionAccessor; -import net.pterodactylus.util.template.TemplateFactory; /** * {@link Accessor} implementation that adds a couple of properties to @@ -37,9 +32,6 @@ import net.pterodactylus.util.template.TemplateFactory; */ public class ReplyAccessor extends ReflectionAccessor { - /** Parser for Freenet links. */ - private final FreenetLinkParser linkParser; - /** The core. */ private final Core core; @@ -48,12 +40,9 @@ public class ReplyAccessor extends ReflectionAccessor { * * @param core * The core - * @param templateFactory - * The template factory for the text parser */ - public ReplyAccessor(Core core, TemplateFactory templateFactory) { + public ReplyAccessor(Core core) { this.core = core; - linkParser = new FreenetLinkParser(templateFactory); } /** @@ -65,17 +54,10 @@ public class ReplyAccessor extends ReflectionAccessor { if ("likes".equals(member)) { return core.getLikes(reply); } else if (member.equals("liked")) { - Sone currentSone = (Sone) dataProvider.getData("currentSone"); + Sone currentSone = (Sone) dataProvider.get("currentSone"); return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId())); } else if (member.equals("new")) { return core.isNewReply(reply.getId(), false); - } else if (member.equals("text")) { - String text = reply.getText(); - try { - return linkParser.parse(new StringReader(text)); - } catch (IOException ioe1) { - /* ignore. */ - } } return super.get(dataProvider, object, member); }