OpenJDK / jdk / hs
changeset 11669:97a5fb3f69cf
7082443: JComboBox not backward compatible (with Java 6)
Reviewed-by: alexp
author | rupashka |
---|---|
date | Tue, 31 Jan 2012 17:30:33 +0400 |
parents | 138b661e3841 |
children | f2788ef30cb9 38e5838650a6 |
files | jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java jdk/test/javax/swing/JComboBox/7082443/bug7082443.java |
diffstat | 2 files changed, 92 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java Tue Jan 31 14:20:47 2012 +0400 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java Tue Jan 31 17:30:33 2012 +0400 @@ -447,11 +447,21 @@ private class SynthComboBoxRenderer extends JLabel implements ListCellRenderer<Object>, UIResource { public SynthComboBoxRenderer() { super(); - setName("ComboBox.renderer"); setText(" "); } @Override + public String getName() { + // SynthComboBoxRenderer should have installed Name while constructor is working. + // The setName invocation in the SynthComboBoxRenderer() constructor doesn't work + // because of the opaque property is installed in the constructor based on the + // component name (see GTKStyle.isOpaque()) + String name = super.getName(); + + return name == null ? "ComboBox.renderer" : name; + } + + @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { setName("ComboBox.listRenderer");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JComboBox/7082443/bug7082443.java Tue Jan 31 17:30:33 2012 +0400 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2011, 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 7082443 + * @summary JComboBox not backward compatible (with Java 6) + * @author Pavel Porvatov + */ + +import javax.swing.*; +import java.awt.*; + +public class bug7082443 { + public static final String GTK_LAF_CLASS = "GTKLookAndFeel"; + + public static void main(String[] args) throws Exception { + for (UIManager.LookAndFeelInfo lookAndFeelInfo : UIManager.getInstalledLookAndFeels()) { + if (lookAndFeelInfo.getClassName().contains(GTK_LAF_CLASS)) { + UIManager.setLookAndFeel(lookAndFeelInfo.getClassName()); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + TestComboBox testComboBox = new TestComboBox(); + + if (testComboBox.isOldRendererOpaque()) { + System.out.println("Passed for " + GTK_LAF_CLASS); + } else { + throw new RuntimeException("Failed for " + GTK_LAF_CLASS); + } + } + }); + + return; + } + } + + System.out.println(GTK_LAF_CLASS + " is not found. The test skipped"); + } + + private static class TestComboBox extends JComboBox { + private final ListCellRenderer renderer = new ListCellRenderer() { + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, + boolean isSelected, boolean cellHasFocus) { + return TestComboBox.super.getRenderer().getListCellRendererComponent(list, value, index, + isSelected, cellHasFocus); + } + }; + + @Override + public ListCellRenderer getRenderer() { + return renderer; + } + + public boolean isOldRendererOpaque() { + return ((JLabel) super.getRenderer()).isOpaque(); + } + } +} +