X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotification.java;h=101b1fb48b0696683dfbe5670f405219221bdcf8;hp=57cb7fe1e23e303b5c17d14c3491aa113a0fb9d0;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=c55737094ab4551ae6d9805e4397b25322c87c78 diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotification.java b/src/main/java/net/pterodactylus/sone/notify/ListNotification.java index 57cb7fe..101b1fb 100644 --- a/src/main/java/net/pterodactylus/sone/notify/ListNotification.java +++ b/src/main/java/net/pterodactylus/sone/notify/ListNotification.java @@ -1,5 +1,5 @@ /* - * Sone - ListNotification.java - Copyright © 2010 David Roden + * Sone - ListNotification.java - Copyright © 2010–2015 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 @@ -141,7 +141,9 @@ public class ListNotification extends TemplateNotification { * The element to remove */ public void remove(T element) { - elements.remove(element); + while (elements.remove(element)) { + /* do nothing, just remove all instances of the element. */ + } if (elements.isEmpty()) { dismiss(); } @@ -186,6 +188,9 @@ public class ListNotification extends TemplateNotification { return false; } ListNotification listNotification = (ListNotification) object; + if (!super.equals(listNotification)) { + return false; + } if (!key.equals(listNotification.key)) { return false; }