projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '0.3.1-RC3' into next
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
ReplyAccessor.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
index
08c91c7
..
1ec4e04
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
@@
-17,12
+17,17
@@
package net.pterodactylus.sone.template;
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.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.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
/**
* {@link Accessor} implementation that adds a couple of properties to
@@
-32,6
+37,9
@@
import net.pterodactylus.util.template.ReflectionAccessor;
*/
public class ReplyAccessor extends ReflectionAccessor {
*/
public class ReplyAccessor extends ReflectionAccessor {
+ /** Parser for Freenet links. */
+ private final FreenetLinkParser linkParser;
+
/** The core. */
private final Core core;
/** The core. */
private final Core core;
@@
-40,9
+48,12
@@
public class ReplyAccessor extends ReflectionAccessor {
*
* @param core
* The core
*
* @param core
* The core
+ * @param templateFactory
+ * The template factory for the text parser
*/
*/
- public ReplyAccessor(Core core) {
+ public ReplyAccessor(Core core
, TemplateFactory templateFactory
) {
this.core = core;
this.core = core;
+ linkParser = new FreenetLinkParser(templateFactory);
}
/**
}
/**
@@
-57,7
+68,14
@@
public class ReplyAccessor extends ReflectionAccessor {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId()));
} else if (member.equals("new")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId()));
} else if (member.equals("new")) {
- return core.isNewReply(reply.getId());
+ 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);
}
}
return super.get(dataProvider, object, member);
}