projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always try to send an identifier back from the FCP interface
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
notify
/
ListNotification.java
diff --git
a/src/main/java/net/pterodactylus/sone/notify/ListNotification.java
b/src/main/java/net/pterodactylus/sone/notify/ListNotification.java
index
57cb7fe
..
8ab8e4c
100644
(file)
--- 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
–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
*
* 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<T> extends TemplateNotification {
* The element to remove
*/
public void remove(T element) {
* 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();
}
if (elements.isEmpty()) {
dismiss();
}
@@
-186,18
+188,13
@@
public class ListNotification<T> extends TemplateNotification {
return false;
}
ListNotification<?> listNotification = (ListNotification<?>) object;
return false;
}
ListNotification<?> listNotification = (ListNotification<?>) object;
- if (!
key.equals(listNotification.key
)) {
+ if (!
super.equals(listNotification
)) {
return false;
}
return false;
}
- if (
elements.size() != listNotification.elements.size(
)) {
+ if (
!key.equals(listNotification.key
)) {
return false;
}
return false;
}
- for (int index = 0; index < elements.size(); ++index) {
- if (!elements.get(index).equals(listNotification.elements.get(index))) {
- return false;
- }
- }
- return true;
+ return elements.equals(listNotification.elements);
}
}
}
}