diff --git a/modules/controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirer.java b/modules/controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirer.java --- a/modules/controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirer.java +++ b/modules/controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirer.java @@ -85,8 +85,8 @@ return new KeyEvent(null, target, // EventTarget evtType, // eventType - evtType == KeyEvent.KEY_TYPED ? keyCode.impl_getChar() : null, // Character (unused unless evtType == KEY_TYPED) - keyCode.impl_getChar(), // text + evtType == KeyEvent.KEY_TYPED ? keyCode.getChar() : null, // Character (unused unless evtType == KEY_TYPED) + keyCode.getChar(), // text keyCode, // KeyCode ml.contains(KeyModifier.SHIFT), // shiftDown ml.contains(KeyModifier.CTRL), // ctrlDown diff --git a/modules/controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java b/modules/controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java --- a/modules/controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java +++ b/modules/controls/src/test/java/test/com/sun/javafx/scene/control/inputmap/InputMapTest.java @@ -134,8 +134,8 @@ // return new KeyEvent(null, // target, // EventTarget // evtType, // eventType -// evtType == KeyEvent.KEY_TYPED ? keyCode.impl_getChar() : null, // Character (unused unless evtType == KEY_TYPED) -// keyCode.impl_getChar(), // text +// evtType == KeyEvent.KEY_TYPED ? keyCode.getChar() : null, // Character (unused unless evtType == KEY_TYPED) +// keyCode.getChar(), // text // keyCode, // KeyCode // false, // shiftDown // false, // ctrlDown diff --git a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java --- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java +++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java @@ -1455,7 +1455,7 @@ KeyCode code = ((KeyCodeCombination)kc).getCode(); if (!isCmdCharBased(code)) { @SuppressWarnings("deprecation") - int keyCode = code.impl_getCode(); + int keyCode = code.getCode(); result = MacApplication._getMacKey(keyCode); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/scene/input/KeyCodeMap.java b/modules/graphics/src/main/java/com/sun/javafx/scene/input/KeyCodeMap.java --- a/modules/graphics/src/main/java/com/sun/javafx/scene/input/KeyCodeMap.java +++ b/modules/graphics/src/main/java/com/sun/javafx/scene/input/KeyCodeMap.java @@ -44,7 +44,7 @@ charMap = new HashMap(KeyCode.values().length); for (KeyCode c : KeyCode.values()) { - charMap.put(c.impl_getCode(), c); + charMap.put(c.getCode(), c); } } diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java @@ -39,22 +39,17 @@ import com.sun.glass.ui.MenuItem; import com.sun.glass.ui.Pixels; -import java.util.ArrayList; import java.util.List; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.beans.InvalidationListener; -import javafx.beans.Observable; -import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCombination; import javafx.scene.input.KeyCharacterCombination; import javafx.scene.input.KeyCodeCombination; -import javafx.scene.Node; class GlassSystemMenu implements TKSystemMenu { @@ -320,11 +315,11 @@ assert PlatformUtil.isMac() || PlatformUtil.isLinux(); int modifier = glassModifiers(kcc); if (PlatformUtil.isMac()) { - int finalCode = code.isLetterKey() ? code.impl_getChar().toUpperCase().charAt(0) - : code.impl_getCode(); + int finalCode = code.isLetterKey() ? code.getChar().toUpperCase().charAt(0) + : code.getCode(); glassSubMenuItem.setShortcut(finalCode, modifier); } else if (PlatformUtil.isLinux()) { - String lower = code.impl_getChar().toLowerCase(); + String lower = code.getChar().toLowerCase(); if ((modifier & KeyEvent.MODIFIER_CONTROL) != 0) { glassSubMenuItem.setShortcut(lower.charAt(0), modifier); } else { @@ -368,10 +363,10 @@ if (kcc instanceof KeyCodeCombination) { KeyCode kcode = ((KeyCodeCombination)kcc).getCode(); - int code = kcode.impl_getCode(); + int code = kcode.getCode(); - if (((code >= KeyCode.F1.impl_getCode()) && (code <= KeyCode.F12.impl_getCode())) || - ((code >= KeyCode.F13.impl_getCode()) && (code <= KeyCode.F24.impl_getCode()))) { + if (((code >= KeyCode.F1.getCode()) && (code <= KeyCode.F12.getCode())) || + ((code >= KeyCode.F13.getCode()) && (code <= KeyCode.F24.getCode()))) { ret += KeyEvent.MODIFIER_FUNCTION; } } diff --git a/modules/graphics/src/main/java/javafx/scene/input/KeyCharacterCombination.java b/modules/graphics/src/main/java/javafx/scene/input/KeyCharacterCombination.java --- a/modules/graphics/src/main/java/javafx/scene/input/KeyCharacterCombination.java +++ b/modules/graphics/src/main/java/javafx/scene/input/KeyCharacterCombination.java @@ -112,7 +112,7 @@ if (event.getCode() == KeyCode.UNDEFINED) { return false; } - return (event.getCode().impl_getCode() + return (event.getCode().getCode() == Toolkit.getToolkit().getKeyCodeForChar(getCharacter())) && super.match(event); } diff --git a/modules/graphics/src/main/java/javafx/scene/input/KeyCode.java b/modules/graphics/src/main/java/javafx/scene/input/KeyCode.java --- a/modules/graphics/src/main/java/javafx/scene/input/KeyCode.java +++ b/modules/graphics/src/main/java/javafx/scene/input/KeyCode.java @@ -1290,21 +1290,21 @@ } /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version + * Returns the character element of this key code, which is simply a mapping of the underlying platform code + * returned by {@link #getCode()}. + * + * @since 9 */ - @Deprecated - public String impl_getChar() { + public final String getChar() { return ch; } /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version + * Returns the underlying platform code used to represent the {@link #getChar() character} in the key code. + * + * @since 9 */ - // SB-dependency: RT-22749 has been filed to track this - @Deprecated - public int impl_getCode() { + public final int getCode() { return code; } diff --git a/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java b/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java --- a/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java +++ b/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java @@ -620,7 +620,7 @@ if (charToKeyCodeMap != null) { final KeyCode keyCode = charToKeyCodeMap.get(character); if (keyCode != null) { - return keyCode.impl_getCode(); + return keyCode.getCode(); } } diff --git a/modules/graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java b/modules/graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java --- a/modules/graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java +++ b/modules/graphics/src/test/java/test/javafx/scene/input/KeyCodeTest.java @@ -38,7 +38,7 @@ @Test public void shouldGetCharacter() { for (KeyCode code : KeyCode.values()) { - String chr = code.impl_getChar(); + String chr = code.getChar(); assertNotNull(chr); assertFalse(chr.isEmpty()); } @@ -47,7 +47,7 @@ @Test public void shouldFindCorrectCode() { for (KeyCode code : KeyCode.values()) { - assertSame(code, KeyCodeMap.valueOf(code.impl_getCode())); + assertSame(code, KeyCodeMap.valueOf(code.getCode())); } } } diff --git a/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java b/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java --- a/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java +++ b/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java @@ -26,9 +26,7 @@ package javafx.embed.swing; import javafx.beans.InvalidationListener; -import javafx.beans.Observable; import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; import javafx.event.EventHandler; import javafx.event.EventType; import javafx.geometry.Point2D; @@ -39,7 +37,6 @@ import javafx.scene.input.MouseButton; import javafx.scene.input.MouseEvent; import javafx.scene.input.ScrollEvent; -import javafx.stage.Screen; import javafx.stage.Window; import javax.swing.JComponent; import java.awt.AWTEvent; @@ -58,7 +55,6 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.WindowEvent; import java.awt.event.WindowFocusListener; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.IntBuffer; import java.security.AccessController; @@ -76,11 +72,9 @@ import com.sun.javafx.sg.prism.NGExternalNode; import com.sun.javafx.sg.prism.NGNode; import com.sun.javafx.stage.FocusUngrabEvent; -import com.sun.javafx.stage.ScreenHelper; import com.sun.javafx.stage.WindowHelper; import com.sun.javafx.PlatformUtil; import sun.awt.UngrabEvent; -import sun.awt.LightweightFrame; import sun.swing.JLightweightFrame; import sun.swing.LightweightContent; @@ -972,7 +966,7 @@ return; } int swingModifiers = SwingEvents.fxKeyModsToKeyMods(event); - int swingKeyCode = event.getCode().impl_getCode(); + int swingKeyCode = event.getCode().getCode(); char swingChar = event.getCharacter().charAt(0); // A workaround. Some swing L&F's process mnemonics on KEY_PRESSED, diff --git a/modules/web/src/main/java/com/sun/javafx/webkit/drt/EventSender.java b/modules/web/src/main/java/com/sun/javafx/webkit/drt/EventSender.java --- a/modules/web/src/main/java/com/sun/javafx/webkit/drt/EventSender.java +++ b/modules/web/src/main/java/com/sun/javafx/webkit/drt/EventSender.java @@ -30,10 +30,8 @@ import com.sun.webkit.event.WCKeyEvent; import com.sun.webkit.event.WCMouseEvent; import com.sun.webkit.event.WCMouseWheelEvent; -import java.util.ArrayList; + import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import javafx.scene.input.KeyCode; @@ -64,7 +62,7 @@ MAP.put("printScreen", KeyCode.PRINTSCREEN); MAP.put("menu", KeyCode.CONTEXT_MENU); for (KeyCode code : KeyCode.values()) { - MAP.put(code.impl_getCode(), code); + MAP.put(code.getCode(), code); MAP.put(code.getName().toLowerCase(), code); MAP.put(code.getName(), code); }