stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8073453: Focus doesn't move when pressing Shift + Tab keys

Browse Source 
Reviewed-by: alexsch, ant
This commit is contained in:
Dmitry Markov 2015-04-14 15:24:10 +04:00
parent 95090a7507
commit b29fb12ad4
4 changed files with 254 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
View File

@ -504,7 +504,10 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
} else if (comp instanceof Container && comp != aContainer) {
Container cont = (Container)comp;
if (cont.isFocusTraversalPolicyProvider()) {
return cont.getFocusTraversalPolicy().getLastComponent(cont);
Component retComp = cont.getFocusTraversalPolicy().getLastComponent(cont);
if (retComp != null) {
return retComp;
}
}
}
}

5
jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java
View File

@ -570,7 +570,10 @@ public class SortingFocusTraversalPolicy
} else if (comp instanceof Container && comp != aContainer) {
Container cont = (Container)comp;
if (cont.isFocusTraversalPolicyProvider()) {
return cont.getFocusTraversalPolicy().getLastComponent(cont);
Component retComp = cont.getFocusTraversalPolicy().getLastComponent(cont);
if (retComp != null) {
return retComp;
}
}
}
}

115
jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java Normal file
View File

@ -0,0 +1,115 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8073453
* @summary Focus doesn't move when pressing Shift + Tab keys
* @author Dmitry Markov
* @compile AWTFocusTransitionTest.java
* @run main/othervm AWTFocusTransitionTest
*/
import sun.awt.SunToolkit;
import java.awt.*;
import java.awt.event.KeyEvent;
public class AWTFocusTransitionTest {
private static SunToolkit toolkit;
private static Robot robot;
private static Frame frame;
private static TextField textField;
private static Button button;
public static void main(String[] args) throws Exception {
toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
robot = new Robot();
robot.setAutoDelay(50);
try {
createAndShowGUI();
toolkit.realSync();
checkFocusOwner(textField);
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
toolkit.realSync();
checkFocusOwner(button);
robot.keyPress(KeyEvent.VK_SHIFT);
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_SHIFT);
toolkit.realSync();
checkFocusOwner(textField);
robot.keyPress(KeyEvent.VK_SHIFT);
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_SHIFT);
toolkit.realSync();
checkFocusOwner(button);
} finally {
if (frame != null) {
frame.dispose();
}
}
System.out.println("Test Passed!");
}
private static void createAndShowGUI() {
frame = new Frame("AWTFocusTransitionTest");
frame.setSize(300, 300);
frame.setFocusTraversalPolicyProvider(true);
frame.setFocusTraversalPolicy(new DefaultFocusTraversalPolicy());
textField = new TextField();
button = new Button();
Panel panel = new Panel();
panel.setFocusTraversalPolicyProvider(true);
panel.setFocusTraversalPolicy(new DefaultFocusTraversalPolicy());
Panel p = new Panel();
p.setLayout(new GridLayout(3, 1));
p.add(textField);
p.add(button);
p.add(panel);
frame.add(p);
frame.setVisible(true);
}
private static void checkFocusOwner(Component component) {
if (component != frame.getFocusOwner()) {
throw new RuntimeException("Test Failed! Incorrect focus owner: " + frame.getFocusOwner() +
", but expected: " + component);
}
}
}

131
jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java Normal file
View File

@ -0,0 +1,131 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8073453
* @summary Focus doesn't move when pressing Shift + Tab keys
* @author Dmitry Markov
* @compile SwingFocusTransitionTest.java
* @run main/othervm SwingFocusTransitionTest
*/
import sun.awt.SunToolkit;
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
public class SwingFocusTransitionTest {
private static SunToolkit toolkit;
private static Robot robot;
private static JFrame frame;
private static JTextField textField;
private static JButton button;
public static void main(String[] args) throws Exception {
toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
robot = new Robot();
robot.setAutoDelay(50);
try {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
createAndShowGUI();
}
});
toolkit.realSync();
checkFocusOwner(textField);
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
toolkit.realSync();
checkFocusOwner(button);
robot.keyPress(KeyEvent.VK_SHIFT);
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_SHIFT);
toolkit.realSync();
checkFocusOwner(textField);
robot.keyPress(KeyEvent.VK_SHIFT);
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_SHIFT);
toolkit.realSync();
checkFocusOwner(button);
} finally {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
if (frame != null) {
frame.dispose();
}
}
});
}
System.out.println("Test Passed!");
}
private static void createAndShowGUI() {
frame = new JFrame("SwingFocusTransitionTest");
frame.setSize(300, 300);
frame.setFocusTraversalPolicyProvider(true);
frame.setFocusTraversalPolicy(new LayoutFocusTraversalPolicy());
textField = new JTextField();
button = new JButton();
JPanel panel = new JPanel();
panel.setFocusTraversalPolicyProvider(true);
panel.setFocusTraversalPolicy(new DefaultFocusTraversalPolicy());
JPanel p = new JPanel();
p.setLayout(new GridLayout(3, 1));
p.add(textField);
p.add(button);
p.add(panel);
frame.add(p);
frame.setVisible(true);
}
private static void checkFocusOwner(final Component component) throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
if (component != frame.getFocusOwner()) {
throw new RuntimeException("Test Failed! Incorrect focus owner: " + frame.getFocusOwner() +
", but expected: " + component);
}
}
});
}
}