Changeset 13453 in josm for trunk

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

Files:

• actions/CombineWayAction.java (modified) (1 diff)
• actions/JosmAction.java (modified) (2 diffs)
• actions/MergeNodesAction.java (modified) (1 diff)
• actions/MoveNodeAction.java (modified) (1 diff)
• actions/ReverseWayAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• actions/mapmode/MapMode.java (modified) (1 diff)
• actions/relation/AddSelectionToRelations.java (modified) (1 diff)
• actions/relation/DeleteRelationsAction.java (modified) (1 diff)
• actions/relation/DownloadMembersAction.java (modified) (1 diff)
• actions/relation/DownloadSelectedIncompleteMembersAction.java (modified) (1 diff)
• actions/relation/DuplicateRelationAction.java (modified) (1 diff)
• actions/relation/EditRelationAction.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (22 diffs)
• data/osm/Lockable.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/ReadOnly.java ) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• data/validation/TestError.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)
• gui/dialogs/properties/PresetListPanel.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (5 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• gui/io/UploadPrimitivesTask.java (modified) (2 diffs)
• gui/layer/AbstractModifiableLayer.java (modified) (4 diffs)
• gui/layer/DownloadFromServer.java (added)
• gui/layer/MainLayerManager.java (modified) (4 diffs)
• gui/layer/NoteLayer.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (6 diffs)
• gui/layer/UploadToServer.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• io/DiffResultProcessor.java (modified) (2 diffs)
• io/OsmReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -251 +251 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         int numWays = 0;
-        if (selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isReadOnly)) {
+        if (selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked)) {
             for (OsmPrimitive osm : selection) {
                 if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -350 +350 @@
     protected final void updateEnabledStateOnCurrentSelection(boolean allowReadOnly) {
         DataSet ds = getLayerManager().getActiveDataSet();
-        if (ds != null && (allowReadOnly || !ds.isReadOnly())) {
+        if (ds != null && (allowReadOnly || !ds.isLocked())) {
             updateEnabledState(ds.getSelected());
         } else {
@@ -366 +366 @@
     protected final void updateEnabledStateOnModifiableSelection(Collection<? extends OsmPrimitive> selection) {
         setEnabled(selection != null && !selection.isEmpty()
-                && selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isReadOnly));
+                && selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked));
     }
 

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -366 +366 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         if (selection == null || selection.isEmpty()
-                || selection.stream().map(OsmPrimitive::getDataSet).anyMatch(DataSet::isReadOnly)) {
+                || selection.stream().map(OsmPrimitive::getDataSet).anyMatch(DataSet::isLocked)) {
             setEnabled(false);
             return;

trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java

@@ -63 +63 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         if (selection == null || selection.isEmpty()
-                || selection.stream().map(OsmPrimitive::getDataSet).anyMatch(DataSet::isReadOnly)) {
+                || selection.stream().map(OsmPrimitive::getDataSet).anyMatch(DataSet::isLocked)) {
             setEnabled(false);
             return;

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -169 +169 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         setEnabled(selection.stream().anyMatch(
-                o -> o instanceof Way && !o.isIncomplete() && !o.getDataSet().isReadOnly()));
+                o -> o instanceof Way && !o.isIncomplete() && !o.getDataSet().isLocked()));
     }
 }

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -297 +297 @@
         // Selection still can be wrong, but let SplitWayAction process and tell user what's wrong
         setEnabled(selection != null && !selection.isEmpty()
-                && selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isReadOnly)
+                && selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked)
                 && selection.stream().anyMatch(o -> o instanceof Node && !o.isIncomplete()));
     }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -238 +238 @@
         private static Stream<OsmDataLayer> getModifiableDataLayers() {
             return MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class)
-                    .stream().filter(l -> !l.isReadOnly());
+                    .stream().filter(OsmDataLayer::isDownloadable);
         }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -250 +250 @@
      */
     protected boolean isEditableDataLayer(Layer l) {
-        return l instanceof OsmDataLayer && !((OsmDataLayer) l).isReadOnly();
+        return l instanceof OsmDataLayer && !((OsmDataLayer) l).isLocked();
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -71 +71 @@
     public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) {
         GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty() && !relations.isEmpty()
-                && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isReadOnly)));
+                && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isLocked)));
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java

@@ -51 +51 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!relations.isEmpty() && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isReadOnly));
+        setEnabled(!relations.isEmpty() && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isLocked));
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java

