Changeset 19397 in josm

Timestamp:

2025-05-04T12:21:01+02:00 (3 days ago)

Author:

stoecker

Message:

fix #22879 - Cut keyboard shortcuts doesn't work after reverting order of relation members

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java (modified) (1 diff)

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

@@ -309 +309 @@
         if (key != null) {
             // handle uncommon situation, that user has no keystroke assigned to copy
-            registerCopyPasteAction(new CopyMembersAction(actionAccess),
+            registerCopyPasteAction(new CopyMembersAction(actionAccess, true),
                     "COPY_MEMBERS", key, getRootPane(), memberTable, selectionTable);
+        }
+        key = Shortcut.getCutKeyStroke();
+        if (key != null) {
+            // handle uncommon situation, that user has no keystroke assigned to cut
+            registerCopyPasteAction(new CopyMembersAction(actionAccess, false),
+                    "CUT_MEMBERS", key, getRootPane(), memberTable, selectionTable);
         }
         tagEditorPanel.setNextFocusComponent(memberTable);

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

@@ -15 +15 @@
 public class CopyMembersAction extends AddFromSelectionAction {
     private static final long serialVersionUID = 1L;
+    private boolean keepCopiedMembers = true;
 
     /**
      * Constructs a new {@code CopyMembersAction}.
      * @param editorAccess An interface to access the relation editor contents.
+     * @param keepCopiedMembers if true, copied members are kept in the table; otherwise they are removed (cut)
      */
-    public CopyMembersAction(IRelationEditorActionAccess editorAccess) {
+    public CopyMembersAction(IRelationEditorActionAccess editorAccess, boolean keepCopiedMembers) {
         super(editorAccess);
+        this.keepCopiedMembers = keepCopiedMembers;
     }
 
@@ -30 +33 @@
         if (!members.isEmpty()) {
             ClipboardUtils.copy(new RelationMemberTransferable(members));
+            if (!this.keepCopiedMembers) {
+                getMemberTableModel().remove(getMemberTableModel().getSelectedIndices());
+            }
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java

@@ -49 +49 @@
         new CancelAction(relationEditorAccess).actionPerformed(null);
 
-        new CopyMembersAction(relationEditorAccess).actionPerformed(null);
+        new CopyMembersAction(relationEditorAccess, true).actionPerformed(null);
+        new CopyMembersAction(relationEditorAccess, false).actionPerformed(null);
         new PasteMembersAction(relationEditorAccess).actionPerformed(null);