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

Timestamp:

2011-09-29T00:42:28+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #6707 - Removing a empty polygon (removed shape first, then on validation error try to remove polygon)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DeleteAction.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)

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

@@ -316 +316 @@
             // cmd can be null if the user cancels dialogs DialogCommand displays
             Main.main.undoRedo.add(cmd);
+            if (getCurrentDataSet().getSelectedRelations().contains(toDelete)) {
+                getCurrentDataSet().toggleSelected(toDelete);
+            }
             RelationDialogManager.getRelationDialogManager().close(layer, toDelete);
         }

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

@@ -329 +329 @@
         public void actionPerformed(ActionEvent e) {
             if (!isEnabled()) return;
-            int [] idx  = displaylist.getSelectedIndices();
-            ArrayList<Relation> toDelete = new ArrayList<Relation>(idx.length);
-            for (int i: idx) {
-                toDelete.add(model.getRelation(i));
-            }
-            for (Relation r: toDelete) {
-                deleteRelation(r);
+            for (int i: displaylist.getSelectedIndices()) {
+                deleteRelation(model.getRelation(i));
             }
         }