Ticket #19789: 19789-v0.patch

src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.preferences.display.GPXSettingsPanel;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
@@ -147 +148 @@
     private String cachedDefaultTemplate;
 
     private CachedLatLon coor;
+    private PreferenceChangedListener listener = l -> updateText();
 
     private boolean erroneous;
 
@@ -174 +176 @@
         this.dataProvider = dataProvider;
         this.text = text;
 
-        Preferences.main().addKeyPreferenceChangeListener("draw.rawgps." + getTextTemplateKey(), l -> updateText());
+        Preferences.main().addKeyPreferenceChangeListener("draw.rawgps." + getTextTemplateKey(), listener);
     }
 
     /**
@@ -432 +434 @@
             redSymbol = null;
         }
     }
+
+    /**
+     * Removes the preference change listener.
+     * @since xxx
+     */
+    public void removeListener() {
+        Preferences.main().removeKeyPreferenceChangeListener("draw.rawgps." + getTextTemplateKey(), listener);
+    }
 }

src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -171 +171 @@
         syncAudioMarker = null;
         currentMarker = null;
         fromLayer = null;
+        data.forEach(Marker::removeListener);
         data.clear();
         super.destroy();
     }