X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyAccessor.java;h=4faa0456f41b5367f77bccc109ef3cad723746ac;hp=d6646973b96388ea62e39648af8b6a645ab06d6f;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=64d9beb831fabdd08df6600f960ffb0e4b3825a5

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
index d664697..4faa045 100644
--- a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ReplyAccessor.java - Copyright © 2010 David Roden
+ * Sone - ReplyAccessor.java - Copyright © 2010–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
@@ -18,11 +18,12 @@
 package net.pterodactylus.sone.template;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * {@link Accessor} implementation that adds a couple of properties to
@@ -49,17 +50,19 @@ public class ReplyAccessor extends ReflectionAccessor {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
-		Reply reply = (Reply) object;
+	public Object get(TemplateContext templateContext, Object object, String member) {
+		PostReply reply = (PostReply) object;
 		if ("likes".equals(member)) {
 			return core.getLikes(reply);
 		} else if (member.equals("liked")) {
-			Sone currentSone = (Sone) dataProvider.getData("currentSone");
+			Sone currentSone = (Sone) templateContext.get("currentSone");
 			return (currentSone != null) && (currentSone.isLikedReplyId(reply.getId()));
 		} else if (member.equals("new")) {
-			return core.isNewReply(reply.getId(), false);
+			return !reply.isKnown();
+		} else if (member.equals("loaded")) {
+			return reply.getSone() != null;
 		}
-		return super.get(dataProvider, object, member);
+		return super.get(templateContext, object, member);
 	}
 
 }