Changeset 13486 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.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/ReferringRelationsBrowserModel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -35 +36 @@
     }
 
+    /**
+     * Sets the relation.
+     * @param relation the relation
+     */
     public void setRelation(Relation relation) {
         this.relation = relation;
@@ -62 +67 @@
     }
 
+    /**
+     * Populates the model with parent referrers.
+     * @param parents parent referrers
+     */
     public void populate(List<Relation> parents) {
         referrers.clear();
@@ -93 +102 @@
     }
 
+    /**
+     * Determines if reloading the relation is possible/authorized.
+     * @return {@code true} if reloading the relation is possible/authorized
+     */
     public boolean canReload() {
-        return relation != null && !relation.isNew();
+        return relation != null && !relation.isNew()
+                && !relation.getDataSet().isLocked()
+                && !DownloadPolicy.BLOCKED.equals(relation.getDataSet().getDownloadPolicy());
     }
 
+    /**
+     * Returns the relation.
+     * @return the relation
+     */
     public Relation getRelation() {
         return relation;