Changeset 12519 in josm for trunk

Timestamp:

2017-07-26T23:45:33+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11924 - fix 2 more warnings about extended modifiers

File:

• trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) (2 diffs)

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

@@ -206 +206 @@
     public boolean isEvent(KeyEvent e) {
         KeyStroke ks = getKeyStroke();
-        return ks != null && ks.equals(KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiers()));
+        return ks != null && ks.equals(KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiersEx()));
     }
 
@@ -256 +256 @@
         KeyStroke keyStroke = getKeyStroke();
         if (keyStroke == null) return "";
-        String modifText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
+        String modifText = KeyEvent.getModifiersExText(keyStroke.getModifiers());
         if ("".equals(modifText)) return KeyEvent.getKeyText(keyStroke.getKeyCode());
         return modifText + '+' + KeyEvent.getKeyText(keyStroke.getKeyCode());