Changeset 12763 in josm

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DeleteAction.java (modified) (2 diffs)
• command/DeleteCommand.java (modified) (4 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();
         }
     };

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.gui.dialogs.DeleteFromRelationConfirmationDialog;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -42 +41 @@
 /**
  * A command to delete a number of primitives from the dataset.
+ * To be used correctly, this class requires an initial call to {@link #setDeletionCallback(DeletionCallback)} to
+ * allow interactive confirmation actions.
  * @since 23
  */
@@ -94 +95 @@
          */
         boolean confirmRelationDeletion(Collection<Relation> relations);
+
+        /**
+         * Confirm before removing a collection of primitives from their parent relations.
+         * @param references the list of relation-to-child references
+         * @return {@code true} if user confirms the deletion
+         * @since 12763
+         */
+        boolean confirmDeletionFromRelation(Collection<RelationToChildReference> references);
     }
 
@@ -577 +586 @@
             Set<RelationToChildReference> references = RelationToChildReference.getRelationToChildReferences(primitivesToDelete);
             references.removeIf(ref -> ref.getParent().isDeleted());
-            if (!references.isEmpty()) {
-                DeleteFromRelationConfirmationDialog dialog = DeleteFromRelationConfirmationDialog.getInstance();
-                dialog.getModel().populate(references);
-                dialog.setVisible(true);
-                if (dialog.isCanceled())
-                    return null;
+            if (!references.isEmpty() && !callback.confirmDeletionFromRelation(references)) {
+                return null;
             }
         }