Changeset 15476 in josm for trunk/src

Timestamp:

2019-10-26T14:58:45+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18259 - disable delete action for already deleted relations

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AbstractRelationAction.java (modified) (3 diffs)
• DeleteRelationsAction.java (modified) (2 diffs)
• EditRelationAction.java (modified) (2 diffs)

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.OsmData;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -52 +55 @@
     }
 
+    protected final boolean canModify() {
+        SubclassFilteredCollection<IRelation<?>, Relation> filteredRelations = Utils.filteredCollection(relations, Relation.class);
+        return OsmUtils.isOsmCollectionEditable(filteredRelations) && filteredRelations.parallelStream().anyMatch(r -> !r.isDeleted());
+    }
+
     protected final boolean canDownload() {
         if (relations.isEmpty()) {
@@ -60 +68 @@
             && ds != null && !ds.isLocked() && DownloadPolicy.BLOCKED != ds.getDownloadPolicy();
     }
-    
+
     protected void setHelpId(String helpId) {
         putValue("help", helpId);

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
-import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -52 +51 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(OsmUtils.isOsmCollectionEditable(relations));
+        setEnabled(canModify());
     }
 }

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -87 +86 @@
     @Override
     protected void updateEnabledState() {
-        boolean enabled = false;
-        SubclassFilteredCollection<IRelation<?>, Relation> filteredRelations = Utils.filteredCollection(relations, Relation.class);
-        if (OsmUtils.isOsmCollectionEditable(filteredRelations)) {
-            for (Relation r : filteredRelations) {
-                if (!r.isDeleted()) {
-                    enabled = true;
-                    break;
-                }
-            }
-        }
-        setEnabled(enabled);
+        setEnabled(canModify());
     }
 }