Changeset 13453 in josm for trunk/src/org/openstreetmap/josm/io

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• DiffResultProcessor.java (modified) (2 diffs)
• OsmReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

@@ -123 +123 @@
         boolean readOnly = false;
         if (ds != null) {
-            readOnly = ds.isReadOnly();
+            readOnly = ds.isLocked();
             if (readOnly) {
-                ds.unsetReadOnly();
+                ds.unlock();
             }
             ds.beginUpdate();
@@ -158 +158 @@
                 ds.endUpdate();
                 if (readOnly) {
-                    ds.setReadOnly();
+                    ds.lock();
                 }
             }

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -12 +12 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -27 +28 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 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.Node;
@@ -139 +141 @@
         }
         ds.setVersion(v);
-        String upload = parser.getAttributeValue(null, "upload");
-        if (upload != null) {
-            try {
-                ds.setUploadPolicy(UploadPolicy.of(upload));
-            } catch (IllegalArgumentException e) {
-                throwException(MessageFormat.format("Illegal value for attribute ''upload''. Got ''{0}''.", upload), e);
-            }
-        }
-        if ("true".equalsIgnoreCase(parser.getAttributeValue(null, "read-only"))) {
-            ds.setReadOnly();
+        parsePolicy("download", policy -> ds.setDownloadPolicy(DownloadPolicy.of(policy)));
+        parsePolicy("upload", policy -> ds.setUploadPolicy(UploadPolicy.of(policy)));
+        if ("true".equalsIgnoreCase(parser.getAttributeValue(null, "locked"))) {
+            ds.lock();
         }
         String generator = parser.getAttributeValue(null, "generator");
@@ -185 +181 @@
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 return;
+            }
+        }
+    }
+
+    private void parsePolicy(String key, Consumer<String> consumer) throws XMLStreamException {
+        String policy = parser.getAttributeValue(null, key);
+        if (policy != null) {
+            try {
+                consumer.accept(policy);
+            } catch (IllegalArgumentException e) {
+                throwException(MessageFormat.format("Illegal value for attribute ''{0}''. Got ''{1}''.", key, policy), e);
             }
         }
@@ -621 +628 @@
             progressMonitor.worked(1);
 
-            boolean readOnly = getDataSet().isReadOnly();
+            boolean readOnly = getDataSet().isLocked();
 
             progressMonitor.indeterminateSubTask(tr("Preparing data set..."));
             if (readOnly) {
-                getDataSet().unsetReadOnly();
+                getDataSet().unlock();
             }
             prepareDataSet();
             if (readOnly) {
-                getDataSet().setReadOnly();
+                getDataSet().lock();
             }
             progressMonitor.worked(1);
@@ -641 +648 @@
             }
             // Make sure postprocessors did not change the read-only state
-            if (readOnly && !getDataSet().isReadOnly()) {
-                getDataSet().setReadOnly();
+            if (readOnly && !getDataSet().isLocked()) {
+                getDataSet().lock();
             }
             return getDataSet();