Changeset 32329 in osm for applications/editors/josm/plugins/sds/src

Timestamp:

2016-06-19T16:08:56+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm12953 - Replace most uses of MapView.getActiveLayer and similar methods (patch by michael2402, modified) - gsoc-core

Location:

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds

Files:

• SdsMenu.java (modified) (1 diff)
• SdsSaveAction.java (modified) (1 diff)

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java

@@ -55 +55 @@
 
     void setEnabledState() {
-        boolean en = (Main.map != null) && (Main.map.mapView != null) && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer);
+        boolean en = Main.getLayerManager().getActiveLayer() instanceof OsmDataLayer;
         loadItem.setEnabled(en);
         saveItem.setEnabled(en);

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java

@@ -37 +37 @@
     public boolean doSave() {
         Layer layer = null;
-        if (Main.isDisplayingMapView() && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer))
-            layer = Main.map.mapView.getActiveLayer();
+        if (Main.getLayerManager().getActiveLayer() instanceof OsmDataLayer)
+            layer = Main.getLayerManager().getActiveLayer();
 
         if (layer == null)