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

Timestamp:

2018-02-18T05:02:23+01:00 (7 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (4 diffs)

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

@@ -141 +141 @@
         String upload = parser.getAttributeValue(null, "upload");
         if (upload != null) {
-            for (UploadPolicy policy : UploadPolicy.values()) {
-                if (policy.getXmlFlag().equalsIgnoreCase(upload)) {
-                    ds.setUploadPolicy(policy);
-                    break;
-                }
-            }
+            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();
         }
         String generator = parser.getAttributeValue(null, "generator");
@@ -181 +183 @@
                     parseUnknown();
                 }
-            } else if (event == XMLStreamConstants.END_ELEMENT)
+            } else if (event == XMLStreamConstants.END_ELEMENT) {
                 return;
+            }
         }
     }
@@ -618 +621 @@
             progressMonitor.worked(1);
 
+            boolean readOnly = getDataSet().isReadOnly();
+
             progressMonitor.indeterminateSubTask(tr("Preparing data set..."));
+            if (readOnly) {
+                getDataSet().unsetReadOnly();
+            }
             prepareDataSet();
+            if (readOnly) {
+                getDataSet().setReadOnly();
+            }
             progressMonitor.worked(1);
 
@@ -628 +639 @@
                     pp.postprocessDataSet(getDataSet(), progressMonitor);
                 }
+            }
+            // Make sure postprocessors did not change the read-only state
+            if (readOnly && !getDataSet().isReadOnly()) {
+                getDataSet().setReadOnly();
             }
             return getDataSet();