From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 15 Nov 2010 05:49:36 +0000 (+0100)
Subject: Return removed notifications as well.
X-Git-Tag: 0.3-RC1~45
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b4f26039d20f9eb92393b808108bdfcbf0964003;p=Sone.git

Return removed notifications as well.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
index f46351c..00e726d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.web.ajax;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.json.JsonArray;
@@ -52,13 +53,18 @@ public class GetNotificationsAjaxPage extends JsonPage {
 	@Override
 	protected JsonObject createJsonObject(Request request) {
 		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications().getChangedNotifications());
+		Set<Notification> removedNotifications = webInterface.getNotifications().getRemovedNotifications();
 		Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
 		JsonObject result = createSuccessJsonObject();
 		JsonArray jsonNotifications = new JsonArray();
 		for (Notification notification : notifications) {
 			jsonNotifications.add(createJsonNotification(notification));
 		}
-		return result.put("notifications", jsonNotifications);
+		JsonArray jsonRemovedNotifications = new JsonArray();
+		for (Notification notification : removedNotifications) {
+			jsonRemovedNotifications.add(createJsonNotification(notification));
+		}
+		return result.put("notifications", jsonNotifications).put("removedNotifications", jsonRemovedNotifications);
 	}
 
 	/**