Changeset 13486 in josm for trunk/src/org/openstreetmap/josm/actions/relation

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

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AbstractRelationAction.java (modified) (2 diffs)
• DownloadMembersAction.java (modified) (2 diffs)
• DownloadSelectedIncompleteMembersAction.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import javax.swing.AbstractAction;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.OsmPrimitiveAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -46 +50 @@
         setEnabled(!relations.isEmpty());
     }
+
+    protected final boolean canDownload() {
+        if (relations.isEmpty()) {
+            return false;
+        }
+        DataSet ds = relations.iterator().next().getDataSet();
+        return !Main.isOffline(OnlineResource.OSM_API)
+            && ds != null && !ds.isLocked() && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy());
+    }
 }

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

@@ -8 +8 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
-import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -47 +45 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!relations.isEmpty() && !Main.isOffline(OnlineResource.OSM_API)
-                && !relations.iterator().next().getDataSet().isLocked());
+        setEnabled(canDownload());
     }
 }

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

@@ -9 +9 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
-import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -67 +65 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!relations.isEmpty() && !incompleteMembers.isEmpty() && !Main.isOffline(OnlineResource.OSM_API)
-                && !relations.iterator().next().getDataSet().isLocked());
+        setEnabled(!incompleteMembers.isEmpty() && canDownload());
     }
 }