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

Timestamp:

2022-03-09T09:19:18+01:00 (3 years ago)

Author:

GerdP

Message:

see #21740: IAE: Attempted to add listener that was already in list: external preset with group name RoadSigns

• improve check for repeatedly registered ActiveLayerChangeListener: check for identity instead of equality, log error with traceback (similar to EDT violations) instead of throwing an IllegalArgumentException

File:

• trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -174 +174 @@
      */
     public synchronized void addActiveLayerChangeListener(ActiveLayerChangeListener listener) {
-        if (activeLayerChangeListeners.contains(listener)) {
-            throw new IllegalArgumentException("Attempted to add listener that was already in list: " + listener);
+        for (int i = 0; i< activeLayerChangeListeners.size(); i++) {
+            if (activeLayerChangeListeners.get(i) == listener) {
+                Logging.error("");
+                Logging.error("Attempted to add listener that was already in list: " + listener);
+                showStackTrace(Thread.currentThread().getStackTrace());
+                return;
+            }
         }
         activeLayerChangeListeners.add(listener);
+    }
+
+    private void showStackTrace(StackTraceElement[] stackTrace) {
+        for (StackTraceElement st : stackTrace) {
+            Logging.error("\tat " + st);
+        }
     }
 
@@ -195 +206 @@
      */
     public synchronized void removeActiveLayerChangeListener(ActiveLayerChangeListener listener) {
-        if (!activeLayerChangeListeners.contains(listener)) {
-            throw new IllegalArgumentException("Attempted to remove listener that was not in list: " + listener);
-        }
-        activeLayerChangeListeners.remove(listener);
+        int old = -1;
+        for (int i = 0; i < activeLayerChangeListeners.size(); i++) {
+            if (activeLayerChangeListeners.get(i) == listener) {
+                old = i;
+                break;
+            }
+        }
+        if (old < 0) {
+            Logging.error("");
+            Logging.error("Attempted to remove listener that was not in list: " + listener);
+            showStackTrace(Thread.currentThread().getStackTrace());
+            return;
+        }
+        activeLayerChangeListeners.remove(old);
     }
 
@@ -207 +228 @@
      */
     public synchronized void addLayerAvailabilityListener(LayerAvailabilityListener listener) {
-        if (!layerAvailabilityListeners.add(listener)) {
-            throw new IllegalArgumentException("Attempted to add listener that was already in list: " + listener);
-        }
+        layerAvailabilityListeners.add(listener);
     }