Changeset 12119 in josm for trunk/src/org

Timestamp:

2017-05-11T10:57:14+02:00 (7 years ago)

Author:

michael2402

Message:

Fix weak projection listener of NavigatableComponent being lost.

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (3 diffs)

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

@@ -1078 +1078 @@
         if ((newValue == null ^ oldValue == null)
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-            if (Main.map != null) {
-                // This needs to be called first
-                Main.map.mapView.fixProjection();
-            }
             synchronized (Main.class) {
                 Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
@@ -1103 +1099 @@
     /**
      * Register a projection change listener.
+     * The listener is registered to be weak, so keep a reference of it if you want it to be preserved.
      *
      * @param listener the listener. Ignored if <code>null</code>.

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

@@ -52 +52 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.help.Helpful;
@@ -171 +172 @@
 
     /**
+     * Main uses weak link to store this, so we need to keep a reference.
+     */
+    private final ProjectionChangeListener projectionChangeListener = (oldValue, newValue) -> fixProjection();
+
+    /**
      * Constructs a new {@code NavigatableComponent}.
      */
@@ -176 +182 @@
         setLayout(null);
         state = MapViewState.createDefaultState(getWidth(), getHeight());
-        // uses weak link.
-        Main.addProjectionChangeListener((oldValue, newValue) -> fixProjection());
+        Main.addProjectionChangeListener(projectionChangeListener);
     }