Skip to content

Commit 97d70af

Browse files
8270839: Remove deprecated implementation methods from Scene
Reviewed-by: arapte, aghaisas
1 parent c490ddf commit 97d70af

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

modules/javafx.controls/src/test/java/test/com/sun/javafx/scene/control/infrastructure/KeyEventFirer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
package test.com.sun.javafx.scene.control.infrastructure;
2727

28+
import com.sun.javafx.scene.SceneHelper;
29+
2830
import java.util.Arrays;
2931
import java.util.List;
3032
import java.util.Objects;
@@ -63,7 +65,7 @@ public KeyEventFirer(EventTarget target) {
6365
* Any one of those can be null, but not both. A null/not null scene decides
6466
* about the delivering path of events. If null, events are delivered
6567
* via <code>EventUtils.fire(target, keyEvent)</code>, otherwise via
66-
* <code>scene.processKeyEvent(keyEvent)</code>.
68+
* <code>SceneHelper.processKeyEvent(scene, keyEvent)</code>.
6769
* <p>
6870
* Note that in the latter case, the target doesn't matter - the scene
6971
* delivers keyEvents to its focusOwner. Calling code is responsible to
@@ -111,14 +113,14 @@ public void doKeyTyped(KeyCode keyCode, KeyModifier... modifiers) {
111113
* Dispatches the given events. The process depends on the state of
112114
* this firer. If the scene is null, the events are delivered via
113115
* Event.fireEvent(target,..), otherwise they are delivered via
114-
* scene.processKeyEvent.
116+
* SceneHelper.processKeyEvent.
115117
*
116118
* @param events the events to dispatch.
117119
*/
118120
private void fireEvents(KeyEvent... events) {
119121
for (KeyEvent evt : events) {
120122
if (scene != null) {
121-
scene.processKeyEvent(evt);
123+
SceneHelper.processKeyEvent(scene, evt);
122124
} else {
123125
Event.fireEvent(target, evt);
124126
}

modules/javafx.graphics/src/main/java/javafx/scene/Scene.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -842,12 +842,7 @@ void initPeer() {
842842
PerformanceTracker.logEvent("Scene.initPeer finished");
843843
}
844844

845-
// FIXME: make this method package-scope in the next release
846-
/**
847-
* @deprecated This method was exposed erroneously and will be removed in a future version.
848-
*/
849-
@Deprecated(forRemoval = true, since = "17")
850-
public void disposePeer() {
845+
void disposePeer() {
851846
if (peer == null) {
852847
// This is fine, the window is either not shown yet and there is no
853848
// need in disposing scene peer, or is hidden and disposePeer()
@@ -2140,13 +2135,7 @@ private void focusIneligible(Node node) {
21402135
traverse(node, Direction.NEXT);
21412136
}
21422137

2143-
// FIXME: make this method package-scope in the next release
2144-
/**
2145-
* @deprecated This method was exposed erroneously and will be removed in a future version.
2146-
* @param e undocumented method parameter
2147-
*/
2148-
@Deprecated(forRemoval = true, since = "17")
2149-
public void processKeyEvent(KeyEvent e) {
2138+
void processKeyEvent(KeyEvent e) {
21502139
if (dndGesture != null) {
21512140
if (!dndGesture.processKey(e)) {
21522141
dndGesture = null;
@@ -2232,13 +2221,7 @@ private void processInputMethodEvent(InputMethodEvent e) {
22322221
}
22332222
}
22342223

2235-
// FIXME: make this method package-scope in the next release
2236-
/**
2237-
* @deprecated This method was exposed erroneously and will be removed in a future version.
2238-
* @param enable undocumented method parameter
2239-
*/
2240-
@Deprecated(forRemoval = true, since = "17")
2241-
public void enableInputMethodEvents(boolean enable) {
2224+
void enableInputMethodEvents(boolean enable) {
22422225
if (peer != null) {
22432226
peer.enableInputMethodEvents(enable);
22442227
}

tests/system/src/test/addExports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
--add-exports javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
2020
--add-exports javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
2121
--add-exports javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED
22+
--add-exports javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
2223
--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
2324
--add-exports javafx.graphics/com.sun.prism.impl=ALL-UNNAMED
2425
#

0 commit comments

Comments
 (0)