Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8271315: Redo: Nimbus JTree renderer properties persist across L&F changes #5178

Closed
wants to merge 5 commits into from
Closed
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -43,7 +43,7 @@
* An icon that delegates to a painter.
* @author rbair
*/
class NimbusIcon implements SynthIcon {
class NimbusIcon implements SynthIcon, UIResource {
private int width;
private int height;
private String prefix;
@@ -27352,10 +27352,10 @@
<contentMargins top="0" bottom="0" left="0" right="0"/>
<style>
<textForeground>
<matte red="0" green="0" blue="0" alpha="0" uiDefaultParentName="text" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
<matte red="0" green="0" blue="0" alpha="0" uiDefaultParentName="text" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
</textForeground>
<textBackground>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
</textBackground>
<background>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
@@ -27379,10 +27379,10 @@
<insets top="2" left="0" bottom="1" right="5"/>
</uiProperty>
<uiProperty name="selectionForeground" type="COLOR">
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusSelectedText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusSelectedText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
</uiProperty>
<uiProperty name="selectionBackground" type="COLOR">
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
<matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
</uiProperty>
<uiProperty name="dropLineColor" type="COLOR">
<matte red="242" green="242" blue="242" alpha="255" uiDefaultParentName="nimbusFocus" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0" alphaOffset="0"/>
@@ -27621,7 +27621,9 @@
<stateTypes/>
<contentMargins top="0" bottom="0" left="0" right="0"/>
<style>
<textForeground/>
<textForeground>
<matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusSelectedText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="true"/>
</textForeground>
<textBackground/>
<background/>
<uiproperties/>
@@ -29,6 +29,7 @@
import javax.swing.plaf.*;
import javax.swing.plaf.basic.*;
import javax.swing.text.View;
import javax.swing.tree.DefaultTreeCellRenderer;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.Insets;
@@ -207,8 +208,14 @@ protected void paint(SynthContext context, Graphics g) {
Icon icon = (label.isEnabled()) ? label.getIcon() :
label.getDisabledIcon();

g.setColor(context.getStyle().getColor(context,
ColorType.TEXT_FOREGROUND));
if (label instanceof DefaultTreeCellRenderer &&
label.getForeground() instanceof UIResource) {
g.setColor(label.getForeground());
} else {
g.setColor(context.getStyle().getColor(context,
ColorType.TEXT_FOREGROUND));
}

g.setFont(style.getFont(context));
context.getStyle().getGraphicsUtils(context).paintText(
context, g, label.getText(), icon,
@@ -0,0 +1,101 @@
/*
* Copyright (c) 2021, 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.
*/

import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.plaf.UIResource;
import javax.swing.plaf.nimbus.NimbusLookAndFeel;
import java.awt.Color;

/**
* @test
* @bug 8271315
* @summary Nimbus JTree renderer properties persist across L&F changes
* @key headful
* @run main NimbusPropertiesDoNotImplUIResource
*/

public class NimbusPropertiesDoNotImplUIResource {
private static final String[] defPropertyKeys = new String[] {
"Tree.leafIcon", "Tree.closedIcon",
"Tree.openIcon", "Tree.selectionForeground",
"Tree.textForeground", "Tree.selectionBackground",
"Tree.textBackground", "Tree.selectionBorderColor"};

private static String failedKeys = null;

This comment has been minimized.

@aivanov-jdk

aivanov-jdk Aug 23, 2021
Member Outdated

This is unnecessary, you initialise it to null before the loop over the properties.


public static void main(String[] args) throws Exception {
UIManager.LookAndFeelInfo[] installedLookAndFeels;
installedLookAndFeels = UIManager.getInstalledLookAndFeels();

for (UIManager.LookAndFeelInfo LF : installedLookAndFeels) {
try {
UIManager.setLookAndFeel(LF.getClassName());
failedKeys = null;
for (String propertyKey : defPropertyKeys) {
verifyProperty(propertyKey);
}
if(failedKeys != null) {

This comment has been minimized.

@aivanov-jdk

aivanov-jdk Aug 23, 2021
Member Outdated

Suggested change
if(failedKeys != null) {
if (failedKeys != null) {

And in other places too, please.

throw new RuntimeException("JTree renderer Properties " +
failedKeys + " are not instance of UIResource for "
+ LF.getClassName());
}
} catch(UnsupportedLookAndFeelException e) {

This comment has been minimized.

@aivanov-jdk

aivanov-jdk Aug 23, 2021
Member Outdated

Suggested change
} catch(UnsupportedLookAndFeelException e) {
} catch (UnsupportedLookAndFeelException e) {
System.out.println("Note: LookAndFeel " + LF.getClassName()
+ " is not supported on this configuration");
}
}

//Check that the both uiResource option true and false are working for
//getDerivedColor method of NimbusLookAndFeel
Comment on lines +69 to +70

This comment has been minimized.

@aivanov-jdk

aivanov-jdk Aug 23, 2021
Member Outdated

Suggested change
//Check that the both uiResource option true and false are working for
//getDerivedColor method of NimbusLookAndFeel
// Check that both uiResource options true and false work for
// getDerivedColor method of NimbusLookAndFeel
UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
Color color1 = ((NimbusLookAndFeel)UIManager.getLookAndFeel())
.getDerivedColor("text", 0, 0, 0, 0, false);
if(color1 instanceof UIResource) {
throw new RuntimeException("color1 should not be instance of " +
"UIResource");
}

Color color2 = ((NimbusLookAndFeel)UIManager.getLookAndFeel())
.getDerivedColor("text", 0, 0, 0, 0, true);
if(!(color2 instanceof UIResource)) {
throw new RuntimeException("color2 should be instance of " +
"UIResource");
}

}

private static void verifyProperty(String propertyKey) {
Object property = UIManager.get(propertyKey);
if (property == null) {
return;
}
if (!(property instanceof UIResource)) {
if(failedKeys == null) {
failedKeys = ":" + propertyKey;
} else {
failedKeys += "," + propertyKey;
}
}
}
}