Changeset 18968 in josm for trunk

Timestamp:

2024-02-02T15:25:09+01:00 (11 months ago)

Author:

GerdP

Message:

fix #23447:Fatal "crash" attempting to delete all "Outer" members & then multipolygon

• revert changes from r18967
• simply close relation editor dialog for the already deleted relation instead of generating an additional delete command

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (4 diffs)
• actions/DeleteCurrentRelationAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -157 +157 @@
     private final CancelAction cancelAction;
     /**
-     * Action for performing the {@link DeleteCurrentRelationAction}
-     */
-    private final DeleteCurrentRelationAction deleteAction;
-    /**
      * A list of listeners that need to be notified on clipboard content changes.
      */
@@ -270 +266 @@
         final DuplicateRelationAction duplicateAction = new DuplicateRelationAction(actionAccess);
         // Action for performing the {@link DeleteCurrentRelationAction}
-        deleteAction = new DeleteCurrentRelationAction(actionAccess);
+        final DeleteCurrentRelationAction deleteAction = new DeleteCurrentRelationAction(actionAccess);
 
         this.memberTableModel.addTableModelListener(applyAction);
@@ -410 +406 @@
      * builds the panel with the OK and the Cancel button
      * @param okAction OK action
-     * @param deleteAction Delete action
      * @param cancelAction Cancel action
      *
@@ -1082 +1077 @@
     @Override
     public void commandChanged(int queueSize, int redoSize) {
-        deleteAction.updateEnabledState();
         Relation r = getRelation();
         if (r != null && r.getDataSet() == null) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java

@@ -9 +9 @@
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -36 +39 @@
         if (toDelete == null)
             return;
+        if (toDelete.isDeleted()) {
+            // see #23447
+            OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();
+            if (layer != null) {
+                RelationDialogManager.getRelationDialogManager().close(layer, toDelete);
+            }
+            return;
+        }
         DeleteAction.deleteRelation(getLayer(), toDelete);
     }
 
     @Override
-    public void updateEnabledState() {
-        Relation r = getEditor().getRelation();
-        setEnabled(r != null && !r.isDeleted());
+    protected void updateEnabledState() {
+        setEnabled(getEditor().getRelationSnapshot() != null);
     }