Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10234:ab2a0444d499
8057893: JComboBox actionListener never receives "comboBoxEdited" from getActionCommand
Reviewed-by: serb
author | alexsch |
---|---|
date | Wed, 05 Nov 2014 17:01:53 +0400 |
parents | fa2ef1616066 |
children | 1244706b918a |
files | src/share/classes/javax/swing/JComboBox.java test/javax/swing/JComboBox/8057893/bug8057893.java |
diffstat | 2 files changed, 86 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/javax/swing/JComboBox.java Tue Nov 04 18:37:24 2014 -0500 +++ b/src/share/classes/javax/swing/JComboBox.java Wed Nov 05 17:01:53 2014 +0400 @@ -1308,7 +1308,8 @@ */ public void actionPerformed(ActionEvent e) { ComboBoxEditor editor = getEditor(); - if ((editor != null) && (e != null) && (editor == e.getSource())) { + if ((editor != null) && (e != null) + && (editor.getEditorComponent() == e.getSource())) { setPopupVisible(false); getModel().setSelectedItem(editor.getItem()); String oldCommand = getActionCommand();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JComboBox/8057893/bug8057893.java Wed Nov 05 17:01:53 2014 +0400 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2014, 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.awt.EventQueue; +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.JComboBox; +import javax.swing.JFrame; +import javax.swing.WindowConstants; +import sun.awt.SunToolkit; + +/** + * @test + * @bug 8057893 + * @author Alexander Scherbatiy + * @summary JComboBox actionListener never receives "comboBoxEdited" + * from getActionCommand + * @run main bug8057893 + */ +public class bug8057893 { + + private static volatile boolean isComboBoxEdited = false; + + public static void main(String[] args) throws Exception { + Robot robot = new Robot(); + robot.setAutoDelay(50); + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + + EventQueue.invokeAndWait(() -> { + JFrame frame = new JFrame(); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + JComboBox<String> comboBox = new JComboBox<>(new String[]{"one", "two"}); + comboBox.setEditable(true); + comboBox.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + if ("comboBoxEdited".equals(e.getActionCommand())) { + isComboBoxEdited = true; + } + } + }); + frame.add(comboBox); + frame.pack(); + frame.setVisible(true); + comboBox.requestFocusInWindow(); + }); + + toolkit.realSync(); + + robot.keyPress(KeyEvent.VK_A); + robot.keyRelease(KeyEvent.VK_A); + robot.keyPress(KeyEvent.VK_ENTER); + robot.keyRelease(KeyEvent.VK_ENTER); + toolkit.realSync(); + + if(!isComboBoxEdited){ + throw new RuntimeException("ComboBoxEdited event is not fired!"); + } + } +}