infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-06 14:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

6337518: Null Arrow Button Throws Exception in BasicComboBoxUI

Browse Source 
Reviewed-by: alexp, alexsch
This commit is contained in:
Anton Litvinov 2013-06-03 16:37:13 +04:00
parent 8c13d6cecf
commit fb8bd30b8e
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
View File

@ -692,9 +692,9 @@ public class BasicComboBoxUI extends ComboBoxUI {
*/
protected void installComponents() {
arrowButton = createArrowButton();
comboBox.add( arrowButton );
if (arrowButton != null) {
comboBox.add(arrowButton);
configureArrowButton();
}

48
jdk/test/javax/swing/JComboBox/6337518/bug6337518.java Normal file
View File

@ -0,0 +1,48 @@
/*
* 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.
*/
/* @test
@bug 6337518
@summary Null Arrow Button Throws Exception in BasicComboBoxUI
@author Anton Litvinov
*/
import javax.swing.*;
import javax.swing.plaf.basic.*;
public class bug6337518 extends BasicComboBoxUI {
@Override
protected JButton createArrowButton() {
return null;
}
public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
JComboBox comboBox = new JComboBox();
comboBox.setUI(new bug6337518());
}
});
}
}