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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/AutoScaleAction.java (modified) (1 diff)
• actions/relation/EditRelationAction.java (modified) (1 diff)
• command/Command.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)
• gui/layer/ValidatorLayer.java (modified) (1 diff)
• gui/layer/WMSLayer.java (modified) (1 diff)
• io/remotecontrol/handler/AddNodeHandler.java (modified) (1 diff)
• io/remotecontrol/handler/AddWayHandler.java (modified) (1 diff)

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

@@ -363 +363 @@
         if (map != null) {
             map.mapView.removeLayer(layer);
-            if (map.mapView.getAllLayers().isEmpty()) {
+            if (isDisplayingMapView() && map.mapView.getAllLayers().isEmpty()) {
                 setMapFrame(null);
             }

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -261 +261 @@
             setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
         }  else if ("layer".equals(mode)) {
-            if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getAllLayersAsList().isEmpty()) {
+            if (!Main.isDisplayingMapView() || Main.map.mapView.getAllLayersAsList().isEmpty()) {
                 setEnabled(false);
             } else {

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -39 +39 @@
     public static Set<RelationMember> getMembersForCurrentSelection(Relation r) {
         Set<RelationMember> members = new HashSet<RelationMember>();
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
             if (editLayer != null && editLayer.data != null) {

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -86 +86 @@
      */
     public Command() {
-        this.layer = Main.map != null && Main.map.mapView != null ? Main.map.mapView.getEditLayer() : null;
+        this.layer = Main.isDisplayingMapView() ? Main.map.mapView.getEditLayer() : null;
     }
 

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();
                 }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -84 +84 @@
         Node nd = null;
 
-        if (Main.map != null &&  Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             Point p = Main.map.mapView.getPoint(ll);
             nd = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -115 +115 @@
         Node nd = null;
 
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             Point p = Main.map.mapView.getPoint(ll);
             nd = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);