From b4f26039d20f9eb92393b808108bdfcbf0964003 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 15 Nov 2010 06:49:36 +0100 Subject: [PATCH] Return removed notifications as well. --- .../net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 notifications = new ArrayList(webInterface.getNotifications().getChangedNotifications()); + Set 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); } /** -- 2.7.4