Index: javax/swing/plaf/metal/MetalTabbedPaneUI.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java,v retrieving revision 1.12 diff -u -r1.12 MetalTabbedPaneUI.java --- javax/swing/plaf/metal/MetalTabbedPaneUI.java 18 Nov 2005 22:04:23 -0000 1.12 +++ javax/swing/plaf/metal/MetalTabbedPaneUI.java 18 Nov 2005 23:00:19 -0000 @@ -319,9 +319,16 @@ int tabIndex, int x, int y, int w, int h, boolean isSelected) { if (isSelected) - g.setColor(MetalLookAndFeel.getControl()); + g.setColor(UIManager.getColor("TabbedPane.selected")); else - g.setColor(MetalLookAndFeel.getControlShadow()); + { + // This is only present in the OceanTheme, so we must check if it + // is actually there + Color background = UIManager.getColor("TabbedPane.unselectedBackground"); + if (background == null) + background = UIManager.getColor("TabbedPane.background"); + g.setColor(background); + } int[] px, py; if (tabPlacement == TOP) { Index: javax/swing/plaf/metal/OceanTheme.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/OceanTheme.java,v retrieving revision 1.5 diff -u -r1.5 OceanTheme.java --- javax/swing/plaf/metal/OceanTheme.java 16 Nov 2005 16:41:41 -0000 1.5 +++ javax/swing/plaf/metal/OceanTheme.java 18 Nov 2005 23:00:19 -0000 @@ -238,6 +238,10 @@ {new Double(0.3), new Double(0.0), new ColorUIResource(221, 232, 243), new ColorUIResource(Color.WHITE), new ColorUIResource(184, 207, 229)})); + defaults.put("Button.rollover", Boolean.TRUE); + + defaults.put("TabbedPane.selected", new ColorUIResource(200, 221, 242)); + defaults.put("TabbedPane.unselectedBackground", SECONDARY3); } }