projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract finding next whitespace into its own method.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
PostAccessor.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
index
f6a9c06
..
26a05db
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - PostAccessor.java - Copyright © 2010 David Roden
+ * Sone - PostAccessor.java - Copyright © 2010
–2013
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
*
* 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
@@
-17,8
+17,11
@@
package net.pterodactylus.sone.template;
package net.pterodactylus.sone.template;
+import static com.google.common.collect.FluentIterable.from;
+
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.TemplateContext;
@@
-47,21
+50,22
@@
public class PostAccessor extends ReflectionAccessor {
this.core = core;
}
this.core = core;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object get(TemplateContext templateContext, Object object, String member) {
Post post = (Post) object;
if ("replies".equals(member)) {
@Override
public Object get(TemplateContext templateContext, Object object, String member) {
Post post = (Post) object;
if ("replies".equals(member)) {
- return
core.getReplies(post
);
+ return
from(post.getReplies()).filter(Reply.FUTURE_REPLY_FILTER).toList(
);
} else if (member.equals("likes")) {
} else if (member.equals("likes")) {
- return
core.getLikes(post
);
+ return
post.getLikes(
);
} else if (member.equals("liked")) {
Sone currentSone = (Sone) templateContext.get("currentSone");
} else if (member.equals("liked")) {
Sone currentSone = (Sone) templateContext.get("currentSone");
- return (currentSone != null) &&
(currentSone.isLikedPostId(post.getId())
);
+ return (currentSone != null) &&
post.isLiked(currentSone
);
} else if (member.equals("new")) {
} else if (member.equals("new")) {
- return core.isNewPost(post.getId());
+ return !post.isKnown();
+ } else if (member.equals("bookmarked")) {
+ return core.isBookmarked(post);
+ } else if (member.equals("loaded")) {
+ return post.getSone() != null;
}
return super.get(templateContext, object, member);
}
}
return super.get(templateContext, object, member);
}