Changeset 13453 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java (modified) (4 diffs)

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;