You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2008/07/02 13:34:23 UTC
svn commit: r673364 - in /harmony/enhanced/classlib/trunk/modules/swing:
make/exclude.common
src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java
src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java
Author: hindessm
Date: Wed Jul 2 04:34:22 2008
New Revision: 673364
URL: http://svn.apache.org/viewvc?rev=673364&view=rev
Log:
Applying patches from "[#HARMONY-5891] Fixes a problem in the
DefaultMetalTheme that failed testGetInternalFrameBorder in
BasicBordersTest" and "[#HARMONY-5892] Fixes an issue with BasicBordersTest
that failed testGetSplitPaneBorder in BasicBordersTest".
Modified:
harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common
harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java
harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java
Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common?rev=673364&r1=673363&r2=673364&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common Wed Jul 2 04:34:22 2008
@@ -45,7 +45,6 @@
javax/swing/SwingUtilitiesTest.java
javax/swing/colorchooser/ColorChooserComponentFactoryTest.java
javax/swing/event/AncestorEventTest.java
-javax/swing/plaf/basic/BasicBordersTest.java
javax/swing/plaf/basic/BasicColorChooserUITest.java
javax/swing/plaf/basic/BasicComboBoxUITest.java
javax/swing/plaf/basic/BasicComboPopupTest.java
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java?rev=673364&r1=673363&r2=673364&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java Wed Jul 2 04:34:22 2008
@@ -33,7 +33,7 @@
private static ColorUIResource primaryColor3 = new ColorUIResource(0xC0, 0xE0, 0xFF);
private static ColorUIResource secondaryColor1 = new ColorUIResource(0x40, 0x40, 0x40);
private static ColorUIResource secondaryColor2 = new ColorUIResource(0x80, 0x80, 0x80);
- private static ColorUIResource secondaryColor3 = new ColorUIResource(0xE0, 0xE0, 0xE0);
+ private static ColorUIResource secondaryColor3 = new ColorUIResource(0xC0, 0xC0, 0xC0);
private FontUIResource systemFont;
private FontUIResource smallFont;
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java?rev=673364&r1=673363&r2=673364&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java Wed Jul 2 04:34:22 2008
@@ -203,7 +203,7 @@
assertEquals(new Insets(1, 1, 1, 1), border.getBorderInsets(testButton));
if (isHarmony()) {
assertEquals(new ColorUIResource(Color.WHITE), border.highlight);
- assertEquals(new ColorUIResource(Color.DARK_GRAY), border.shadow);
+ assertEquals(new ColorUIResource(Color.GRAY), border.shadow);
}
}