Changeset 19224 in osm

Timestamp:

2009-12-28T09:44:19+01:00 (15 years ago)

Author:

guggis

Message:

'Fixed JOSM ticket #4235 - Validation layer is not removed when data layers are removed'

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/validator/build.xml

@@ -26 +26 @@
           ** update before publishing 
         -->
-        <property name="commit.message" value="Updated to JOSM 2621" />
+        <property name="commit.message" value="Fixed JOSM ticket #4235 - Validation layer is not removed when data layers are removed" />
         <property name="plugin.main.version" value="2621" />
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -291 +289 @@
     }
 
+    /* -------------------------------------------------------------------------- */
+    /* interface LayerChangeListener                                              */
+    /* -------------------------------------------------------------------------- */
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
         if (newLayer instanceof OsmDataLayer) {
@@ -306 +307 @@
 
     public void layerRemoved(Layer oldLayer) {
+        if (oldLayer == errorLayer) {
+                errorLayer = null;
+                return;
+        }
         layerErrors.remove(oldLayer);
+        if (Main.map.mapView.getLayersOfType(OsmDataLayer.class).isEmpty()) {
+                if (errorLayer != null) {
+                        Main.map.mapView.removeLayer(errorLayer);
+                }
+        }
     }
 }