Ticket #23447: 23447.patch

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

@@ -156 +156 @@
      */
     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.
      */
     private final ArrayList<FlavorListener> clipboardListeners = new ArrayList<>();
@@ -265 +269 @@
         // Action for performing the {@link DuplicateRelationAction}
         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);
         this.tagEditorPanel.getModel().addTableModelListener(applyAction);
@@ -405 +409 @@
     /**
      * builds the panel with the OK and the Cancel button
      * @param okAction OK action
+     * @param deleteAction Delete action
      * @param cancelAction Cancel action
      *
      * @return the panel with the OK and the Cancel button
@@ -1076 +1081 @@
 
     @Override
     public void commandChanged(int queueSize, int redoSize) {
+        deleteAction.updateEnabledState();
         Relation r = getRelation();
         if (r != null && r.getDataSet() == null) {
             // see #19915

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

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