This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
Patch: MetalLookAndFeel fixes
- From: Lillian Angel <langel at redhat dot com>
- To: mauve-patches <mauve-patches at sources dot redhat dot com>
- Date: Tue, 03 Jan 2006 16:18:50 -0500
- Subject: Patch: MetalLookAndFeel fixes
This patch is rather large, but I basically did the same thing in each
class. The theme needed to be set prior to retrieving the colors,
otherwise null would be returned. These tests would all fail on
Classpath and Sun, but they pass now.
2006-01-03 Lillian Angel <langel@redhat.com>
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java:i
(test): Fixed color.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java:i
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java:
(test): Fixed to set the current theme, otherwise the color
returned is null.
*
gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java:
(test): Fixed color.
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getAcceleratorForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java 3 Jan 2006 21:09:29 -0000
@@ -42,7 +42,7 @@
public void test(TestHarness harness) {
new MetalLookAndFeel();
ColorUIResource c = MetalLookAndFeel.getAcceleratorForeground();
- harness.check(c, new ColorUIResource(new Color(102, 102, 153)));
+ harness.check(c, new ColorUIResource(new Color(99, 130, 191)));
MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme() {
public ColorUIResource getAcceleratorForeground() {
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getAcceleratorSelectedForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getAcceleratorSelectedForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java,v
retrieving revision 1.2
diff -u -r1.2 getBlack.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource black = MetalLookAndFeel.getBlack();
harness.check(black, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java,v
retrieving revision 1.2
diff -u -r1.2 getControl.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControl();
harness.check(c, new ColorUIResource(new Color(204, 204, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getControlDarkShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlDarkShadow();
harness.check(c, new ColorUIResource(new Color(102, 102, 102)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java,v
retrieving revision 1.2
diff -u -r1.2 getControlDisabled.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlDisabled();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java,v
retrieving revision 1.2
diff -u -r1.2 getControlHighlight.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlHighlight();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java,v
retrieving revision 1.2
diff -u -r1.2 getControlInfo.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlInfo();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getControlShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlShadow();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getControlTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getControlTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getControlTextFont();
harness.check(f, new FontUIResource("Dialog", Font.BOLD, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java,v
retrieving revision 1.6
diff -u -r1.6 getDefaults.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java 19 Oct 2005 12:45:25 -0000 1.6
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java 3 Jan 2006 21:09:29 -0000
@@ -46,6 +46,7 @@
import javax.swing.plaf.InputMapUIResource;
import javax.swing.plaf.InsetsUIResource;
import javax.swing.plaf.UIResource;
+import javax.swing.plaf.IconUIResource;
import javax.swing.plaf.BorderUIResource.LineBorderUIResource;
import javax.swing.plaf.basic.BasicBorders;
import javax.swing.plaf.metal.DefaultMetalTheme;
@@ -487,11 +488,11 @@
harness.check(defaults.get("OptionPane.errorDialog.titlePane.background"), new ColorUIResource(255, 153, 153));
harness.check(defaults.get("OptionPane.errorDialog.titlePane.foreground"), new ColorUIResource(51, 0, 0));
harness.check(defaults.get("OptionPane.errorDialog.titlePane.shadow"), new ColorUIResource(204, 102, 102));
- harness.check(defaults.get("OptionPane.errorIcon"), null);
+ harness.check(defaults.get("OptionPane.errorIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.errorSound"), "sounds/OptionPaneError.wav");
harness.check(defaults.get("OptionPane.font"), new FontUIResource("Dialog", Font.PLAIN, 12));
harness.check(defaults.get("OptionPane.foreground"), new ColorUIResource(0, 0, 10));
- harness.check(defaults.get("OptionPane.informationIcon"), null);
+ harness.check(defaults.get("OptionPane.informationIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.informationSound"), "sounds/OptionPaneInformation.wav");
harness.check(defaults.get("OptionPane.messageAreaBorder") instanceof BorderUIResource.EmptyBorderUIResource);
harness.check(defaults.get("OptionPane.messageForeground"), new ColorUIResource(0, 0, 10));
@@ -500,13 +501,13 @@
harness.check(defaults.get("OptionPane.questionDialog.titlePane.background"), new ColorUIResource(153, 204, 153));
harness.check(defaults.get("OptionPane.questionDialog.titlePane.foreground"), new ColorUIResource(0, 51, 0));
harness.check(defaults.get("OptionPane.questionDialog.titlePane.shadow"), new ColorUIResource(102, 153, 102));
- harness.check(defaults.get("OptionPane.questionIcon"), null);
+ harness.check(defaults.get("OptionPane.questionIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.questionSound"), "sounds/OptionPaneQuestion.wav");
harness.check(defaults.get("OptionPane.warningDialog.border.background"), new ColorUIResource(153, 102, 51));
harness.check(defaults.get("OptionPane.warningDialog.titlePane.background"), new ColorUIResource(255, 204, 153));
harness.check(defaults.get("OptionPane.warningDialog.titlePane.foreground"), new ColorUIResource(102, 51, 0));
harness.check(defaults.get("OptionPane.warningDialog.titlePane.shadow"), new ColorUIResource(204, 153, 102));
- harness.check(defaults.get("OptionPane.warningIcon"), null);
+ harness.check(defaults.get("OptionPane.warningIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.warningSound"), "sounds/OptionPaneWarning.wav");
bindings = (Object[]) defaults.get("OptionPane.windowBindings");
harness.check(bindings.length, 2);
@@ -605,8 +606,8 @@
harness.check(defaults.get("ScrollBar.allowsAbsolutePositioning"), Boolean.TRUE);
harness.check(defaults.get("ScrollBar.background"), new ColorUIResource(0, 0, 4));
harness.check(defaults.get("ScrollBar.darkShadow"), new ColorUIResource(0, 0, 5));
- harness.check(defaults.get("ScrollBar.focusInputMap") instanceof InputMapUIResource);
- harness.check(defaults.get("ScrollBar.focusInputMap.RightToLeft") instanceof InputMapUIResource);
+ harness.check(defaults.get("ScrollBar.focusInputMap"), null);
+ harness.check(defaults.get("ScrollBar.focusInputMap.RightToLeft"), null);
harness.check(defaults.get("ScrollBar.foreground"), new ColorUIResource(0, 0, 4));
harness.check(defaults.get("ScrollBar.highlight"), new ColorUIResource(0, 0, 7));
harness.check(defaults.get("ScrollBar.maximumThumbSize"), new DimensionUIResource(4096, 4096));
@@ -814,7 +815,7 @@
harness.check(defaults.get("TextPane.selectionForeground"), new ColorUIResource(0, 0, 13));
harness.checkPoint("TitledBorder");
- harness.check(defaults.get("TitledBorder.border"), null);
+ harness.check(defaults.get("TitledBorder.border") instanceof LineBorderUIResource);
harness.check(defaults.get("TitledBorder.font"), new FontUIResource("Dialog", Font.BOLD, 12));
harness.check(defaults.get("TitledBorder.titleColor"), new ColorUIResource(0, 0, 27));
@@ -885,7 +886,7 @@
harness.check(defaults.get("Tree.line"), new ColorUIResource(0, 0, 20));
harness.check(defaults.get("Tree.openIcon") instanceof MetalIconFactory.TreeFolderIcon);
harness.check(defaults.getInt("Tree.rightChildIndent"), 13);
- harness.check(defaults.getInt("Tree.rowHeight"), 16);
+ harness.check(defaults.getInt("Tree.rowHeight"), 0);
harness.check(defaults.get("Tree.scrollsOnExpand"), Boolean.TRUE);
harness.check(defaults.get("Tree.selectionBackground"), new ColorUIResource(0, 0, 28));
harness.check(defaults.get("Tree.selectionBorderColor"), new ColorUIResource(0, 0, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java,v
retrieving revision 1.2
diff -u -r1.2 getDesktopColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getDesktopColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java,v
retrieving revision 1.2
diff -u -r1.2 getFocusColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getFocusColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getHighlightedTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getHighlightedTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getInactiveControlTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getInactiveControlTextColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getInactiveSystemTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getInactiveSystemTextColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuBackground();
harness.check(c, new ColorUIResource(new Color(204, 204, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuDisabledForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,7 +40,8 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
- ColorUIResource c = MetalLookAndFeel.getMenuDisabledForeground();
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ ColorUIResource c = MetalLookAndFeel.getMenuDisabledForeground();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme() {
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuSelectedBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuSelectedBackground();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuSelectedForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuSelectedForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getMenuTextFont();
harness.check(f, new FontUIResource("Dialog", Font.BOLD, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControl.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControl();
harness.check(c, new ColorUIResource(new Color(204, 204, 255)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlDarkShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlDarkShadow();
harness.check(c, new ColorUIResource(new Color(102, 102, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlHighlight.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlHighlight();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlInfo.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlInfo();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlShadow();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getSeparatorBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getSeparatorBackground();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getSeparatorForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getSeparatorForeground();
harness.check(c, new ColorUIResource(new Color(102, 102, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getSubTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getSubTextFont();
harness.check(f, new FontUIResource("Dialog", Font.PLAIN, 10));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getSystemTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getSystemTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getSystemTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getSystemTextFont();
harness.check(f, new FontUIResource("Dialog", Font.PLAIN, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java,v
retrieving revision 1.2
diff -u -r1.2 getTextHighlightColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getTextHighlightColor();
harness.check(c, new ColorUIResource(new Color(204, 204, 255)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getUserTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getUserTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getUserTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getUserTextFont();
harness.check(f, new FontUIResource("Dialog", Font.PLAIN, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java,v
retrieving revision 1.2
diff -u -r1.2 getWhite.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource white = MetalLookAndFeel.getWhite();
harness.check(white, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowBackground();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleBackground();
harness.check(c, new ColorUIResource(new Color(204, 204, 255)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getWindowTitleFont();
harness.check(f, new FontUIResource("Dialog", Font.BOLD, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleInactiveBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleInactiveBackground();
harness.check(c, new ColorUIResource(new Color(204, 204, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleInactiveForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleInactiveForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java,v
retrieving revision 1.2
diff -u -r1.2 setCurrentTheme.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java 3 Jan 2006 21:09:29 -0000
@@ -41,7 +41,7 @@
{
MetalLookAndFeel laf = new MetalLookAndFeel();
Color c1 = laf.getDefaults().getColor("Button.background");
- h.check(c1, new Color(204, 204, 204));
+ h.check(c1, new Color(238, 238, 238));
MetalLookAndFeel.setCurrentTheme(new TestTheme());
c1 = laf.getDefaults().getColor("Button.background");
h.check(c1, Color.red);
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getAcceleratorForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorForeground.java 3 Jan 2006 21:09:29 -0000
@@ -42,7 +42,7 @@
public void test(TestHarness harness) {
new MetalLookAndFeel();
ColorUIResource c = MetalLookAndFeel.getAcceleratorForeground();
- harness.check(c, new ColorUIResource(new Color(102, 102, 153)));
+ harness.check(c, new ColorUIResource(new Color(99, 130, 191)));
MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme() {
public ColorUIResource getAcceleratorForeground() {
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getAcceleratorSelectedForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getAcceleratorSelectedForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getAcceleratorSelectedForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java,v
retrieving revision 1.2
diff -u -r1.2 getBlack.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getBlack.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource black = MetalLookAndFeel.getBlack();
harness.check(black, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java,v
retrieving revision 1.2
diff -u -r1.2 getControl.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControl.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControl();
harness.check(c, new ColorUIResource(new Color(204, 204, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getControlDarkShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDarkShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlDarkShadow();
harness.check(c, new ColorUIResource(new Color(102, 102, 102)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java,v
retrieving revision 1.2
diff -u -r1.2 getControlDisabled.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlDisabled.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlDisabled();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java,v
retrieving revision 1.2
diff -u -r1.2 getControlHighlight.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlHighlight.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlHighlight();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java,v
retrieving revision 1.2
diff -u -r1.2 getControlInfo.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlInfo.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlInfo();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getControlShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlShadow();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getControlTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getControlTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getControlTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getControlTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getControlTextFont();
harness.check(f, new FontUIResource("Dialog", Font.BOLD, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java,v
retrieving revision 1.6
diff -u -r1.6 getDefaults.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java 19 Oct 2005 12:45:25 -0000 1.6
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDefaults.java 3 Jan 2006 21:09:29 -0000
@@ -46,6 +46,7 @@
import javax.swing.plaf.InputMapUIResource;
import javax.swing.plaf.InsetsUIResource;
import javax.swing.plaf.UIResource;
+import javax.swing.plaf.IconUIResource;
import javax.swing.plaf.BorderUIResource.LineBorderUIResource;
import javax.swing.plaf.basic.BasicBorders;
import javax.swing.plaf.metal.DefaultMetalTheme;
@@ -487,11 +488,11 @@
harness.check(defaults.get("OptionPane.errorDialog.titlePane.background"), new ColorUIResource(255, 153, 153));
harness.check(defaults.get("OptionPane.errorDialog.titlePane.foreground"), new ColorUIResource(51, 0, 0));
harness.check(defaults.get("OptionPane.errorDialog.titlePane.shadow"), new ColorUIResource(204, 102, 102));
- harness.check(defaults.get("OptionPane.errorIcon"), null);
+ harness.check(defaults.get("OptionPane.errorIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.errorSound"), "sounds/OptionPaneError.wav");
harness.check(defaults.get("OptionPane.font"), new FontUIResource("Dialog", Font.PLAIN, 12));
harness.check(defaults.get("OptionPane.foreground"), new ColorUIResource(0, 0, 10));
- harness.check(defaults.get("OptionPane.informationIcon"), null);
+ harness.check(defaults.get("OptionPane.informationIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.informationSound"), "sounds/OptionPaneInformation.wav");
harness.check(defaults.get("OptionPane.messageAreaBorder") instanceof BorderUIResource.EmptyBorderUIResource);
harness.check(defaults.get("OptionPane.messageForeground"), new ColorUIResource(0, 0, 10));
@@ -500,13 +501,13 @@
harness.check(defaults.get("OptionPane.questionDialog.titlePane.background"), new ColorUIResource(153, 204, 153));
harness.check(defaults.get("OptionPane.questionDialog.titlePane.foreground"), new ColorUIResource(0, 51, 0));
harness.check(defaults.get("OptionPane.questionDialog.titlePane.shadow"), new ColorUIResource(102, 153, 102));
- harness.check(defaults.get("OptionPane.questionIcon"), null);
+ harness.check(defaults.get("OptionPane.questionIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.questionSound"), "sounds/OptionPaneQuestion.wav");
harness.check(defaults.get("OptionPane.warningDialog.border.background"), new ColorUIResource(153, 102, 51));
harness.check(defaults.get("OptionPane.warningDialog.titlePane.background"), new ColorUIResource(255, 204, 153));
harness.check(defaults.get("OptionPane.warningDialog.titlePane.foreground"), new ColorUIResource(102, 51, 0));
harness.check(defaults.get("OptionPane.warningDialog.titlePane.shadow"), new ColorUIResource(204, 153, 102));
- harness.check(defaults.get("OptionPane.warningIcon"), null);
+ harness.check(defaults.get("OptionPane.warningIcon") instanceof IconUIResource);
harness.check(defaults.get("OptionPane.warningSound"), "sounds/OptionPaneWarning.wav");
bindings = (Object[]) defaults.get("OptionPane.windowBindings");
harness.check(bindings.length, 2);
@@ -605,8 +606,8 @@
harness.check(defaults.get("ScrollBar.allowsAbsolutePositioning"), Boolean.TRUE);
harness.check(defaults.get("ScrollBar.background"), new ColorUIResource(0, 0, 4));
harness.check(defaults.get("ScrollBar.darkShadow"), new ColorUIResource(0, 0, 5));
- harness.check(defaults.get("ScrollBar.focusInputMap") instanceof InputMapUIResource);
- harness.check(defaults.get("ScrollBar.focusInputMap.RightToLeft") instanceof InputMapUIResource);
+ harness.check(defaults.get("ScrollBar.focusInputMap"), null);
+ harness.check(defaults.get("ScrollBar.focusInputMap.RightToLeft"), null);
harness.check(defaults.get("ScrollBar.foreground"), new ColorUIResource(0, 0, 4));
harness.check(defaults.get("ScrollBar.highlight"), new ColorUIResource(0, 0, 7));
harness.check(defaults.get("ScrollBar.maximumThumbSize"), new DimensionUIResource(4096, 4096));
@@ -814,7 +815,7 @@
harness.check(defaults.get("TextPane.selectionForeground"), new ColorUIResource(0, 0, 13));
harness.checkPoint("TitledBorder");
- harness.check(defaults.get("TitledBorder.border"), null);
+ harness.check(defaults.get("TitledBorder.border") instanceof LineBorderUIResource);
harness.check(defaults.get("TitledBorder.font"), new FontUIResource("Dialog", Font.BOLD, 12));
harness.check(defaults.get("TitledBorder.titleColor"), new ColorUIResource(0, 0, 27));
@@ -885,7 +886,7 @@
harness.check(defaults.get("Tree.line"), new ColorUIResource(0, 0, 20));
harness.check(defaults.get("Tree.openIcon") instanceof MetalIconFactory.TreeFolderIcon);
harness.check(defaults.getInt("Tree.rightChildIndent"), 13);
- harness.check(defaults.getInt("Tree.rowHeight"), 16);
+ harness.check(defaults.getInt("Tree.rowHeight"), 0);
harness.check(defaults.get("Tree.scrollsOnExpand"), Boolean.TRUE);
harness.check(defaults.get("Tree.selectionBackground"), new ColorUIResource(0, 0, 28));
harness.check(defaults.get("Tree.selectionBorderColor"), new ColorUIResource(0, 0, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java,v
retrieving revision 1.2
diff -u -r1.2 getDesktopColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getDesktopColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getDesktopColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java,v
retrieving revision 1.2
diff -u -r1.2 getFocusColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getFocusColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getFocusColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getHighlightedTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getHighlightedTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getHighlightedTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getInactiveControlTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveControlTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getInactiveControlTextColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getInactiveSystemTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getInactiveSystemTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getInactiveSystemTextColor();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuBackground();
harness.check(c, new ColorUIResource(new Color(204, 204, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuDisabledForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuDisabledForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,7 +40,8 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
- ColorUIResource c = MetalLookAndFeel.getMenuDisabledForeground();
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ ColorUIResource c = MetalLookAndFeel.getMenuDisabledForeground();
harness.check(c, new ColorUIResource(new Color(153, 153, 153)));
MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme() {
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuSelectedBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuSelectedBackground();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuSelectedForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuSelectedForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getMenuSelectedForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getMenuTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getMenuTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getMenuTextFont();
harness.check(f, new FontUIResource("Dialog", Font.BOLD, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControl.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControl.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControl();
harness.check(c, new ColorUIResource(new Color(204, 204, 255)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlDarkShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlDarkShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlDarkShadow();
harness.check(c, new ColorUIResource(new Color(102, 102, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlHighlight.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlHighlight.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlHighlight();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlInfo.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlInfo.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlInfo();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java,v
retrieving revision 1.2
diff -u -r1.2 getPrimaryControlShadow.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getPrimaryControlShadow.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getPrimaryControlShadow();
harness.check(c, new ColorUIResource(new Color(153, 153, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getSeparatorBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getSeparatorBackground();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getSeparatorForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSeparatorForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getSeparatorForeground();
harness.check(c, new ColorUIResource(new Color(102, 102, 153)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getSubTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSubTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getSubTextFont();
harness.check(f, new FontUIResource("Dialog", Font.PLAIN, 10));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getSystemTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getSystemTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getSystemTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getSystemTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getSystemTextFont();
harness.check(f, new FontUIResource("Dialog", Font.PLAIN, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java,v
retrieving revision 1.2
diff -u -r1.2 getTextHighlightColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getTextHighlightColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getTextHighlightColor();
harness.check(c, new ColorUIResource(new Color(204, 204, 255)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java,v
retrieving revision 1.2
diff -u -r1.2 getUserTextColor.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextColor.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getUserTextColor();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java,v
retrieving revision 1.2
diff -u -r1.2 getUserTextFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getUserTextFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getUserTextFont();
harness.check(f, new FontUIResource("Dialog", Font.PLAIN, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java,v
retrieving revision 1.2
diff -u -r1.2 getWhite.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWhite.java 3 Jan 2006 21:09:29 -0000
@@ -39,6 +39,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource white = MetalLookAndFeel.getWhite();
harness.check(white, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowBackground();
harness.check(c, new ColorUIResource(Color.white));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleBackground();
harness.check(c, new ColorUIResource(new Color(204, 204, 255)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleFont.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java 28 Jul 2005 16:12:15 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleFont.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
FontUIResource f = MetalLookAndFeel.getWindowTitleFont();
harness.check(f, new FontUIResource("Dialog", Font.BOLD, 12));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleInactiveBackground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveBackground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleInactiveBackground();
harness.check(c, new ColorUIResource(new Color(204, 204, 204)));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java,v
retrieving revision 1.2
diff -u -r1.2 getWindowTitleInactiveForeground.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/getWindowTitleInactiveForeground.java 3 Jan 2006 21:09:29 -0000
@@ -40,6 +40,7 @@
* @param harness the test harness (<code>null</code> not permitted).
*/
public void test(TestHarness harness) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
ColorUIResource c = MetalLookAndFeel.getWindowTitleInactiveForeground();
harness.check(c, new ColorUIResource(Color.black));
Index: gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java,v
retrieving revision 1.2
diff -u -r1.2 setCurrentTheme.java
--- gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java 28 Jul 2005 16:12:16 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalLookAndFeel/setCurrentTheme.java 3 Jan 2006 21:09:29 -0000
@@ -41,7 +41,7 @@
{
MetalLookAndFeel laf = new MetalLookAndFeel();
Color c1 = laf.getDefaults().getColor("Button.background");
- h.check(c1, new Color(204, 204, 204));
+ h.check(c1, new Color(238, 238, 238));
MetalLookAndFeel.setCurrentTheme(new TestTheme());
c1 = laf.getDefaults().getColor("Button.background");
h.check(c1, Color.red);