X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyGroupFilter.java;h=fba51f9a1fcbcdb9379de5a8a8476b1101d8a735;hb=49a8ab6bd09b92822cd8cf1285c0b7a68e2bc8ca;hp=3d5fda130e5de19d18b26789bdd0a3654565a26a;hpb=7017646bf42cb265b6df539bb6def40b91d2f968;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
index 3d5fda1..fba51f9 100644
--- a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ReplyGroupFilter.java - Copyright © 2010–2013 David Roden
+ * Sone - ReplyGroupFilter.java - Copyright © 2010–2016 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
@@ -48,8 +48,8 @@ public class ReplyGroupFilter implements Filter {
 	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
 		@SuppressWarnings("unchecked")
 		List<PostReply> allReplies = (List<PostReply>) data;
-		Map<Post, Set<Sone>> postSones = new HashMap<Post, Set<Sone>>();
-		Map<Post, Set<PostReply>> postReplies = new HashMap<Post, Set<PostReply>>();
+		Map<Post, Set<Sone>> postSones = new HashMap<>();
+		Map<Post, Set<PostReply>> postReplies = new HashMap<>();
 		for (PostReply reply : allReplies) {
 			/*
 			 * All replies from a new-reply notification have posts,
@@ -58,23 +58,20 @@ public class ReplyGroupFilter implements Filter {
 			Optional<Post> post = reply.getPost();
 			Set<Sone> sones = postSones.get(post.get());
 			if (sones == null) {
-				sones = new HashSet<Sone>();
+				sones = new HashSet<>();
 				postSones.put(post.get(), sones);
 			}
 			sones.add(reply.getSone());
 			Set<PostReply> replies = postReplies.get(post.get());
 			if (replies == null) {
-				replies = new HashSet<PostReply>();
+				replies = new HashSet<>();
 				postReplies.put(post.get(), replies);
 			}
 			replies.add(reply);
 		}
-		Map<Post, Map<String, Set<?>>> result = new HashMap<Post, Map<String, Set<?>>>();
+		Map<Post, Map<String, Set<?>>> result = new HashMap<>();
 		for (Entry<Post, Set<Sone>> postEntry : postSones.entrySet()) {
-			if (result.containsKey(postEntry.getKey())) {
-				continue;
-			}
-			Map<String, Set<?>> postResult = new HashMap<String, Set<?>>();
+			Map<String, Set<?>> postResult = new HashMap<>();
 			postResult.put("sones", postEntry.getValue());
 			postResult.put("replies", postReplies.get(postEntry.getKey()));
 			result.put(postEntry.getKey(), postResult);