Skip to content

Commit 31ebdcf

Browse files
committed
Removed debug printlns, tidied up some code
1 parent ce98054 commit 31ebdcf

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

modules/javafx.graphics/src/main/java/com/sun/javafx/scene/InputMethodStateManager.java

-7
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ public InputMethodStateManager(Scene scene) {
9191
* Add a new Scene to the stack.
9292
*/
9393
public void addScene(Scene scene) {
94-
if (scenes.contains(scene)) {
95-
System.err.println("Popup scene already present");
96-
}
9794
scenes.addFirst(scene);
9895
updateInputMethodEventEnableState();
9996
}
@@ -102,10 +99,6 @@ public void addScene(Scene scene) {
10299
* Remove a Scene from the stack.
103100
*/
104101
public void removeScene(Scene scene) {
105-
if (scene != scenes.peekFirst()) {
106-
System.err.println("Popup scene removed out of order");
107-
}
108-
109102
/**
110103
* If this scene is going away we should cleanup any composition
111104
* state. Hiding a window doesn't ensure proper cleanup.

modules/javafx.graphics/src/main/java/javafx/stage/PopupWindow.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,11 @@ private void doVisibleChanging(boolean visible) {
556556
*/
557557
private void doVisibleChanged(boolean visible) {
558558
final Window ownerWindowValue = getOwnerWindow();
559+
Scene scene = getScene();
559560
if (visible) {
560561
rootWindow = getRootWindow(ownerWindowValue);
561562

562563
startMonitorOwnerEvents(ownerWindowValue);
563-
Scene scene = getScene();
564564
SceneHelper.getInputMethodStateManager(scene).addScene(scene);
565565
// currently we consider popup window to be focused when it is
566566
// visible and its owner window is focused (we need to track
@@ -574,7 +574,6 @@ private void doVisibleChanged(boolean visible) {
574574
} else {
575575
// This may generate events so it must be done while we're
576576
// still monitoring owner events.
577-
Scene scene = getScene();
578577
SceneHelper.getInputMethodStateManager(scene).removeScene(scene);
579578
stopMonitorOwnerEvents(ownerWindowValue);
580579
unbindOwnerFocusedProperty(ownerWindowValue);

0 commit comments

Comments
 (0)