Changeset 17007 in josm for trunk

Timestamp:

2020-09-03T22:12:24+02:00 (4 years ago)

Author:

simon04

Message:

fix #19753 - NPE in CopyAllKeyValueAction due to shortcut re-assignment

Location:

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

Files:

• CopyAllKeyValueAction.java (modified) (1 diff)
• PropertiesDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/CopyAllKeyValueAction.java

@@ -33 +33 @@
         putValue(NAME, tr("Copy all Keys/Values"));
         putValue(SHORT_DESCRIPTION, tr("Copy the key and value of all the tags to clipboard"));
+    }
+
+    /**
+     * Registers this action shortcut
+     * @return this instance, for easy chaining
+     */
+    CopyAllKeyValueAction registerShortcut() {
         Shortcut sc = Shortcut.registerShortcut("system:copytags", tr("Edit: {0}", tr("Copy Tags")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
         MainApplication.registerActionShortcut(this, sc);
         sc.setAccelerator(this);
+        return this;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -205 +205 @@
             tagTable, editHelper::getDataKey, OsmDataManager.getInstance()::getInProgressISelection);
     private final CopyAllKeyValueAction copyAllKeyValueAction = new CopyAllKeyValueAction(
-            tagTable, editHelper::getDataKey, OsmDataManager.getInstance()::getInProgressISelection);
+            tagTable, editHelper::getDataKey, OsmDataManager.getInstance()::getInProgressISelection).registerShortcut();
     private final SearchAction searchActionSame = new SearchAction(true);
     private final SearchAction searchActionAny = new SearchAction(false);