8032878: Editable combos in table do not behave as expected
Reviewed-by: alexp, alexsch
Contributed-by: alexey.ivanov@oracle.com
--- a/jdk/src/share/classes/javax/swing/JComboBox.java Fri Mar 21 16:51:53 2014 +0400
+++ b/jdk/src/share/classes/javax/swing/JComboBox.java Fri Mar 21 17:17:16 2014 +0400
@@ -1417,6 +1417,28 @@
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
+ if (super.processKeyBinding(ks, e, condition, pressed)) {
+ return true;
+ }
+
+ if (!isEditable() || condition != WHEN_FOCUSED || getEditor() == null
+ || !Boolean.TRUE.equals(getClientProperty("JComboBox.isTableCellEditor"))) {
+ return false;
+ }
+
+ Component editorComponent = getEditor().getEditorComponent();
+ if (editorComponent instanceof JComponent) {
+ JComponent component = (JComponent) editorComponent;
+ return component.processKeyBinding(ks, e, WHEN_FOCUSED, pressed);
+ }
+ return false;
+ }
+
+ /**
* Sets the object that translates a keyboard character into a list
* selection. Typically, the first selection with a matching first
* character becomes the selected item.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java Fri Mar 21 17:17:16 2014 +0400
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+/* @test
+ * @bug 8032878
+ * @summary Checks that JComboBox as JTable cell editor processes key events
+ * even where setSurrendersFocusOnKeystroke flag in JTable is false and
+ * that it does not lose the first key press where the flag is true.
+ * @library ../../regtesthelpers
+ * @build Util
+ * @author Alexey Ivanov
+ */
+
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import javax.swing.*;
+import javax.swing.text.JTextComponent;
+
+import sun.awt.SunToolkit;
+
+public class bug8032878 implements Runnable {
+ private static final String ONE = "one";
+ private static final String TWO = "two";
+ private static final String THREE = "three";
+
+ private static final String EXPECTED = "one123";
+
+ private final Robot robot;
+
+ private JFrame frame;
+ private JComboBox cb;
+
+ private volatile boolean surrender;
+ private volatile String text;
+
+ public static void main(String[] args) throws Exception {
+ final bug8032878 test = new bug8032878();
+
+ test.test(false);
+ test.test(true);
+ }
+
+ public bug8032878() throws AWTException {
+ robot = new Robot();
+ robot.setAutoDelay(100);
+ }
+
+ private void setupUI() {
+ frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ JTable table = new JTable(new String[][] {{ONE}, {TWO}, {THREE}},
+ new String[] { "#"});
+ table.setSurrendersFocusOnKeystroke(surrender);
+
+ cb = new JComboBox(new String[]{ONE, TWO, THREE});
+ cb.setEditable(true);
+ DefaultCellEditor comboEditor = new DefaultCellEditor(cb);
+ comboEditor.setClickCountToStart(1);
+ table.getColumnModel().getColumn(0).setCellEditor(comboEditor);
+ frame.add(table);
+
+ frame.pack();
+ frame.setVisible(true);
+ }
+
+ private void test(final boolean flag) throws Exception {
+ try {
+ surrender = flag;
+ SwingUtilities.invokeAndWait(this);
+
+ runTest();
+ checkResult();
+ } finally {
+ if (frame != null) {
+ frame.dispose();
+ }
+ }
+ }
+
+ private void runTest() throws Exception {
+ realSync();
+ // Select 'one'
+ Util.hitKeys(robot, KeyEvent.VK_TAB);
+ realSync();
+ Util.hitKeys(robot, KeyEvent.VK_1);
+ Util.hitKeys(robot, KeyEvent.VK_2);
+ Util.hitKeys(robot, KeyEvent.VK_3);
+ Util.hitKeys(robot, KeyEvent.VK_ENTER);
+ realSync();
+ }
+
+ private void checkResult() throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ text = ((JTextComponent) cb.getEditor().getEditorComponent()).getText();
+ }
+ });
+ if (text.equals(EXPECTED)) {
+ System.out.println("Test with surrender = " + surrender + " passed");
+ } else {
+ System.out.println("Test with surrender = " + surrender + " failed");
+ throw new RuntimeException("Expected value in JComboBox editor '" +
+ EXPECTED + "' but found '" + text + "'.");
+ }
+ }
+
+ private static void realSync() {
+ ((SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
+ }
+
+ @Override
+ public void run() {
+ setupUI();
+ }
+}