Changeset 13453 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2018-02-24T18:58:28+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #8039, fix #10456: final fixes for the read-only/locked layers:

• rename "read-only" to "locked" (in XML and Java classes/interfaces)
• add a new download policy (true/never) to allow private layers forbidding only to download data, but allowing everything else

This leads to:

• normal layers: download allowed, modifications allowed, upload allowed
• private layers: download allowed or not (download=true/never), modifications allowed, upload allowed or not (upload=true/discouraged/never)
• locked layers: nothing allowed, the data cannot be modified in any way

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -64 +64 @@
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
@@ -421 +422 @@
     public Icon getIcon() {
         ImageProvider base = getBaseIconProvider().setMaxSize(ImageSizes.LAYER);
-        if (isUploadDiscouraged() || data.getUploadPolicy() == UploadPolicy.BLOCKED) {
+        if (data.getDownloadPolicy() != null && data.getDownloadPolicy() != DownloadPolicy.NORMAL) {
+            base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.0, 1.0, 0.5));
+        }
+        if (data.getUploadPolicy() != null && data.getUploadPolicy() != UploadPolicy.NORMAL) {
             base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0));
         }
@@ -428 +432 @@
             // If the layer is being uploaded then change the default icon to a clock
             base = new ImageProvider("clock").setMaxSize(ImageSizes.LAYER);
-        } else if (isReadOnly()) {
+        } else if (isLocked()) {
             // If the layer is read only then change the default icon to a lock
             base = new ImageProvider("lock").setMaxSize(ImageSizes.LAYER);
@@ -940 +944 @@
 
     @Override
+    public boolean isDownloadable() {
+        return data.getDownloadPolicy() != DownloadPolicy.BLOCKED && !isLocked();
+    }
+
+    @Override
     public boolean isUploadable() {
-        return data.getUploadPolicy() != UploadPolicy.BLOCKED;
+        return data.getUploadPolicy() != UploadPolicy.BLOCKED && !isLocked();
     }
 
@@ -1031 +1040 @@
     }
 
-    /**
-     * Determines if upload is being discouraged.
-     * (i.e. this dataset contains private data which should not be uploaded)
-     * @return {@code true} if upload is being discouraged, {@code false} otherwise
-     */
     @Override
     public final boolean isUploadDiscouraged() {
@@ -1174 +1178 @@
 
     @Override
-    public void setReadOnly() {
-        data.setReadOnly();
-    }
-
-    @Override
-    public void unsetReadOnly() {
-        data.unsetReadOnly();
-    }
-
-    @Override
-    public boolean isReadOnly() {
-        return data.isReadOnly();
+    public void lock() {
+        data.lock();
+    }
+
+    @Override
+    public void unlock() {
+        data.unlock();
+    }
+
+    @Override
+    public boolean isLocked() {
+        return data.isLocked();
     }