From 92bfcc0db031964ec2e6466d88a5cb016d55d2da Mon Sep 17 00:00:00 2001 From: Alexander Scherbatiy Date: Tue, 10 Sep 2013 14:33:48 +0400 Subject: [PATCH] 8021253: JFileChooser does not react on pressing enter since java 7 Reviewed-by: malenkov --- .../classes/javax/swing/JFileChooser.java | 18 ++- .../JFileChooser/8021253/bug8021253.java | 113 ++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java diff --git a/jdk/src/share/classes/javax/swing/JFileChooser.java b/jdk/src/share/classes/javax/swing/JFileChooser.java index e053b7af081..61806b439b8 100644 --- a/jdk/src/share/classes/javax/swing/JFileChooser.java +++ b/jdk/src/share/classes/javax/swing/JFileChooser.java @@ -362,6 +362,7 @@ public class JFileChooser extends JComponent implements Accessible { */ protected void setup(FileSystemView view) { installShowFilesListener(); + installHierarchyListener(); if(view == null) { view = FileSystemView.getFileSystemView(); @@ -374,6 +375,22 @@ public class JFileChooser extends JComponent implements Accessible { enableEvents(AWTEvent.MOUSE_EVENT_MASK); } + private void installHierarchyListener() { + addHierarchyListener(new HierarchyListener() { + @Override + public void hierarchyChanged(HierarchyEvent e) { + if ((e.getChangeFlags() & HierarchyEvent.PARENT_CHANGED) + == HierarchyEvent.PARENT_CHANGED) { + JFileChooser fc = JFileChooser.this; + JRootPane rootPane = SwingUtilities.getRootPane(fc); + if (rootPane != null) { + rootPane.setDefaultButton(fc.getUI().getDefaultButton(fc)); + } + } + } + }); + } + private void installShowFilesListener() { // Track native setting for showing hidden files Toolkit tk = Toolkit.getDefaultToolkit(); @@ -801,7 +818,6 @@ public class JFileChooser extends JComponent implements Accessible { dialog.getRootPane().setWindowDecorationStyle(JRootPane.FILE_CHOOSER_DIALOG); } } - dialog.getRootPane().setDefaultButton(ui.getDefaultButton(this)); dialog.pack(); dialog.setLocationRelativeTo(parent); diff --git a/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java b/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java new file mode 100644 index 00000000000..5e833926a00 --- /dev/null +++ b/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2013, 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. + */ + +import java.io.File; +import java.io.IOException; +import java.awt.BorderLayout; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; +import sun.awt.SunToolkit; + +/** + * @test + * @bug 8021253 + * @author Alexander Scherbatiy + * @summary JFileChooser does not react on pressing enter since java 7 + * @run main bug8021253 + */ + +public class bug8021253 { + + private static volatile boolean defaultKeyPressed; + private static JFileChooser fileChooser; + private static File file; + + public static void main(String[] args) throws Exception { + + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + Robot robot = new Robot(); + robot.setAutoDelay(50); + + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + createAndShowGUI(); + } + }); + + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + fileChooser.setSelectedFile(file); + } + }); + + toolkit.realSync(); + + robot.keyPress(KeyEvent.VK_ENTER); + robot.keyRelease(KeyEvent.VK_ENTER); + toolkit.realSync(); + + if (!defaultKeyPressed) { + throw new RuntimeException("Default button is not pressed"); + } + } + + private static void createAndShowGUI() { + + file = getTempFile(); + + final JFrame frame = new JFrame("Test"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setSize(200, 300); + + fileChooser = new JFileChooser(file.getParentFile()); + fileChooser.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + defaultKeyPressed = true; + frame.dispose(); + } + }); + + frame.getContentPane().add(BorderLayout.CENTER, fileChooser); + frame.setSize(fileChooser.getPreferredSize()); + frame.setVisible(true); + } + + private static File getTempFile() { + try { + File temp = File.createTempFile("test", ".txt"); + temp.deleteOnExit(); + return temp; + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } +}