Changeset 12763 in josm for trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

Timestamp:

2017-09-06T22:44:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - see #13036 - remove last GUI stuff from DeleteCommand

File:

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

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationToChildReference;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.dialogs.DeleteFromRelationConfirmationDialog;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -45 +47 @@
         public boolean confirmRelationDeletion(Collection<Relation> relations) {
             return DeleteAction.confirmRelationDeletion(relations);
+        }
+
+        @Override
+        public boolean confirmDeletionFromRelation(Collection<RelationToChildReference> references) {
+            DeleteFromRelationConfirmationDialog dialog = DeleteFromRelationConfirmationDialog.getInstance();
+            dialog.getModel().populate(references);
+            dialog.setVisible(true);
+            return !dialog.isCanceled();
         }
     };