infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-17 10:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8019180: Use JComboBox as it's own ActionListener leads to unexpected behaviour

Browse Source 
Reviewed-by: alexsch, serb
This commit is contained in:
Sergey Malenkov 2014-05-26 18:01:59 +04:00
parent 4239598ced
commit 13c62bc476
2 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/share/classes/javax/swing/JComboBox.java
View File

@ -1308,13 +1308,15 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
* do not call or override.
*/
public void actionPerformed(ActionEvent e) {
Object newItem = getEditor().getItem();
setPopupVisible(false);
getModel().setSelectedItem(newItem);
String oldCommand = getActionCommand();
setActionCommand("comboBoxEdited");
fireActionEvent();
setActionCommand(oldCommand);
ComboBoxEditor editor = getEditor();
if ((editor != null) && (e != null) && (editor == e.getSource())) {
setPopupVisible(false);
getModel().setSelectedItem(editor.getItem());
String oldCommand = getActionCommand();
setActionCommand("comboBoxEdited");
fireActionEvent();
setActionCommand(oldCommand);
}
}
/**

68
jdk/test/javax/swing/JComboBox/8019180/Test8019180.java Normal file
View File

@ -0,0 +1,68 @@
/*
* 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.util.concurrent.CountDownLatch;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
/*
* @test
* @bug 8019180
* @summary Tests that combobox works if it is used as action listener
* @author Sergey Malenkov
*/
public class Test8019180 implements Runnable {
private static final CountDownLatch LATCH = new CountDownLatch(1);
private static final String[] ITEMS = {"First", "Second", "Third", "Fourth"};
public static void main(String[] args) throws InterruptedException {
SwingUtilities.invokeLater(new Test8019180());
LATCH.await();
}
private JComboBox<String> test;
@Override
public void run() {
if (this.test == null) {
this.test = new JComboBox<>(ITEMS);
this.test.addActionListener(this.test);
JFrame frame = new JFrame();
frame.add(test);
frame.pack();
frame.setVisible(true);
SwingUtilities.invokeLater(this);
} else {
int index = this.test.getSelectedIndex();
this.test.setSelectedIndex(1 + index);
if (0 > this.test.getSelectedIndex()) {
System.err.println("ERROR: no selection");
System.exit(8019180);
}
SwingUtilities.getWindowAncestor(this.test).dispose();
LATCH.countDown();
}
}
}