Changeset 10959 in josm for trunk

Timestamp:

2016-09-04T18:01:25+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13507 - safer management of listeners for Layer color property

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (1 diff)
• Layer.java (modified) (3 diffs)
• OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -388 +388 @@
     @Override
     public void destroy() {
+        super.destroy();
         SystemOfMeasurement.removeSoMChangeListener(drawHelper);
     }

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -221 +221 @@
         AbstractProperty<Color> colorProperty = getColorProperty();
         if (colorProperty != null) {
-            colorProperty.addWeakListener(invalidateListener);
+            colorProperty.addListener(invalidateListener);
         }
     }
@@ -285 +285 @@
     public void destroy() {
         // Override in subclasses if needed
+        removeColorPropertyListener();
     }
 
@@ -651 +652 @@
         return v.getBounds();
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [name=" + name + ", associatedFile=" + associatedFile + ']';
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -934 +934 @@
     @Override
     public void destroy() {
+        super.destroy();
         DataSet.removeSelectionListener(this);
     }