Changeset 18967 in josm for trunk/src

Timestamp:

2024-02-01T13:56:33+01:00 (21 months ago)

Author:

GerdP

Message:

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

• disable the delete action in the relation editor if the relation has the status deleted
• in DeleteCurrentRelationAction updateEnabledState() now uses getRelaion() instead of getRelationSnapshot(), similar to the actionPerformed() method

Location:

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

Files:

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

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.
      */
@@ -266 +270 @@
         final DuplicateRelationAction duplicateAction = new DuplicateRelationAction(actionAccess);
         // Action for performing the {@link DeleteCurrentRelationAction}
-        final DeleteCurrentRelationAction deleteAction = new DeleteCurrentRelationAction(actionAccess);
+        deleteAction = new DeleteCurrentRelationAction(actionAccess);
 
         this.memberTableModel.addTableModelListener(applyAction);
@@ -406 +410 @@
      * builds the panel with the OK and the Cancel button
      * @param okAction OK action
+     * @param deleteAction Delete action
      * @param cancelAction Cancel action
      *
@@ -1077 +1082 @@
     @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

@@ -40 +40 @@
 
     @Override
-    protected void updateEnabledState() {
-        setEnabled(getEditor().getRelationSnapshot() != null);
+    public void updateEnabledState() {
+        Relation r = getEditor().getRelation();
+        setEnabled(r != null && !r.isDeleted());
     }