Changeset 13453 in josm for trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.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/layer/MainLayerManager.java (modified) (4 diffs)

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