Index: src/main/java/common/javax/swing/plaf/basic/BasicScrollBarUI.java =================================================================== --- src/main/java/common/javax/swing/plaf/basic/BasicScrollBarUI.java (revision 512724) +++ src/main/java/common/javax/swing/plaf/basic/BasicScrollBarUI.java (working copy) @@ -277,22 +277,28 @@ } protected void configureScrollBarColors() { - if ((thumbColor == null) || (thumbColor instanceof UIResource)) { + if (thumbColor == null || thumbDarkShadowColor == null || thumbHighlightColor == null || + thumbLightShadowColor == null || trackColor == null || trackHighlightColor == null) { + + throw new NullPointerException(); + } + + if ((thumbColor instanceof UIResource)) { thumbColor = UIManager.getColor("ScrollBar.thumb"); } - if ((thumbDarkShadowColor == null) || (thumbDarkShadowColor instanceof UIResource)) { + if ((thumbDarkShadowColor instanceof UIResource)) { thumbDarkShadowColor = UIManager.getColor("ScrollBar.thumbDarkShadow"); } - if ((thumbHighlightColor == null) || (thumbHighlightColor instanceof UIResource)) { + if ((thumbHighlightColor instanceof UIResource)) { thumbHighlightColor = UIManager.getColor("ScrollBar.thumbHighlight"); } - if ((thumbLightShadowColor == null) || (thumbLightShadowColor instanceof UIResource)) { + if ((thumbLightShadowColor instanceof UIResource)) { thumbLightShadowColor = UIManager.getColor("ScrollBar.thumbShadow"); } - if ((trackColor == null) || (trackColor instanceof UIResource)) { + if ((trackColor instanceof UIResource)) { trackColor = UIManager.getColor("ScrollBar.track"); } - if ((trackHighlightColor == null) || (trackHighlightColor instanceof UIResource)) { + if ((trackHighlightColor instanceof UIResource)) { trackHighlightColor = UIManager.getColor("ScrollBar.trackHighlight"); } }