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

Timestamp:

01.02.2012 20:12:46 (4 months ago)

Author:

simon04

Message:

#fix #7344 - Deleting multiple relations ends in failure

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -16 +16 @@
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -337 +338 @@
 
         public void actionPerformed(ActionEvent e) {
-            if (!isEnabled()) return;
-            for (int i: displaylist.getSelectedIndices()) {
-                deleteRelation(model.getRelation(i));
-            }
+            if (!isEnabled()) {
+                return;
+            }
+            List<Relation> toDelete = new LinkedList<Relation>();
+            for (int i : displaylist.getSelectedIndices()) {
+                toDelete.add(model.getRelation(i));
+            }
+            for (Relation r : toDelete) {
+                deleteRelation(r);
+            }
+            displaylist.clearSelection();
         }