Changeset 16313 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-04-15T23:29:36+02:00 (4 years ago)

Author:

simon04

Message:

fix #19089 - Avoid displaying multiple notifications with the same text

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• Notification.java (modified) (3 diffs)
• NotificationManager.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/Notification.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.util.Objects;
 
 import javax.swing.Icon;
@@ -9 +10 @@
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+import javax.swing.text.JTextComponent;
 
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -211 +213 @@
         NotificationManager.getInstance().showNotification(this);
     }
+
+    private Object getContentTextOrComponent() {
+        return content instanceof JTextComponent ? ((JTextComponent) content).getText() : content;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Notification that = (Notification) o;
+        System.out.println(getContentTextOrComponent().getClass());
+        return duration == that.duration
+                && Objects.equals(getContentTextOrComponent(), that.getContentTextOrComponent())
+                && Objects.equals(helpTopic, that.helpTopic);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getContentTextOrComponent(), duration, helpTopic);
+    }
+
+    @Override
+    public String toString() {
+        return "Notification{" +
+                "content=" + getContentTextOrComponent() +
+                ", duration=" + duration +
+                ", helpTopic='" + helpTopic + '\'' +
+                '}';
+    }
 }

trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

@@ -21 +21 @@
 import java.awt.event.MouseListener;
 import java.awt.geom.RoundRectangle2D;
+import java.util.Deque;
 import java.util.LinkedList;
-import java.util.Queue;
+import java.util.Objects;
 
 import javax.swing.AbstractAction;
@@ -41 +42 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -63 +65 @@
     private Notification currentNotification;
     private NotificationPanel currentNotificationPanel;
-    private final Queue<Notification> queue;
+    private final Deque<Notification> queue;
 
     private static IntegerProperty pauseTime = new IntegerProperty("notification-default-pause-time-ms", 300); // milliseconds
@@ -86 +88 @@
 
     /**
-     * Show the given notification
+     * Show the given notification (unless a duplicate notification is being shown at the moment or at the end of the queue)
      * @param note The note to show.
      * @see Notification#show()
@@ -92 +94 @@
     public void showNotification(Notification note) {
         synchronized (queue) {
+            if (Objects.equals(note, currentNotification) || Objects.equals(note, queue.peekLast())) {
+                Logging.debug("Dropping duplicate notification {0}", note);
+                return;
+            }
             queue.add(note);
             processQueue();