Changeset 11485 in josm for trunk/src/org

Timestamp:

2017-01-21T09:59:53+01:00 (8 years ago)

Author:

wiktorn

Message:

Fix NPE in RelationEditor

Handle uncommon situation that user has no keystroke assigned to copy/paste action which resulted in NullPointerException.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)

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

@@ -272 +272 @@
         // CHECKSTYLE.ON: LineLength
 
-        registerCopyPasteAction(new PasteMembersAction(memberTable, getLayer(), this) {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                super.actionPerformed(e);
-                tfRole.requestFocusInWindow();
-            }
-        }, "PASTE_MEMBERS", Shortcut.getPasteKeyStroke(), getRootPane(), memberTable, selectionTable);
-
-        registerCopyPasteAction(new CopyMembersAction(memberTableModel, getLayer(), this),
-                "COPY_MEMBERS", Shortcut.getCopyKeyStroke(), getRootPane(), memberTable, selectionTable);
-
+        KeyStroke key = Shortcut.getPasteKeyStroke();
+        if (key != null) {
+            // handle uncommon situation, that user has no keystroke assigned to paste
+            registerCopyPasteAction(new PasteMembersAction(memberTable, getLayer(), this) {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    super.actionPerformed(e);
+                    tfRole.requestFocusInWindow();
+                }
+            }, "PASTE_MEMBERS", key, getRootPane(), memberTable, selectionTable);
+        }
+        key = Shortcut.getCopyKeyStroke();
+        if (key != null) {
+            // handle uncommon situation, that user has no keystroke assigned to paste
+            registerCopyPasteAction(new CopyMembersAction(memberTableModel, getLayer(), this),
+                    "COPY_MEMBERS", key, getRootPane(), memberTable, selectionTable);
+        }
         tagEditorPanel.setNextFocusComponent(memberTable);
         selectionTable.setFocusable(false);