Changeset 6336 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-10-27T05:35:41+01:00 (9 years ago)

Author:

Don-vip

Message:

code cleanup / robustness in edit layer handling

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/history/HistoryDataSet.java (modified) (1 diff)
• validation/Test.java (modified) (1 diff)
• validation/tests/Coastlines.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -175 +175 @@
     @Override
     public void layerRemoved(Layer oldLayer) {
-        if (Main.map == null || Main.map.mapView == null) return;
+        if (!Main.isDisplayingMapView()) return;
         if (Main.map.mapView.getNumLayers() == 0) {
             data.clear();

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -240 +240 @@
         }
         if (!primitivesToDelete.isEmpty()) {
-            return DeleteCommand.delete(Main.map.mapView.getEditLayer(), primitivesToDelete);
+            return DeleteCommand.delete(Main.main.getEditLayer(), primitivesToDelete);
         } else {
             return null;

trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

@@ -52 +52 @@
         super.startTest(monitor);
 
-        OsmDataLayer layer = Main.map.mapView.getEditLayer();
+        OsmDataLayer layer = Main.main.getEditLayer();
 
         if (layer != null) {