Changeset 13319 in josm

Timestamp:

2018-01-14T04:17:16+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15767 - CopyOnWriteArrayList iterators do not support remove method. Use streams instead

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -13 +13 @@
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -415 +414 @@
         if ((newValue == null ^ oldValue == null)
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-            Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
-            while (it.hasNext()) {
-                WeakReference<ProjectionChangeListener> wr = it.next();
-                ProjectionChangeListener listener = wr.get();
-                if (listener == null) {
-                    it.remove();
-                    continue;
-                }
-                listener.projectionChanged(oldValue, newValue);
-            }
+            listeners.removeIf(x -> x.get() == null);
+            listeners.forEach(x -> x.get().projectionChanged(oldValue, newValue));
             if (newValue != null && oldBounds != null && main != null) {
                 main.restoreOldBounds(oldBounds);