Changeset 13322 in josm for trunk

Timestamp:

2018-01-14T15:51:12+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15767 - clear projection change listeners at the end of unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (1 diff)

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

@@ -431 +431 @@
     public static void addProjectionChangeListener(ProjectionChangeListener listener) {
         if (listener == null) return;
-        synchronized (Main.class) {
-            for (WeakReference<ProjectionChangeListener> wr : listeners) {
-                // already registered ? => abort
-                if (wr.get() == listener) return;
-            }
-            listeners.add(new WeakReference<>(listener));
-        }
+        for (WeakReference<ProjectionChangeListener> wr : listeners) {
+            // already registered ? => abort
+            if (wr.get() == listener) return;
+        }
+        listeners.add(new WeakReference<>(listener));
     }
 
@@ -447 +445 @@
     public static void removeProjectionChangeListener(ProjectionChangeListener listener) {
         if (listener == null) return;
-        synchronized (Main.class) {
-            // remove the listener - and any other listener which got garbage
-            // collected in the meantime
-            listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
-        }
+        // remove the listener - and any other listener which got garbage collected in the meantime
+        listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
+    }
+
+    /**
+     * Remove all projection change listeners. For testing purposes only.
+     * @since 13322
+     */
+    public static void clearProjectionChangeListeners() {
+        listeners.clear();
     }
 

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -510 +510 @@
 
         // TODO: Remove global listeners and other global state.
+        Main.clearProjectionChangeListeners();
         Main.pref.resetToInitialState();
         Main.platform = null;