@@ -48 +48 @@
     protected void updateEnabledState() {
         setEnabled(!relations.isEmpty() && !Main.isOffline(OnlineResource.OSM_API)
-                && !relations.iterator().next().getDataSet().isReadOnly());
+                && !relations.iterator().next().getDataSet().isLocked());
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

@@ -68 +68 @@
     protected void updateEnabledState() {
         setEnabled(!relations.isEmpty() && !incompleteMembers.isEmpty() && !Main.isOffline(OnlineResource.OSM_API)
-                && !relations.iterator().next().getDataSet().isReadOnly());
+                && !relations.iterator().next().getDataSet().isLocked());
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java

@@ -52 +52 @@
     protected void updateEnabledState() {
         // only one selected relation can be edited
-        setEnabled(relations.size() == 1 && !relations.iterator().next().getDataSet().isReadOnly());
+        setEnabled(relations.size() == 1 && !relations.iterator().next().getDataSet().isLocked());
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -89 +89 @@
     protected void updateEnabledState() {
         boolean enabled = false;
-        if (relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isReadOnly)) {
+        if (relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isLocked)) {
             for (Relation r : relations) {
                 if (!r.isDeleted()) {

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -104 +104 @@
  * @author imi
  */
-public final class DataSet extends QuadBucketPrimitiveStore implements Data, ProjectionChangeListener, ReadOnly {
+public final class DataSet extends QuadBucketPrimitiveStore implements Data, ProjectionChangeListener, Lockable {
+
+    /**
+     * Download policy.
+     *
+     * Determines if download from the OSM server is intended, discouraged, or disabled / blocked.
+     * @see UploadPolicy
+     * @since 13453
+     */
+    public enum DownloadPolicy {
+        /**
+         * Normal dataset, download intended.
+         */
+        NORMAL("true"),
+        /**
+         * Download blocked.
+         * Download options completely disabled. Intended for private layers, see #8039.
+         */
+        BLOCKED("never");
+
+        final String xmlFlag;
+
+        DownloadPolicy(String xmlFlag) {
+            this.xmlFlag = xmlFlag;
+        }
+
+        /**
+         * Get the corresponding value of the <code>upload='...'</code> XML-attribute
+         * in the .osm file.
+         * @return value of the <code>download</code> attribute
+         */
+        public String getXmlFlag() {
+            return xmlFlag;
+        }
+
+        /**
+         * Returns the {@code DownloadPolicy} for the given <code>upload='...'</code> XML-attribute
+         * @param xmlFlag <code>download='...'</code> XML-attribute to convert
+         * @return {@code DownloadPolicy} value
+         * @throws IllegalArgumentException for invalid values
+         */
+        public static DownloadPolicy of(String xmlFlag) {
+            for (DownloadPolicy policy : values()) {
+                if (policy.getXmlFlag().equalsIgnoreCase(xmlFlag)) {
+                    return policy;
+                }
+            }
+            throw new IllegalArgumentException(xmlFlag);
+        }
+    }
 
     /**
      * Upload policy.
      *
-     * Determines if upload to the OSM server is intended, discouraged, or
-     * disabled / blocked.
+     * Determines if upload to the OSM server is intended, discouraged, or disabled / blocked.
+     * @see DownloadPolicy
      */
     public enum UploadPolicy {
@@ -173 +222 @@
 
     private final Storage<OsmPrimitive> allPrimitives = new Storage<>(new Storage.PrimitiveIdHash(), true);
-    private final Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives.foreignKey(new Storage.PrimitiveIdHash());
+    private final Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives
+            .foreignKey(new Storage.PrimitiveIdHash());
     private final CopyOnWriteArrayList<DataSetListener> listeners = new CopyOnWriteArrayList<>();
 
@@ -187 +237 @@
 
     private String name;
+    private DownloadPolicy downloadPolicy;
     private UploadPolicy uploadPolicy;
     /** Flag used to know if the dataset should not be editable */
@@ -250 +301 @@
                 primMap.put(w, newWay);
                 List<Node> newNodes = new ArrayList<>();
-                for (Node n: w.getNodes()) {
+                for (Node n : w.getNodes()) {
                     newNodes.add((Node) primMap.get(n));
                 }
@@ -268 +319 @@
                 Relation newRelation = (Relation) primMap.get(r);
                 List<RelationMember> newMembers = new ArrayList<>();
-                for (RelationMember rm: r.getMembers()) {
+                for (RelationMember rm : r.getMembers()) {
                     newMembers.add(new RelationMember(rm.getRole(), primMap.get(rm.getMember())));
                 }
@@ -378 +429 @@
         checkModifiable();
         this.version = version;
+    }
+
+    /**
+     * Get the download policy.
+     * @return the download policy
+     * @see #setDownloadPolicy(DownloadPolicy)
+     * @since 13453
+     */
+    public DownloadPolicy getDownloadPolicy() {
+        return this.downloadPolicy;
+    }
+
+    /**
+     * Sets the download policy.
+     * @param downloadPolicy the download policy
+     * @see #getUploadPolicy()
+     * @since 13453
+     */
+    public void setDownloadPolicy(DownloadPolicy downloadPolicy) {
+        this.downloadPolicy = downloadPolicy;
     }
 
@@ -529 +600 @@
      */
     public Collection<OsmPrimitive> allNonDeletedPhysicalPrimitives() {
-        return getPrimitives(primitive -> !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation));
+        return getPrimitives(
+                primitive -> !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation));
     }
 
@@ -565 +637 @@
             if (getPrimitiveById(primitive) != null)
                 throw new DataIntegrityProblemException(
-                        tr("Unable to add primitive {0} to the dataset because it is already included", primitive.toString()));
+                        tr("Unable to add primitive {0} to the dataset because it is already included",
+                                primitive.toString()));
 
             allPrimitives.add(primitive);
@@ -690 +763 @@
      */
     public Collection<OsmPrimitive> getSelectedNodesAndWays() {
-        return new SubclassFilteredCollection<>(getSelected(), primitive -> primitive instanceof Node || primitive instanceof Way);
+        return new SubclassFilteredCollection<>(getSelected(),
+                primitive -> primitive instanceof Node || primitive instanceof Way);
     }
 
@@ -1006 +1080 @@
         OsmPrimitive result = getPrimitiveById(primitiveId);
         if (result == null && primitiveId != null) {
-            Logging.warn(tr("JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
-                    + "at {2}. This is not a critical error, it should be safe to continue in your work.",
+            Logging.warn(tr(
+                    "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
+                            + "at {2}. This is not a critical error, it should be safe to continue in your work.",
                     primitiveId.getType(), Long.toString(primitiveId.getUniqueId()), Main.getJOSMWebsite()));
             Logging.error(new Exception());
@@ -1115 +1190 @@
      */
     public boolean isModified() {
-        for (OsmPrimitive p: allPrimitives) {
+        for (OsmPrimitive p : allPrimitives) {
             if (p.isModified())
                 return true;
@@ -1128 +1203 @@
      */
     public boolean requiresUploadToServer() {
-        for (OsmPrimitive p: allPrimitives) {
+        for (OsmPrimitive p : allPrimitives) {
             if (APIOperation.of(p) != null)
                 return true;
@@ -1199 +1274 @@
                 try {
                     if (eventsToFire.size() < MAX_SINGLE_EVENTS) {
-                        for (AbstractDatasetChangedEvent event: eventsToFire) {
+                        for (AbstractDatasetChangedEvent event : eventsToFire) {
                             fireEventToListeners(event);
                         }
@@ -1219 +1294 @@
 
     private void fireEventToListeners(AbstractDatasetChangedEvent event) {
-        for (DataSetListener listener: listeners) {
+        for (DataSetListener listener : listeners) {
             event.fire(listener);
         }
@@ -1260 +1335 @@
 
     void fireChangesetIdChanged(OsmPrimitive primitive, int oldChangesetId, int newChangesetId) {
-        fireEvent(new ChangesetIdChangedEvent(this, Collections.singletonList(primitive), oldChangesetId, newChangesetId));
+        fireEvent(new ChangesetIdChangedEvent(this, Collections.singletonList(primitive), oldChangesetId,
+                newChangesetId));
     }
 
@@ -1283 +1359 @@
      */
     public void invalidateEastNorthCache() {
-        if (Main.getProjection() == null) return; // sanity check
+        if (Main.getProjection() == null)
+            return; // sanity check
         beginUpdate();
         try {
-            for (Node n: getNodes()) {
+            for (Node n : getNodes()) {
                 n.invalidateEastNorthCache();
             }
@@ -1326 +1403 @@
         try {
             clearSelection();
-            for (OsmPrimitive primitive:allPrimitives) {
+            for (OsmPrimitive primitive : allPrimitives) {
                 primitive.setDataset(null);
             }
@@ -1343 +1420 @@
     public void deleteInvisible() {
         checkModifiable();
-        for (OsmPrimitive primitive:allPrimitives) {
+        for (OsmPrimitive primitive : allPrimitives) {
             if (!primitive.isVisible()) {
                 primitive.setDeleted(true);
@@ -1454 +1531 @@
 
     @Override
-    public void setReadOnly() {
+    public void lock() {
         if (!isReadOnly.compareAndSet(false, true)) {
             Logging.warn("Trying to set readOnly flag on a readOnly dataset ", getName());
@@ -1461 +1538 @@
 
     @Override
-    public void unsetReadOnly() {
+    public void unlock() {
         if (!isReadOnly.compareAndSet(true, false)) {
             Logging.warn("Trying to unset readOnly flag on a non-readOnly dataset ", getName());
@@ -1468 +1545 @@
 
     @Override
-    public boolean isReadOnly() {
+    public boolean isLocked() {
         return isReadOnly.get();
     }
@@ -1477 +1554 @@
      */
     private void checkModifiable() {
-        if (isReadOnly()) {
+        if (isLocked()) {
             throw new IllegalStateException("DataSet is read-only");
         }

trunk/src/org/openstreetmap/josm/data/osm/Lockable.java

@@ -3 +3 @@
 
 /**
- * To be implemented by modifiable objects to offer a "read-only" mode.
- * @since 13434
+ * To be implemented by modifiable objects to offer a "read-only/locked" mode.
+ * @since 13453
  */
-public interface ReadOnly {
+public interface Lockable {
 
     /**
-     * Enables the read-only mode.
+     * Enables the read-only/locked mode.
      */
-    void setReadOnly();
+    void lock();
 
     /**
-     * Disables the read-only mode.
+     * Disables the read-only/locked mode.
      */
-    void unsetReadOnly();
+    void unlock();
 
     /**
-     * Determines if this is read-only (thus it cannot be modified).
-     * @return {@code true} if this is read-only
+     * Determines if this is read-only/locked (thus it cannot be modified).
+     * @return {@code true} if this is read-only/locked
      */
-    boolean isReadOnly();
+    boolean isLocked();
 }

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -279 +279 @@
      */
     protected final void checkDatasetNotReadOnly() {
-        if (dataSet != null && dataSet.isReadOnly())
+        if (dataSet != null && dataSet.isLocked())
             throw new DataIntegrityProblemException("Primitive cannot be modified in read-only dataset: " + toString());
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -128 +128 @@
      */
     public void drawVirtualNodes(DataSet data, BBox bbox) {
-        if (virtualNodeSize == 0 || data == null || bbox == null || data.isReadOnly())
+        if (virtualNodeSize == 0 || data == null || bbox == null || data.isLocked())
             return;
         // print normal virtual nodes

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -360 +360 @@
     public boolean isFixable() {
         return (fixingCommand != null || ((tester != null) && tester.isFixable(this)))
-                && primitives.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isReadOnly);
+                && primitives.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isLocked);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -353 +353 @@
             DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
             if (ds != null && isDoubleClick(e)) {
-                if (e.isControlDown() && !ds.isReadOnly()) {
+                if (e.isControlDown() && !ds.isLocked()) {
                     editCurrentRelation();
                 } else {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -41 +41 @@
             int answer = t.showDialog(selection, false);
 
-            if (answer == TaggingPreset.DIALOG_ANSWER_APPLY && !selection.iterator().next().getDataSet().isReadOnly()) {
+            if (answer == TaggingPreset.DIALOG_ANSWER_APPLY && !selection.iterator().next().getDataSet().isLocked()) {
                 presetHandler.updateTags(t.getChangedTags());
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -490 +490 @@
         MainApplication.getMap().relationListDialog.selectRelation(relation);
         OsmDataLayer layer = MainApplication.getLayerManager().getActiveDataLayer();
-        if (!layer.isReadOnly()) {
+        if (!layer.isLocked()) {
             RelationEditor.getEditor(
                     layer, relation, ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
@@ -647 +647 @@
 
         DataSet ds = Main.main.getActiveDataSet();
-        boolean isReadOnly = ds != null && ds.isReadOnly();
+        boolean isReadOnly = ds != null && ds.isLocked();
         boolean hasSelection = !newSel.isEmpty();
         boolean hasTags = hasSelection && tagData.getRowCount() > 0;
@@ -1060 +1060 @@
         protected final void updateEnabledState() {
             DataSet ds = Main.main.getActiveDataSet();
-            setEnabled(ds != null && !ds.isReadOnly() &&
+            setEnabled(ds != null && !ds.isLocked() &&
                     ((tagTable != null && tagTable.getSelectedRowCount() >= 1)
                     || (membershipTable != null && membershipTable.getSelectedRowCount() > 0)
@@ -1116 +1116 @@
         protected void updateEnabledState() {
             DataSet ds = Main.main.getActiveDataSet();
-            setEnabled(ds != null && !ds.isReadOnly() &&
+            setEnabled(ds != null && !ds.isLocked() &&
                     ((tagTable != null && tagTable.getSelectedRowCount() == 1)
                     ^ (membershipTable != null && membershipTable.getSelectedRowCount() == 1)
@@ -1271 +1271 @@
             Collection<OsmPrimitive> sel = Main.main.getInProgressSelection();
             String clipboard = ClipboardUtils.getClipboardStringContent();
-            if (sel.isEmpty() || clipboard == null || sel.iterator().next().getDataSet().isReadOnly())
+            if (sel.isEmpty() || clipboard == null || sel.iterator().next().getDataSet().isLocked())
                 return;
             MainApplication.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -564 +564 @@
         public void setupDialog() {
             super.setupDialog();
-            buttons.get(0).setEnabled(!Main.main.getActiveDataSet().isReadOnly());
+            buttons.get(0).setEnabled(!Main.main.getActiveDataSet().isLocked());
             final Dimension size = getSize();
             // Set resizable only in width

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();
                 }
             }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
-import org.openstreetmap.josm.data.osm.ReadOnly;
+import org.openstreetmap.josm.data.osm.Lockable;
 import org.openstreetmap.josm.gui.io.AbstractIOTask;
 import org.openstreetmap.josm.gui.io.AbstractUploadDialog;
@@ -11 +11 @@
  * @since 7358
  */
-public abstract class AbstractModifiableLayer extends Layer implements UploadToServer, SaveToFile, ReadOnly {
+public abstract class AbstractModifiableLayer extends Layer implements DownloadFromServer, UploadToServer, SaveToFile, Lockable {
 
     /**
@@ -19 +19 @@
     public AbstractModifiableLayer(String name) {
         super(name);
+    }
+
+    @Override
+    public boolean isDownloadable() {
+        // Override if needed
+        return false;
     }
 
@@ -83 +89 @@
 
     @Override
-    public void setReadOnly() {
+    public void lock() {
         // Override if needed
     }
 
     @Override
-    public void unsetReadOnly() {
+    public void unlock() {
         // Override if needed
     }
 
     @Override
-    public boolean isReadOnly() {
+    public boolean isLocked() {
         // Override if needed
         return false;

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

@@ -376 +376 @@
      */
     public synchronized OsmDataLayer getEditLayer() {
-        if (dataLayer != null && !dataLayer.isReadOnly())
+        if (dataLayer != null && !dataLayer.isLocked())
             return dataLayer;
         else
@@ -402 +402 @@
      */
     public synchronized DataSet getEditDataSet() {
-        if (dataLayer != null && !dataLayer.isReadOnly()) {
+        if (dataLayer != null && !dataLayer.isLocked()) {
             return dataLayer.data;
         } else {
@@ -509 +509 @@
         GuiHelper.assertCallFromEdt();
         layer.setUploadInProgress();
-        layer.setReadOnly();
+        layer.lock();
 
         // Reset only the edit layer as empty
@@ -528 +528 @@
     public synchronized void processLayerAfterUpload(OsmDataLayer layer) {
         GuiHelper.assertCallFromEdt();
-        layer.unsetReadOnly();
+        layer.unlock();
         layer.unsetUploadInProgress();
 

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

@@ -134 +134 @@
 
     @Override
+    public boolean isDownloadable() {
+        return true;
+    }
+
+    @Override
     public boolean isUploadable() {
         return true;

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();
     }
 

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

@@ -8 +8 @@
 /**
  * Interface for layers that can upload data.
+ * @see DownloadFromServer
  * @since 9751
  */

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -493 +493 @@
 
             answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),
-                    sel.isEmpty() || sel.iterator().next().getDataSet().isReadOnly(), showNewRelation).getValue();
+                    sel.isEmpty() || sel.iterator().next().getDataSet().isLocked(), showNewRelation).getValue();
         }
         if (!showNewRelation && answer == 2)

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();