Mercurial > hg > openjdk > lambda > jdk
changeset 10452:fba62451d705
8016551: JMenuItem in WindowsLookAndFeel can't paint default icons
Reviewed-by: alexsch, serb
author | leonidr |
---|---|
date | Wed, 09 Oct 2013 21:15:49 +0400 |
parents | 976e5f580124 |
children | cea6ca16142e |
files | src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java |
diffstat | 2 files changed, 92 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java Wed Oct 09 20:59:08 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java Wed Oct 09 21:15:49 2013 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -174,7 +174,7 @@ XPStyle xp = XPStyle.getXP(); if (xp != null) { Skin skin = xp.getSkin(c, part); - JButton b = (JButton)c; + AbstractButton b = (AbstractButton)c; ButtonModel model = b.getModel(); // Find out if frame is inactive
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java Wed Oct 09 21:15:49 2013 +0400 @@ -0,0 +1,90 @@ +/* + * 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 8016551 + * @summary JMenuItem in WindowsLookAndFeel can't paint default icons + * @author Leonid Romanov + * @run main bug8016551 + */ + +import javax.swing.*; +import java.awt.Graphics; +import java.awt.Toolkit; +import sun.awt.SunToolkit; + +public class bug8016551 { + private static volatile RuntimeException exception = null; + + public static void main(String[] args) throws Exception { + try { + UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); + } catch (Exception e) { + // We intentionally allow the test to run with other l&f + } + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + Icon icon = UIManager.getIcon("InternalFrame.closeIcon"); + if (icon == null) { + return; + } + + JMenuItem item = new TestMenuItem(icon); + JFrame f = new JFrame(); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.getContentPane().add(item); + f.pack(); + f.setVisible(true); + } catch (ClassCastException e) { + throw new RuntimeException(e); + } + } + }); + + SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit(); + tk.realSync(); + + if (exception != null) { + throw exception; + } + } + + static class TestMenuItem extends JMenuItem { + TestMenuItem(Icon icon) { + super(icon); + } + + @Override + public void paint(Graphics g) { + try { + super.paint(g); + } catch (RuntimeException e) { + exception = e; + } + } + } +} +