infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 11:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

8046559: NPE when changing Windows theme

Browse Source 
Reviewed-by: pchelko, anthony
This commit is contained in:
Alexey Ivanov 2014-07-08 12:20:06 +04:00
parent 6543d60b1b
commit 7144d3a4fd
19 changed files with 263 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 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
@ -130,11 +130,14 @@ class AnimationController implements ActionListener, PropertyChangeListener {
//one second seems plausible value
duration = 1000;
} else {
duration = XPStyle.getXP().getThemeTransitionDuration(
c, part,
normalizeState(oldState),
normalizeState(newState),
Prop.TRANSITIONDURATIONS);
XPStyle xp = XPStyle.getXP();
duration = (xp != null)
? xp.getThemeTransitionDuration(
c, part,
normalizeState(oldState),
normalizeState(newState),
Prop.TRANSITIONDURATIONS)
: 1000;
}
controller.startAnimation(c, part, oldState, newState, duration);
}

18
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
View File

@ -37,6 +37,7 @@ import java.awt.*;
import static com.sun.java.swing.plaf.windows.TMSchema.Part;
import static com.sun.java.swing.plaf.windows.TMSchema.State;
import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
import sun.swing.DefaultLookup;
import sun.swing.StringUIClientPropertyKey;
@ -231,6 +232,9 @@ public class WindowsComboBoxUI extends BasicComboBoxUI {
private void paintXPComboBoxBackground(Graphics g, JComponent c) {
XPStyle xp = XPStyle.getXP();
if (xp == null) {
return;
}
State state = getXPComboBoxState(c);
Skin skin = null;
if (! comboBox.isEditable()
@ -400,8 +404,9 @@ public class WindowsComboBoxUI extends BasicComboBoxUI {
* @return a button which represents the popup control
*/
protected JButton createArrowButton() {
if (XPStyle.getXP() != null) {
return new XPComboBoxButton();
XPStyle xp = XPStyle.getXP();
if (xp != null) {
return new XPComboBoxButton(xp);
} else {
return super.createArrowButton();
}
@ -409,9 +414,9 @@ public class WindowsComboBoxUI extends BasicComboBoxUI {
@SuppressWarnings("serial") // Superclass is not serializable across versions
private class XPComboBoxButton extends XPStyle.GlyphButton {
public XPComboBoxButton() {
public XPComboBoxButton(XPStyle xp) {
super(null,
(! XPStyle.getXP().isSkinDefined(comboBox, Part.CP_DROPDOWNBUTTONRIGHT))
(! xp.isSkinDefined(comboBox, Part.CP_DROPDOWNBUTTONRIGHT))
? Part.CP_DROPDOWNBUTTON
: (comboBox.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
? Part.CP_DROPDOWNBUTTONLEFT
@ -424,10 +429,11 @@ public class WindowsComboBoxUI extends BasicComboBoxUI {
protected State getState() {
State rv;
rv = super.getState();
XPStyle xp = XPStyle.getXP();
if (rv != State.DISABLED
&& comboBox != null && ! comboBox.isEditable()
&& XPStyle.getXP().isSkinDefined(comboBox,
Part.CP_DROPDOWNBUTTONRIGHT)) {
&& xp != null && xp.isSkinDefined(comboBox,
Part.CP_DROPDOWNBUTTONRIGHT)) {
/*
* for non editable ComboBoxes Vista seems to have the
* same glyph for all non DISABLED states

5
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 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
@ -125,6 +125,9 @@ public class WindowsGraphicsUtils {
static void paintXPText(AbstractButton b, Part part, State state,
Graphics g, int x, int y, String text, int mnemIndex) {
XPStyle xp = XPStyle.getXP();
if (xp == null) {
return;
}
Color textColor = b.getForeground();
if (textColor instanceof UIResource) {

46
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
View File

@ -623,8 +623,8 @@ public class WindowsIconFactory implements Serializable
@SuppressWarnings("serial") // Same-version serialization only
private static class MenuArrowIcon implements Icon, UIResource, Serializable {
public void paintIcon(Component c, Graphics g, int x, int y) {
if (WindowsMenuItemUI.isVistaPainting()) {
XPStyle xp = XPStyle.getXP();
XPStyle xp = XPStyle.getXP();
if (WindowsMenuItemUI.isVistaPainting(xp)) {
State state = State.NORMAL;
if (c instanceof JMenuItem) {
state = ((JMenuItem) c).getModel().isEnabled()
@ -657,16 +657,18 @@ public class WindowsIconFactory implements Serializable
}
}
public int getIconWidth() {
if (WindowsMenuItemUI.isVistaPainting()) {
Skin skin = XPStyle.getXP().getSkin(null, Part.MP_POPUPSUBMENU);
XPStyle xp = XPStyle.getXP();
if (WindowsMenuItemUI.isVistaPainting(xp)) {
Skin skin = xp.getSkin(null, Part.MP_POPUPSUBMENU);
return skin.getWidth();
} else {
return 4;
}
}
public int getIconHeight() {
if (WindowsMenuItemUI.isVistaPainting()) {
Skin skin = XPStyle.getXP().getSkin(null, Part.MP_POPUPSUBMENU);
XPStyle xp = XPStyle.getXP();
if (WindowsMenuItemUI.isVistaPainting(xp)) {
Skin skin = xp.getSkin(null, Part.MP_POPUPSUBMENU);
return skin.getHeight();
} else {
return 8;
@ -692,7 +694,8 @@ public class WindowsIconFactory implements Serializable
}
static int getIconWidth() {
return XPStyle.getXP().getSkin(null, Part.MP_POPUPCHECK).getWidth()
XPStyle xp = XPStyle.getXP();
return ((xp != null) ? xp.getSkin(null, Part.MP_POPUPCHECK).getWidth() : 16)
+ 2 * OFFSET;
}
@ -756,12 +759,17 @@ public class WindowsIconFactory implements Serializable
Icon icon = getIcon();
int height = 0;
if (icon != null) {
height = icon.getIconHeight() + 2 * OFFSET;
height = icon.getIconHeight();
} else {
Skin skin =
XPStyle.getXP().getSkin(null, Part.MP_POPUPCHECK);
height = skin.getHeight() + 2 * OFFSET;
XPStyle xp = XPStyle.getXP();
if (xp != null) {
Skin skin = xp.getSkin(null, Part.MP_POPUPCHECK);
height = skin.getHeight();
} else {
height = 16;
}
}
height += 2 * OFFSET;
return height;
}
@ -809,14 +817,16 @@ public class WindowsIconFactory implements Serializable
? State.BULLETDISABLED
: State.CHECKMARKDISABLED;
}
Skin skin;
XPStyle xp = XPStyle.getXP();
skin = xp.getSkin(c, backgroundPart);
skin.paintSkin(g, x, y,
getIconWidth(), getIconHeight(), backgroundState);
if (icon == null) {
skin = xp.getSkin(c, part);
skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
if (xp != null) {
Skin skin;
skin = xp.getSkin(c, backgroundPart);
skin.paintSkin(g, x, y,
getIconWidth(), getIconHeight(), backgroundState);
if (icon == null) {
skin = xp.getSkin(c, part);
skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
}
}
}
}

11
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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
@ -86,14 +86,15 @@ public class WindowsInternalFrameTitlePane extends BasicInternalFrameTitlePane {
}
} else {
buttonWidth += 2;
selectedTitleGradientColor =
UIManager.getColor("InternalFrame.activeTitleGradient");
notSelectedTitleGradientColor =
UIManager.getColor("InternalFrame.inactiveTitleGradient");
Color activeBorderColor =
UIManager.getColor("InternalFrame.activeBorderColor");
setBorder(BorderFactory.createLineBorder(activeBorderColor, 1));
}
// JDK-8039383: initialize these colors because getXP() may return null when theme is changed
selectedTitleGradientColor =
UIManager.getColor("InternalFrame.activeTitleGradient");
notSelectedTitleGradientColor =
UIManager.getColor("InternalFrame.inactiveTitleGradient");
}
protected void uninstallListeners() {

8
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
View File

@ -2326,8 +2326,9 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
}
public Object getXPValue(UIDefaults table) {
Border xpBorder = XPStyle.getXP().getBorder(null, (Part)xpValue);
if (extraMargin != null) {
XPStyle xp = XPStyle.getXP();
Border xpBorder = xp != null ? xp.getBorder(null, (Part)xpValue) : null;
if (xpBorder != null && extraMargin != null) {
return new BorderUIResource.
CompoundBorderUIResource(xpBorder, extraMargin);
} else {
@ -2343,7 +2344,8 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
public Object getXPValue(UIDefaults table) {
XPColorValueKey key = (XPColorValueKey)xpValue;
return XPStyle.getXP().getColor(key.skin, key.prop, null);
XPStyle xp = XPStyle.getXP();
return xp != null ? xp.getColor(key.skin, key.prop, null) : null;
}
private static class XPColorValueKey {

4
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
View File

@ -156,8 +156,8 @@ public class WindowsMenuBarUI extends BasicMenuBarUI
@Override
public void paint(Graphics g, JComponent c) {
if (WindowsMenuItemUI.isVistaPainting()) {
XPStyle xp = XPStyle.getXP();
XPStyle xp = XPStyle.getXP();
if (WindowsMenuItemUI.isVistaPainting(xp)) {
Skin skin;
skin = xp.getSkin(c, Part.MP_BARBACKGROUND);
int width = c.getWidth();

15
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -108,8 +108,9 @@ public class WindowsMenuItemUI extends BasicMenuItemUI {
static void paintBackground(WindowsMenuItemUIAccessor menuItemUI,
Graphics g, JMenuItem menuItem, Color bgColor) {
assert isVistaPainting();
if (isVistaPainting()) {
XPStyle xp = XPStyle.getXP();
assert isVistaPainting(xp);
if (isVistaPainting(xp)) {
int menuWidth = menuItem.getWidth();
int menuHeight = menuItem.getHeight();
if (menuItem.isOpaque()) {
@ -118,7 +119,6 @@ public class WindowsMenuItemUI extends BasicMenuItemUI {
g.fillRect(0,0, menuWidth, menuHeight);
g.setColor(oldColor);
}
XPStyle xp = XPStyle.getXP();
Part part = menuItemUI.getPart(menuItem);
Skin skin = xp.getSkin(menuItem, part);
skin.paintSkin(g, 0 , 0,
@ -170,8 +170,11 @@ public class WindowsMenuItemUI extends BasicMenuItemUI {
* is it possible that in some theme some Vista parts are not defined while
* others are?
*/
static boolean isVistaPainting() {
XPStyle xp = XPStyle.getXP();
static boolean isVistaPainting(final XPStyle xp) {
return xp != null && xp.isSkinDefined(null, Part.MP_POPUPITEM);
}
static boolean isVistaPainting() {
return isVistaPainting(XPStyle.getXP());
}
}

7
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -50,7 +50,8 @@ public class WindowsPopupMenuSeparatorUI extends BasicPopupMenuSeparatorUI {
public void paint(Graphics g, JComponent c) {
Dimension s = c.getSize();
if (WindowsMenuItemUI.isVistaPainting()) {
XPStyle xp = XPStyle.getXP();
if (WindowsMenuItemUI.isVistaPainting(xp)) {
int x = 1;
Component parent = c.getParent();
if (parent instanceof JComponent) {
@ -67,7 +68,7 @@ public class WindowsPopupMenuSeparatorUI extends BasicPopupMenuSeparatorUI {
x += WindowsPopupMenuUI.getGutterWidth();
}
}
Skin skin = XPStyle.getXP().getSkin(c, Part.MP_POPUPSEPARATOR);
Skin skin = xp.getSkin(c, Part.MP_POPUPSEPARATOR);
int skinHeight = skin.getHeight();
int y = (s.height - skinHeight) / 2;
skin.paintSkin(g, x, y, s.width - x - 1, skinHeight, State.NORMAL);

6
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -194,8 +194,8 @@ public class WindowsPopupMenuUI extends BasicPopupMenuUI {
@Override
public void paint(Graphics g, JComponent c) {
if (WindowsMenuItemUI.isVistaPainting()) {
XPStyle xp = XPStyle.getXP();
XPStyle xp = XPStyle.getXP();
if (WindowsMenuItemUI.isVistaPainting(xp)) {
Skin skin = xp.getSkin(c, Part.MP_POPUPBACKGROUND);
skin.paintSkin(g, 0, 0, c.getWidth(),c.getHeight(), State.NORMAL);
int textOffset = getTextOffset(c);

13
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -322,8 +322,9 @@ public class WindowsProgressBarUI extends BasicProgressBarUI
private Rectangle getFullChunkBounds(Rectangle box) {
boolean vertical = (progressBar.getOrientation() == JProgressBar.VERTICAL);
XPStyle xp = XPStyle.getXP();
int gap = xp.getInt(progressBar, Part.PP_PROGRESS, null,
Prop.PROGRESSSPACESIZE, 0);
int gap = (xp != null) ? xp.getInt(progressBar, Part.PP_PROGRESS,
null, Prop.PROGRESSSPACESIZE, 0)
: 0;
if (!vertical) {
int chunksize = box.width+gap;
@ -338,6 +339,9 @@ public class WindowsProgressBarUI extends BasicProgressBarUI
boolean vertical,
int bgwidth, int bgheight) {
XPStyle xp = XPStyle.getXP();
if (xp == null) {
return;
}
// create a new graphics to keep drawing surface state
Graphics2D gfx = (Graphics2D)g.create();
@ -396,6 +400,9 @@ public class WindowsProgressBarUI extends BasicProgressBarUI
private void paintXPBackground(Graphics g, boolean vertical,
int barRectWidth, int barRectHeight) {
XPStyle xp = XPStyle.getXP();
if (xp == null) {
return;
}
Part part = vertical ? Part.PP_BARVERT : Part.PP_BAR;
Skin skin = xp.getSkin(progressBar, part);

3
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -215,7 +215,6 @@ public class WindowsSliderUI extends BasicSliderUI
}
private Part getXPThumbPart() {
XPStyle xp = XPStyle.getXP();
Part part;
boolean vertical = (slider.getOrientation() == JSlider.VERTICAL);
boolean leftToRight = slider.getComponentOrientation().isLeftToRight();

5
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -63,6 +63,9 @@ public class WindowsSpinnerUI extends BasicSpinnerUI {
private void paintXPBackground(Graphics g, JComponent c) {
XPStyle xp = XPStyle.getXP();
if (xp == null) {
return;
}
Skin skin = xp.getSkin(c, Part.EP_EDIT);
State state = getXPState(c);
skin.paintSkin(g, 0, 0, c.getWidth(), c.getHeight(), state);

5
jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
View File

@ -91,9 +91,10 @@ public class WindowsTableHeaderUI extends BasicTableHeaderUI {
this.column = column;
this.hasRollover = (column == getRolloverColumn());
if (skin == null) {
skin = XPStyle.getXP().getSkin(header, Part.HP_HEADERITEM);
XPStyle xp = XPStyle.getXP();
skin = (xp != null) ? xp.getSkin(header, Part.HP_HEADERITEM) : null;
}
Insets margins = skin.getContentMargin();
Insets margins = (skin != null) ? skin.getContentMargin() : null;
Border border = null;
int contentTop = 0;
int contentLeft = 0;

45
jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java
View File

@ -115,7 +115,7 @@ class XPStyle {
}
}
}
return xp;
return ThemeReader.isXPStyleEnabled() ? xp : null;
}
static boolean isVista() {
@ -180,9 +180,10 @@ class XPStyle {
* should probably be cached there instead of here.
*/
Dimension getDimension(Component c, Part part, State state, Prop prop) {
return ThemeReader.getPosition(part.getControlName(c), part.getValue(),
State.getValue(part, state),
prop.getValue());
Dimension d = ThemeReader.getPosition(part.getControlName(c), part.getValue(),
State.getValue(part, state),
prop.getValue());
return (d != null) ? d : new Dimension();
}
/** Get a named <code>Point</code> (e.g. a location or an offset) value
@ -199,11 +200,7 @@ class XPStyle {
Dimension d = ThemeReader.getPosition(part.getControlName(c), part.getValue(),
State.getValue(part, state),
prop.getValue());
if (d != null) {
return new Point(d.width, d.height);
} else {
return null;
}
return (d != null) ? new Point(d.width, d.height) : new Point();
}
/** Get a named <code>Insets</code> value from the current style
@ -217,9 +214,10 @@ class XPStyle {
* The return value is already cached in those places.
*/
Insets getMargin(Component c, Part part, State state, Prop prop) {
return ThemeReader.getThemeMargins(part.getControlName(c), part.getValue(),
State.getValue(part, state),
prop.getValue());
Insets insets = ThemeReader.getThemeMargins(part.getControlName(c), part.getValue(),
State.getValue(part, state),
prop.getValue());
return (insets != null) ? insets : new Insets(0, 0, 0, 0);
}
@ -509,16 +507,17 @@ class XPStyle {
int boundingWidth = 100;
int boundingHeight = 100;
return ThemeReader.getThemeBackgroundContentMargins(
Insets insets = ThemeReader.getThemeBackgroundContentMargins(
part.getControlName(null), part.getValue(),
0, boundingWidth, boundingHeight);
return (insets != null) ? insets : new Insets(0, 0, 0, 0);
}
private int getWidth(State state) {
if (size == null) {
size = getPartSize(part, state);
}
return size.width;
return (size != null) ? size.width : 0;
}
int getWidth() {
@ -529,7 +528,7 @@ class XPStyle {
if (size == null) {
size = getPartSize(part, state);
}
return size.height;
return (size != null) ? size.height : 0;
}
int getHeight() {
@ -586,6 +585,9 @@ class XPStyle {
* @param state which state to paint
*/
void paintSkin(Graphics g, int dx, int dy, int dw, int dh, State state) {
if (XPStyle.getXP() == null) {
return;
}
if (ThemeReader.isGetThemeTransitionDurationDefined()
&& component instanceof JComponent
&& SwingUtilities.getAncestorOfClass(CellRendererPane.class,
@ -611,6 +613,9 @@ class XPStyle {
* @param state which state to paint
*/
void paintSkinRaw(Graphics g, int dx, int dy, int dw, int dh, State state) {
if (XPStyle.getXP() == null) {
return;
}
skinPainter.paint(null, g, dx, dy, dw, dh, this, state);
}
@ -629,6 +634,9 @@ class XPStyle {
*/
void paintSkin(Graphics g, int dx, int dy, int dw, int dh, State state,
boolean borderFill) {
if (XPStyle.getXP() == null) {
return;
}
if(borderFill && "borderfill".equals(getTypeEnumName(component, part,
state, Prop.BGTYPE))) {
return;
@ -684,7 +692,7 @@ class XPStyle {
public GlyphButton(Component parent, Part part) {
XPStyle xp = getXP();
skin = xp.getSkin(parent, part);
skin = xp != null ? xp.getSkin(parent, part) : null;
setBorder(null);
setContentAreaFilled(false);
setMinimumSize(new Dimension(5, 5));
@ -709,13 +717,16 @@ class XPStyle {
}
public void paintComponent(Graphics g) {
if (XPStyle.getXP() == null || skin == null) {
return;
}
Dimension d = getSize();
skin.paintSkin(g, 0, 0, d.width, d.height, getState());
}
public void setPart(Component parent, Part part) {
XPStyle xp = getXP();
skin = xp.getSkin(parent, part);
skin = xp != null ? xp.getSkin(parent, part) : null;
revalidate();
repaint();
}

4
jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java
View File

@ -45,6 +45,10 @@ public final class ThemeReader {
return false;
}
public static boolean isXPStyleEnabled() {
return false;
}
public static void paintBackground(int[] buffer, String widget,
int part, int state, int x, int y, int w, int h, int stride) {
}

38
jdk/src/windows/classes/sun/awt/windows/ThemeReader.java
View File

@ -60,22 +60,22 @@ public final class ThemeReader {
new ReentrantReadWriteLock();
private static final Lock readLock = readWriteLock.readLock();
private static final Lock writeLock = readWriteLock.writeLock();
private static volatile boolean valid = false;
static volatile boolean xpStyleEnabled;
static void flush() {
writeLock.lock();
try {
// Close old themes.
for (Long value : widgetToTheme.values()) {
closeTheme(value.longValue());
}
widgetToTheme.clear();
} finally {
writeLock.unlock();
}
// Could be called on Toolkit thread, so do not try to acquire locks
// to avoid deadlock with theme initialization
valid = false;
}
public static native boolean isThemed();
public static boolean isXPStyleEnabled() {
return xpStyleEnabled;
}
// this should be called only with writeLock held
private static Long getThemeImpl(String widget) {
Long theme = widgetToTheme.get(widget);
@ -98,6 +98,24 @@ public final class ThemeReader {
// returns theme value
// this method should be invoked with readLock locked
private static Long getTheme(String widget) {
if (!valid) {
readLock.unlock();
writeLock.lock();
try {
if (!valid) {
// Close old themes.
for (Long value : widgetToTheme.values()) {
closeTheme(value);
}
widgetToTheme.clear();
valid = true;
}
} finally {
readLock.lock();
writeLock.unlock();
}
}
// mostly copied from the javadoc for ReentrantReadWriteLock
Long theme = widgetToTheme.get(widget);
if (theme == null) {

53
jdk/src/windows/classes/sun/awt/windows/WToolkit.java
View File

@ -36,6 +36,7 @@ import java.awt.TrayIcon;
import java.beans.PropertyChangeListener;
import java.security.AccessController;
import java.security.PrivilegedAction;
import sun.awt.AppContext;
import sun.awt.AWTAutoShutdown;
import sun.awt.AWTPermissions;
import sun.awt.LightweightFrame;
@ -72,6 +73,9 @@ public final class WToolkit extends SunToolkit implements Runnable {
private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.windows.WToolkit");
// Desktop property which specifies whether XP visual styles are in effect
public static final String XPSTYLE_THEME_ACTIVE = "win.xpstyle.themeActive";
static GraphicsConfiguration config;
// System clipboard.
@ -895,7 +899,7 @@ public final class WToolkit extends SunToolkit implements Runnable {
private synchronized void lazilyInitWProps() {
if (wprops == null) {
wprops = new WDesktopProperties(this);
updateProperties();
updateProperties(wprops.getProperties());
}
}
@ -930,21 +934,36 @@ public final class WToolkit extends SunToolkit implements Runnable {
* Windows doesn't always send WM_SETTINGCHANGE when it should.
*/
private void windowsSettingChange() {
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
updateProperties();
}
});
}
private synchronized void updateProperties() {
if (null == wprops) {
// wprops has not been initialized, so we have nothing to update
// JDK-8039383: Have to update the value of XPSTYLE_THEME_ACTIVE property
// as soon as possible to prevent NPE and other errors because theme data
// has become unavailable.
final Map<String, Object> props = getWProps();
if (props == null) {
// props has not been initialized, so we have nothing to update
return;
}
Map<String, Object> props = wprops.getProperties();
updateXPStyleEnabled(props.get(XPSTYLE_THEME_ACTIVE));
if (AppContext.getAppContext() == null) {
// We cannot post the update to any EventQueue. Listeners will
// be called on EDTs by DesktopPropertyChangeSupport
updateProperties(props);
} else {
// Cannot update on Toolkit thread.
// DesktopPropertyChangeSupport will call listeners on Toolkit
// thread if it has AppContext (standalone mode)
EventQueue.invokeLater(() -> updateProperties(props));
}
}
private synchronized void updateProperties(final Map<String, Object> props) {
if (null == props) {
return;
}
updateXPStyleEnabled(props.get(XPSTYLE_THEME_ACTIVE));
for (String propName : props.keySet()) {
Object val = props.get(propName);
if (log.isLoggable(PlatformLogger.Level.FINER)) {
@ -954,6 +973,14 @@ public final class WToolkit extends SunToolkit implements Runnable {
}
}
private synchronized Map<String, Object> getWProps() {
return (wprops != null) ? wprops.getProperties() : null;
}
private void updateXPStyleEnabled(final Object dskProp) {
ThemeReader.xpStyleEnabled = Boolean.TRUE.equals(dskProp);
}
@Override
public synchronized void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
if (name == null) {

63
jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java Normal file
View File

@ -0,0 +1,63 @@
/*
* 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 8046391
* @summary JFileChooser hangs if displayed in Windows L&F
* @author Alexey Ivanov
* @run main/othervm/timeout=10 bug8046391
*/
import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
import sun.awt.OSInfo;
import sun.awt.OSInfo.OSType;
import javax.swing.JFileChooser;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
public class bug8046391 {
public static void main(String[] args) throws Exception {
OSType type = OSInfo.getOSType();
if (type != OSType.WINDOWS) {
System.out.println("This test is for Windows only... skipping!");
return;
}
SwingUtilities.invokeAndWait(() -> {
try {
UIManager.setLookAndFeel(new WindowsLookAndFeel());
} catch (UnsupportedLookAndFeelException e) {
e.printStackTrace();
}
System.out.println("Creating JFileChooser...");
JFileChooser fileChooser = new JFileChooser();
System.out.println("Test passed: chooser = " + fileChooser);
});
// Test fails if creating JFileChooser hangs
}
}