Changeset 13453 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

Timestamp:

2018-02-24T18:58:28+01:00 (6 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/io/UploadPrimitivesTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -220 +220 @@
         // partially uploaded. Better run on EDT.
         Runnable r = () -> {
-            boolean readOnly = layer.isReadOnly();
+            boolean readOnly = layer.isLocked();
             if (readOnly) {
-                layer.unsetReadOnly();
+                layer.unlock();
             }
             try {
@@ -230 +230 @@
             } finally {
                 if (readOnly) {
-                    layer.setReadOnly();
+                    layer.lock();
                 }
             }