Changeset 15126 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-05-27T22:32:48+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #15030 - make sure deleting a relation effectively removes it from selection

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.command.Command;
@@ -356 +358 @@
         if (cmd != null) {
             // cmd can be null if the user cancels dialogs DialogCommand displays
+            List<Relation> toUnselect = toDelete.stream().filter(Relation::isSelected).collect(Collectors.toList());
             UndoRedoHandler.getInstance().add(cmd);
-            for (Relation relation : toDelete) {
-                if (layer.data.getSelectedRelations().contains(relation)) {
-                    layer.data.toggleSelected(relation);
-                }
-                RelationDialogManager.getRelationDialogManager().close(layer, relation);
-            }
+            toDelete.forEach(relation -> RelationDialogManager.getRelationDialogManager().close(layer, relation));
+            toUnselect.forEach(layer.data::toggleSelected);
         }
     }