Changeset 13504 in josm for trunk/src/org

Timestamp:

2018-03-04T19:22:49+01:00 (6 years ago)

Author:

Don-vip

Message:

see #11924, see #15560 - fix deprecation warning with Java 10

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/widgets/TextContextualPopupMenu.java (modified) (3 diffs)
• tools/PlatformHook.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -5 +5 @@
 
 import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -23 +22 @@
 import javax.swing.undo.UndoManager;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -86 +86 @@
                 if (!GraphicsEnvironment.isHeadless()) {
                     component.getInputMap().put(
-                            KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), undoAction);
+                            KeyStroke.getKeyStroke(KeyEvent.VK_Z, Main.platform.getMenuShortcutKeyMaskEx()), undoAction);
                     component.getInputMap().put(
-                            KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), redoAction);
+                            KeyStroke.getKeyStroke(KeyEvent.VK_Y, Main.platform.getMenuShortcutKeyMaskEx()), redoAction);
                 }
             }

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

@@ -284 +284 @@
      */
     default int getMenuShortcutKeyMaskEx() {
+        // To remove when switching to Java 10+, and use Toolkit.getMenuShortcutKeyMaskEx instead
         return KeyEvent.CTRL_DOWN_MASK;
     }