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

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• JosmAction.java (modified) (2 diffs)
• MergeNodesAction.java (modified) (1 diff)
• MoveNodeAction.java (modified) (1 diff)
• ReverseWayAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• mapmode/MapMode.java (modified) (1 diff)
• relation/AddSelectionToRelations.java (modified) (1 diff)
• relation/DeleteRelationsAction.java (modified) (1 diff)
• relation/DownloadMembersAction.java (modified) (1 diff)
• relation/DownloadSelectedIncompleteMembersAction.java (modified) (1 diff)
• relation/DuplicateRelationAction.java (modified) (1 diff)
• relation/EditRelationAction.java (modified) (1 diff)

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