You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2006/12/18 15:18:22 UTC
svn commit: r488275 - in /harmony/enhanced/classlib/trunk/modules/awt: make/
src/main/java/common/java/awt/ src/test/api/java/common/java/awt/
Author: apetrenko
Date: Mon Dec 18 06:18:22 2006
New Revision: 488275
URL: http://svn.apache.org/viewvc?view=rev&rev=488275
Log:
Patch for HARMONY-1605 "[classlib][awt]Compatibility: java.awt.Window has null default Font on RI while it hasn't on Harmony"
Modified:
harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl
harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm
harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl
harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm
harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/WindowTest.java
Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl?view=diff&rev=488275&r1=488274&r2=488275
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.drl Mon Dec 18 06:18:22 2006
@@ -13,7 +13,6 @@
java/awt/GridBagLayoutTest.java
java/awt/GridLayoutTest.java
java/awt/RobotTest.java
-java/awt/WindowTest.java
java/awt/WindowRTest.java
java/awt/datatransfer/ClipboardTest.java
java/awt/BorderLayoutTest.java
Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm?view=diff&rev=488275&r1=488274&r2=488275
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86.ibm Mon Dec 18 06:18:22 2006
@@ -19,7 +19,6 @@
java/awt/GridBagLayoutTest.java
java/awt/GridLayoutTest.java
java/awt/RobotTest.java
-java/awt/WindowTest.java
java/awt/WindowRTest.java
java/awt/datatransfer/ClipboardTest.java
java/awt/BorderLayoutTest.java
Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl?view=diff&rev=488275&r1=488274&r2=488275
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.drl Mon Dec 18 06:18:22 2006
@@ -13,7 +13,6 @@
java/awt/GridBagLayoutTest.java
java/awt/GridLayoutTest.java
java/awt/RobotTest.java
-java/awt/WindowTest.java
java/awt/WindowRTest.java
java/awt/datatransfer/ClipboardTest.java
java/awt/BorderLayoutTest.java
Modified: harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm?view=diff&rev=488275&r1=488274&r2=488275
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.windows.x86_64.ibm Mon Dec 18 06:18:22 2006
@@ -13,7 +13,6 @@
java/awt/GridBagLayoutTest.java
java/awt/GridLayoutTest.java
java/awt/RobotTest.java
-java/awt/WindowTest.java
java/awt/WindowRTest.java
java/awt/datatransfer/ClipboardTest.java
java/awt/BorderLayoutTest.java
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java?view=diff&rev=488275&r1=488274&r2=488275
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java Mon Dec 18 06:18:22 2006
@@ -177,7 +177,6 @@
setFocusTraversalPolicy(KeyboardFocusManager.getCurrentKeyboardFocusManager()
.getDefaultFocusTraversalPolicy());
redrawManager = new RedrawManager(this);
- setFont(new Font("dialog", Font.PLAIN, 12)); // TODO: fix it //$NON-NLS-1$
cursor = Cursor.getDefaultCursor(); // for Window cursor is always
// set(non-null)
} finally {
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/WindowTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/WindowTest.java?view=diff&rev=488275&r1=488274&r2=488275
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/WindowTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/WindowTest.java Mon Dec 18 06:18:22 2006
@@ -170,4 +170,13 @@
checkPropertyFields("alwaysOnTop", w, Boolean.TRUE);
assertEquals(Boolean.FALSE, oldValue);
}
+
+ /*
+ * Check if getFont() returns null for if font wasn't set before.
+ */
+ public void testGetFont_Default(){
+ // regression test for Harmony-1605
+ assertEquals(null, w.getFont());
+ }
+
}