Changeset 14691 in josm for trunk

Timestamp:

2019-01-13T13:25:50+01:00 (6 years ago)

Author:

simon04

Message:

see #17202 - Fix NPE in UploadDialogTest

File:

• trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java

@@ -129 +129 @@
         c.getActionMap().put("ctrl_enter", a);
         c.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(stroke, "ctrl_enter");
-        Optional.ofNullable(a.getValue(Action.SHORT_DESCRIPTION))
+        Optional.ofNullable(a)
+                .map(x -> x.getValue(Action.SHORT_DESCRIPTION))
                 .map(String::valueOf)
                 .ifPresent(text -> Shortcut.setTooltip(a, text, stroke));