# HG changeset patch # User ssadetsky # Date 1436252213 -10800 # Node ID 5ba70216950391ecb88b0f260156dc3a9e8f6a40 # Parent 968cd1d0b646a5a92912c57d797f57d3feafc236 8129940: JRadioButton does not honor non-standard FocusTraversalKeys Reviewed-by: alexsch, azvegint diff -r 968cd1d0b646 -r 5ba702169503 jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java Tue Jul 07 09:51:30 2015 +0300 +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java Tue Jul 07 09:56:53 2015 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -35,6 +35,7 @@ import sun.awt.AppContext; import java.util.Enumeration; import java.util.HashSet; +import java.util.Set; /** * RadioButtonUI implementation for BasicRadioButtonUI @@ -582,23 +583,32 @@ */ private class KeyHandler implements KeyListener { - // This listener checks if the key event is a KeyEvent.VK_TAB - // or shift + KeyEvent.VK_TAB event on a radio button, consume the event - // if so and move the focus to next/previous component + // This listener checks if the key event is a focus traversal key event + // on a radio button, consume the event if so and move the focus + // to next/previous component public void keyPressed(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_TAB) { - // Get the source of the event. - Object eventSrc = e.getSource(); - - // Check whether the source is a visible and enabled JRadioButton - if (isValidRadioButtonObj(eventSrc)) { + AWTKeyStroke stroke = AWTKeyStroke.getAWTKeyStrokeForEvent(e); + if (stroke != null && e.getSource() instanceof JRadioButton) { + JRadioButton source = (JRadioButton) e.getSource(); + boolean next = isFocusTraversalKey(source, + KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, + stroke); + if (next || isFocusTraversalKey(source, + KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, + stroke)) { e.consume(); - ButtonGroupInfo btnGroupInfo = new ButtonGroupInfo((JRadioButton)eventSrc); - btnGroupInfo.jumpToNextComponent(!e.isShiftDown()); + ButtonGroupInfo btnGroupInfo = new ButtonGroupInfo(source); + btnGroupInfo.jumpToNextComponent(next); } } } + private boolean isFocusTraversalKey(JComponent c, int id, + AWTKeyStroke stroke) { + Set keys = c.getFocusTraversalKeys(id); + return keys != null && keys.contains(stroke); + } + public void keyReleased(KeyEvent e) { } diff -r 968cd1d0b646 -r 5ba702169503 jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java Tue Jul 07 09:56:53 2015 +0300 @@ -0,0 +1,144 @@ +/* + * 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 8129940 + @summary JRadioButton does not honor non-standard FocusTraversalKeys + @author Semyon Sadetsky + */ + +import javax.swing.*; +import java.awt.*; +import java.awt.event.KeyEvent; +import java.util.HashSet; +import java.util.Set; + +public class FocusTraversal { + + private static JFrame frame; + private static JRadioButton a; + private static JRadioButton d; + private static JTextField next; + private static JTextField prev; + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame = new JFrame("FocusTraversalTest"); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setUndecorated(true); + + Set keystrokes = new HashSet(); + keystrokes.add(KeyStroke.getKeyStroke("TAB")); + keystrokes.add(KeyStroke.getKeyStroke("ENTER")); + frame.setFocusTraversalKeys( + KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, + keystrokes); + + a = new JRadioButton("a"); + JRadioButton b = new JRadioButton("b"); + JRadioButton c = new JRadioButton("c"); + d = new JRadioButton("d"); + + ButtonGroup radioButtonGroup = new ButtonGroup(); + radioButtonGroup.add(a); + radioButtonGroup.add(b); + radioButtonGroup.add(c); + radioButtonGroup.add(d); + + JPanel panel = new JPanel(); + prev = new JTextField("text"); + panel.add(prev); + panel.add(a); + panel.add(b); + panel.add(c); + panel.add(d); + next = new JTextField("text"); + panel.add(next); + + JPanel root = new JPanel(); + root.setLayout(new BorderLayout()); + root.add(panel, BorderLayout.CENTER); + root.add(new JButton("OK"), BorderLayout.SOUTH); + + frame.add(root); + frame.pack(); + frame.setVisible(true); + } + }); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + a.requestFocus(); + } + }); + + Robot robot = new Robot(); + robot.waitForIdle(); + + robot.setAutoDelay(200); + + robot.keyPress(KeyEvent.VK_ENTER); + robot.keyRelease(KeyEvent.VK_ENTER); + robot.waitForIdle(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + Component focusOwner = + FocusManager.getCurrentManager().getFocusOwner(); + if (focusOwner != next) { + throw new RuntimeException( + "Focus component is wrong after forward key " + focusOwner); + } + } + }); + + robot.keyPress(KeyEvent.VK_SHIFT); + robot.keyPress(KeyEvent.VK_TAB); + robot.keyRelease(KeyEvent.VK_TAB); + robot.keyRelease(KeyEvent.VK_SHIFT); + robot.waitForIdle(); + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + Component focusOwner = + FocusManager.getCurrentManager().getFocusOwner(); + if (focusOwner != d) { + throw new RuntimeException( + "Focus component is wrong after backward key " + focusOwner); + } + } + }); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + frame.dispose(); + } + }); + System.out.println("ok"); + + } +}