Changeset 6333 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2013-10-27T03:20:19+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9189 - NPE when deleting data layer + additional usage of Main.isDisplayingMapView()

Location:

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

Files:

• OsmDataLayer.java (modified) (1 diff)
• ValidatorLayer.java (modified) (1 diff)
• WMSLayer.java (modified) (1 diff)

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

@@ -407 +407 @@
         }
         // repaint to make sure new data is displayed properly.
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             Main.map.mapView.repaint();
         }

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

@@ -156 +156 @@
     @Override
     public void layerRemoved(Layer oldLayer) {
-        if (oldLayer instanceof OsmDataLayer && Main.map != null && Main.map.mapView.getEditLayer() == null) {
+        if (oldLayer instanceof OsmDataLayer && Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() == null) {
             Main.main.removeLayer(this);
         } else if (oldLayer == this) {

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

@@ -604 +604 @@
             if (request.getState() != null && !request.isPrecacheOnly()) {
                 finishedRequests.add(request);
-                if (Main.map != null && Main.map.mapView != null) {
+                if (Main.isDisplayingMapView()) {
                     Main.map.mapView.repaint();
                 }