archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 18:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8183518: Premature deprecation of Event/InputEvent/KeyEvent in Java 9

Browse source 
Reviewed-by: prr, psadhukhan
This commit is contained in:
Sergey Bylokhov 2017-12-01 17:44:07 -08:00
parent 6a21c771ec
commit d8efdbc4a2
10 changed files with 99 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.desktop/share/classes/java/awt/MenuShortcut.java
View file

@ -24,6 +24,7 @@
*/
package java.awt;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
/**
@ -51,7 +52,7 @@ import java.awt.event.KeyEvent;
* only work if the current keyboard layout produces a corresponding letter.
* <p>
* The accelerator key is platform-dependent and may be obtained
* via {@link Toolkit#getMenuShortcutKeyMask}.
* via {@link Toolkit#getMenuShortcutKeyMaskEx()}.
*
* @author Thomas Ball
* @since 1.1
@ -180,16 +181,15 @@ public class MenuShortcut implements java.io.Serializable
* @return a string representation of this MenuShortcut.
* @since 1.1
*/
@SuppressWarnings("deprecation")
public String toString() {
int modifiers = 0;
if (!GraphicsEnvironment.isHeadless()) {
modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
}
if (usesShiftModifier()) {
modifiers |= Event.SHIFT_MASK;
modifiers |= InputEvent.SHIFT_DOWN_MASK;
}
return KeyEvent.getKeyModifiersText(modifiers) + "+" +
return InputEvent.getModifiersExText(modifiers) + "+" +
KeyEvent.getKeyText(key);
}