Index: modules/swing/src/main/java/common/javax/swing/colorchooser/SwatchesPanel.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/colorchooser/SwatchesPanel.java (revision 501787) +++ modules/swing/src/main/java/common/javax/swing/colorchooser/SwatchesPanel.java (working copy) @@ -132,8 +132,8 @@ recentSwatchSize = UIManager.getDimension("ColorChooser.swatchesRecentSwatchSize"); JPanel right = new JPanel(new BorderLayout()); - recentPanel = new SwatchPanel(new Color[RECENT_SWATCH_WIDTH][RECENT_SWATCH_HEIGHT], - null, recentSwatchSize); + recentPanel = new SwatchPanel(createRecentColors(), null, recentSwatchSize); + right.add(BorderLayout.CENTER, new JLabel(UIManager.getString("ColorChooser.swatchesRecentText"))); right.add(BorderLayout.SOUTH, recentPanel); @@ -175,5 +175,17 @@ } return colors; } + + private static Color[][] createRecentColors() { + final Color[][] colors = new Color[RECENT_SWATCH_WIDTH][RECENT_SWATCH_HEIGHT]; + final Object propertyValue = UIManager.get("ColorChooser.swatchesDefaultRecentColor"); + final Color defaultColor = propertyValue instanceof Color ? (Color)propertyValue : Color.BLACK; + for (Color[] cols : colors) { + for (int i = 0; i < cols.length; i++) { + cols[i] = defaultColor; + } + } + return colors; + } }