8249619: Nimbus L&F Fix for 8041701 is causing some Nimbus tests to fail

trebari · trebari · commit 39d4b22fc075 · 2020-07-17T10:05:38.000-07:00
Reviewed-by: prr
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
@@ -25,7 +25,6 @@
 package javax.swing.plaf.nimbus;
 
 import javax.swing.UIManager;
-import javax.swing.plaf.UIResource;
 import java.awt.Color;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyChangeListener;
@@ -40,7 +39,7 @@
  * @author Jasper Potts
  */
 @SuppressWarnings("serial") // Same-version serialization only
-class DerivedColor extends Color implements UIResource {
+class DerivedColor extends Color {
     private final String uiDefaultParentName;
     private final float hOffset, sOffset, bOffset;
     private final int aOffset;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
@@ -43,7 +43,7 @@
  * An icon that delegates to a painter.
  * @author rbair
  */
-class NimbusIcon implements SynthIcon, UIResource {
+class NimbusIcon implements SynthIcon {
     private int width;
     private int height;
     private String prefix;
diff --git a/test/jdk/javax/swing/JTree/8041701/NimbusPropertiesDoNotImplUIResource.java b/test/jdk/javax/swing/JTree/8041701/NimbusPropertiesDoNotImplUIResource.java
