Changeset 11339 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2016-11-28T21:18:55+01:00 (9 years ago)

Author:

simon04

Message:

Loop can be replaced with Collection.removeIf()

File:

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

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

@@ -1092 +1092 @@
         if (listener == null) return;
         synchronized (Main.class) {
-            Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
-            while (it.hasNext()) {
-                WeakReference<ProjectionChangeListener> wr = it.next();
-                // remove the listener - and any other listener which got garbage
-                // collected in the meantime
-                if (wr.get() == null || wr.get() == listener) {
-                    it.remove();
-                }
-            }
+            // remove the listener - and any other listener which got garbage
+            // collected in the meantime
+            listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
         }
     }
@@ -1156 +1150 @@
         if (listener == null) return;
         synchronized (Main.class) {
-            Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
-            while (it.hasNext()) {
-                WeakReference<WindowSwitchListener> wr = it.next();
-                // remove the listener - and any other listener which got garbage
-                // collected in the meantime
-                if (wr.get() == null || wr.get() == listener) {
-                    it.remove();
-                }
-            }
+            // remove the listener - and any other listener which got garbage
+            // collected in the meantime
+            windowSwitchListeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
             if (windowSwitchListeners.isEmpty()) {
                 MasterWindowListener.teardown();