Changeset 13486 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java

Timestamp:

2018-03-03T17:59:48+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #8039, see #10456 - fix bugs with non-downloadable layers

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java

@@ -8 +8 @@
 import javax.swing.event.TableModelListener;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.io.OnlineResource;
 
 /**
@@ -49 +53 @@
 
     protected abstract void updateEnabledState();
+
+    protected final boolean canDownload() {
+        DataSet ds = editor.getRelation().getDataSet();
+        return !Main.isOffline(OnlineResource.OSM_API)
+            && ds != null && !ds.isLocked() && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy());
+    }
 }