projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add abstract base class for replies, move post reply into its own class.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
GetStatusAjaxPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
index
eaa6506
..
038cfb8
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@
-26,7
+26,7
@@
import java.util.List;
import java.util.Set;
import net.pterodactylus.sone.data.Post;
import java.util.Set;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.
Post
Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.notify.ListNotificationFilters;
import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.notify.ListNotificationFilters;
import net.pterodactylus.sone.template.SoneAccessor;
@@
-117,27
+117,27
@@
public class GetStatusAjaxPage extends JsonPage {
jsonPosts.add(jsonPost);
}
/* load new replies. */
jsonPosts.add(jsonPost);
}
/* load new replies. */
- Set<Reply> newReplies = webInterface.getNewReplies();
+ Set<
Post
Reply> newReplies = webInterface.getNewReplies();
if (currentSone != null) {
if (currentSone != null) {
- newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+ newReplies = Filters.filteredSet(newReplies, new Filter<
Post
Reply>() {
@Override
@Override
- public boolean filterObject(Reply reply) {
+ public boolean filterObject(
Post
Reply reply) {
return ListNotificationFilters.isReplyVisible(currentSone, reply);
}
});
}
/* remove replies to unknown posts. */
return ListNotificationFilters.isReplyVisible(currentSone, reply);
}
});
}
/* remove replies to unknown posts. */
- newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+ newReplies = Filters.filteredSet(newReplies, new Filter<
Post
Reply>() {
@Override
@Override
- public boolean filterObject(Reply reply) {
+ public boolean filterObject(
Post
Reply reply) {
return (reply.getPost() != null) && (reply.getPost().getSone() != null);
}
});
JsonArray jsonReplies = new JsonArray();
return (reply.getPost() != null) && (reply.getPost().getSone() != null);
}
});
JsonArray jsonReplies = new JsonArray();
- for (Reply reply : newReplies) {
+ for (
Post
Reply reply : newReplies) {
JsonObject jsonReply = new JsonObject();
jsonReply.put("id", reply.getId());
jsonReply.put("sone", reply.getSone().getId());
JsonObject jsonReply = new JsonObject();
jsonReply.put("id", reply.getId());
jsonReply.put("sone", reply.getSone().getId());