harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r687988 [11/11] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/ depends/build/platform/ depends/jars/ depends/jars/icu4jni_3.4/ depends/manifests/bcel-5.2/ depends/manifests/bcel-5.2/META-INF/ make/ modules/accessibility/ ...
Date Fri, 22 Aug 2008 07:15:27 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/makefile?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/makefile
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/makefile
Fri Aug 22 00:15:00 2008
@@ -22,19 +22,26 @@
 INCLUDES += -DHYPORT_LIBRARY_DEFINE -I$(HY_PLATFORM)
 
 BUILDFILES = \
-	$(SHAREDSUB)port_copyright.o hycpu.o $(SHAREDSUB)hyerror.o \
+	$(SHAREDSUB)port_copyright.o $(SHAREDSUB)hyerror.o \
 	hyerrorhelpers.o $(SHAREDSUB)hyexit.o hyfile.o hyfiletext.o \
-	$(SHAREDSUB)hygp.o hyipcmutex.o hymem.o \
+	$(SHAREDSUB)hygp.o hymem.o \
 	$(HY_OS)/hymmap.o $(SHAREDSUB)hynls.o hynlshelpers.o hyosdump.o \
 	$(SHAREDSUB)hyport.o $(SHAREDSUB)hyportcontrol.o hyportptb.o \
-	hysharedhelper.o hyshmem.o hyshsem.o $(HY_OS)/hysl.o hysock.o \
+	hysharedhelper.o $(HY_OS)/hysl.o hysock.o \
 	$(SHAREDSUB)hystr.o $(SHAREDSUB)hystrftime.o $(SHAREDSUB)hystsl.o \
-	hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o $(HY_OS)/hyvmem.o
+	hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o
 
 ifeq ($(HY_NO_SIG),false)
 BUILDFILES += hysignal.o $(HY_PLATFORM)/hysignal_context.o
 endif
 
+ifeq ($(HY_PORTLIB_STUBS),true)
+BUILDFILES += stubs/hycpu.o stubs/hyipcmutex.o stubs/hyshmem.o \
+              stubs/hyshsem.o stubs/hyvmem.o
+else
+BUILDFILES += hycpu.o hyipcmutex.o hyshmem.o hyshsem.o $(HY_OS)/hyvmem.o
+endif
+
 ifeq ($(HY_NO_THR),true)
 MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
 endif

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/shared/hycpu.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/shared/hycpu.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/shared/hycpu.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/shared/hycpu.c
Fri Aug 22 00:15:00 2008
@@ -30,7 +30,7 @@
   HyPortLibraryVersion portLibraryVersion;
   int ret;
 
-  printf("hyerror:\n");
+  printf("hycpu:\n");
 
   HYPORT_SET_VERSION (&portLibraryVersion, HYPORT_CAPABILITY_MASK);
   if (0 != hyport_init_library (&hyportLibrary, &portLibraryVersion,

Propchange: harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyipcmutex/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 22 00:15:00 2008
@@ -0,0 +1 @@
+hyipcmutex

Propchange: harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymmap/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 22 00:15:00 2008
@@ -0,0 +1 @@
+hymmap

Propchange: harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hysysinfo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 22 00:15:00 2008
@@ -0,0 +1 @@
+hysysinfo

Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml Fri Aug 22 00:15:00 2008
@@ -193,6 +193,11 @@
             showoutput="on"
             dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/print/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/print/build.xml Fri Aug 22 00:15:00 2008
@@ -211,6 +211,11 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>

Modified: harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/regex/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/regex/build.xml Fri Aug 22 00:15:00 2008
@@ -166,6 +166,11 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Pattern.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Pattern.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Pattern.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Pattern.java
Fri Aug 22 00:15:00 2008
@@ -90,7 +90,8 @@
     static final int flagsBitMask = Pattern.UNIX_LINES | 
                                     Pattern.CASE_INSENSITIVE | 
                                     Pattern.COMMENTS | 
-                                    Pattern.MULTILINE |  
+                                    Pattern.MULTILINE |
+                                    Pattern.LITERAL |
                                     Pattern.DOTALL | 
                                     Pattern.UNICODE_CASE | 
                                     Pattern.CANON_EQ;

Modified: harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
Fri Aug 22 00:15:00 2008
@@ -520,6 +520,8 @@
         // Bug187
         Pattern
                 .compile("|(?idmsux-idmsux)|(?idmsux-idmsux)|[^|\\[-\\0274|\\,-\\\\[^|W\\}\\nq\\x65\\002\\xFE\\05\\06\\00\\x66\\x47i\\,\\xF2\\=\\06\\u0EA4\\x9B\\x3C\\f\\|\\{\\xE5\\05\\r\\u944A\\xCA\\e|\\x19\\04\\x07\\04\\u607B\\023\\0073\\x91Tr\\0150\\x83]]?(?idmsux-idmsux:\\p{Alpha}{7}?)||(?<=[^\\uEC47\\01\\02\\u3421\\a\\f\\a\\013q\\035w\\e])(?<=\\p{Punct}{0,}?)(?=^\\p{Lower})(?!\\b{8,14})(?<![|\\00-\\0146[^|\\04\\01\\04\\060\\f\\u224DO\\x1A\\xC4\\00\\02\\0315\\0351\\u84A8\\xCBt\\xCC\\06|\\0141\\00\\=\\e\\f\\x6B\\0026Tb\\040\\x76xJ&&[\\\\-\\]\\05\\07\\02\\u2DAF\\t\\x9C\\e\\0023\\02\\,X\\e|\\u6058flY\\u954C]]]{5}?)(?<=\\p{Sc}{8}+)[^|\\026-\\u89BA|o\\u6277\\t\\07\\x50&&\\p{Punct}]{8,14}+((?<=^\\p{Punct})|(?idmsux-idmsux)||(?>[\\x3E-\\]])|(?idmsux-idmsux:\\p{Punct})|(?<![\\0111\\0371\\xDF\\u6A49\\07\\u2A4D\\00\\0212\\02Xd-\\xED[^\\a-\\0061|\\0257\\04\\f\\[\\0266\\043\\03\\x2D\\042&&[^\\f-\\]&&\\s]]])|(?>[|\\n\\042\\uB09F\\06\\u0F2B\\uC96D\\x89\\uC166\\xAA|\\04-\\][^|\\a\\|\\rx
 \\04\\uA770\\n\\02\\t\\052\\056\\0274\\|\\=\\07\\e|\\00-\\x1D&&[^\\005\\uB15B\\uCDAC\\n\\x74\\0103\\0147\\uD91B\\n\\062G\\u9B4B\\077\\}\\0324&&[^\\0302\\,\\0221\\04\\u6D16\\04xy\\uD193\\[\\061\\06\\045\\x0F|\\e\\xBB\\f\\u1B52\\023\\u3AD2\\033\\007\\022\\}\\x66\\uA63FJ-\\0304]]]]{0,0})||(?<![^|\\0154U\\u0877\\03\\fy\\n\\|\\0147\\07-\\=[|q\\u69BE\\0243\\rp\\053\\02\\x33I\\u5E39\\u9C40\\052-\\xBC[|\\0064-\\?|\\uFC0C\\x30\\0060\\x45\\\\\\02\\?p\\xD8\\0155\\07\\0367\\04\\uF07B\\000J[^|\\0051-\\{|\\u9E4E\\u7328\\]\\u6AB8\\06\\x71\\a\\]\\e\\|KN\\u06AA\\0000\\063\\u2523&&[\\005\\0277\\x41U\\034\\}R\\u14C7\\u4767\\x09\\n\\054Ev\\0144\\<\\f\\,Q-\\xE4]]]]]{3}+)|(?>^+)|(?![^|\\|\\nJ\\t\\<\\04E\\\\\\t\\01\\\\\\02\\|\\=\\}\\xF3\\uBEC2\\032K\\014\\uCC5F\\072q\\|\\0153\\xD9\\0322\\uC6C8[^\\t\\0342\\x34\\x91\\06\\{\\xF1\\a\\u1710\\?\\xE7\\uC106\\02pF\\<&&[^|\\]\\064\\u381D\\u50CF\\eO&&[^|\\06\\x2F\\04\\045\\032\\u8536W\\0377\\0017|\\x06\\uE5FA\\05\\xD4\\020\\04c\\xFC\\02H\\x0A\\r]]]]+?)(?idm
 sux-idmsux)|(?<![|\\r-\\,&&[I\\t\\r\\0201\\xDB\\e&&[^|\\02\\06\\00\\<\\a\\u7952\\064\\051\\073\\x41\\?n\\040\\0053\\031&&[\\x15-\\|]]]]{8,11}?)(?![^|\\<-\\uA74B\\xFA\\u7CD2\\024\\07n\\<\\x6A\\0042\\uE4FF\\r\\u896B\\[\\=\\042Y&&^\\p{ASCII}]++)|(?<![R-\\|&&[\\a\\0120A\\u6145\\<\\050-d[|\\e-\\uA07C|\\016-\\u80D9]]]{1,}+)|(?idmsux-idmsux)|(?idmsux-idmsux)|(?idmsux-idmsux:\\B{6,}?)|(?<=\\D{5,8}?)|(?>[\\{-\\0207|\\06-\\0276\\p{XDigit}])(?idmsux-idmsux:[^|\\x52\\0012\\]u\\xAD\\0051f\\0142\\\\l\\|\\050\\05\\f\\t\\u7B91\\r\\u7763\\{|h\\0104\\a\\f\\0234\\u2D4F&&^\\P{InGreek}]))");
+        // HARMONY-5858
+        Pattern.compile("\\u6211", Pattern.LITERAL); 
     }
 
     public void testOrphanQuantifiers() {

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml Fri Aug 22 00:15:00 2008
@@ -230,6 +230,11 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
                 <jvmarg line="${hy.test.vmargs}" />
                    
                 <jvmarg value="-Djava.security.policy=make/all.policy"/>

Modified: harmony/enhanced/classlib/branches/java6/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/build.xml Fri Aug 22 00:15:00
2008
@@ -429,6 +429,11 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
                 <jvmarg line="${hy.test.vmargs}" />
                 <!-- Used by Support_Exec.execJava() -->
                 <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/unix/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/unix/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/unix/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/unix/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
Fri Aug 22 00:15:00 2008
@@ -36,7 +36,7 @@
  *  The static class providing access on Linux platform
  *  to system means for generating true random bits. <BR>
  *
- *  The source for true random bits is one of Linux's devices "/dev/urandom/" or
+ *  The source for true random bits is one of Linux's devices "/dev/urandom" or
  *  "/dev/random" depends on which one is available; if both the first is used. <BR>
  *
  *  If no device available the service is not available,

Modified: harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/build.xml Fri Aug 22 00:15:00 2008
@@ -176,6 +176,11 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/build.xml Fri Aug 22 00:15:00 2008
@@ -163,6 +163,11 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/suncompat/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/suncompat/META-INF/MANIFEST.MF?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/suncompat/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/suncompat/META-INF/MANIFEST.MF Fri Aug
22 00:15:00 2008
@@ -11,13 +11,15 @@
 Bundle-Version: 1.0.0
 Bundle-ClassPath: .
 Eclipse-JREBundle: true
-Import-Package: java.io,
+Import-Package: java.awt.image,
+ java.io,
  java.lang,
  java.lang.reflect,
  java.security,
+ javax.imageio,
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
- org.apache.harmony.rmi.transport;hy_usage="suncompat",
- org.apache.harmony.xnet.provider.jsse;hy_usage="suncompat"
+ org.apache.harmony.rmi.transport;hy_usage=suncompat,
+ org.apache.harmony.xnet.provider.jsse;hy_usage=suncompat
 Export-Package: com.sun.net.ssl.internal.ssl,
  sun.misc

Modified: harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml Fri Aug 22 00:15:00
2008
@@ -162,6 +162,11 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.common?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.common (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.common Fri Aug 22
00:15:00 2008
@@ -3,7 +3,6 @@
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JColorChooserTest.java
-javax/swing/JComboBoxTest.java
 javax/swing/JComponentTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java
 # should be checked once again: does it still hang?
@@ -27,7 +26,6 @@
 javax/swing/JRootPaneTest.java
 javax/swing/JSplitPaneTest.java
 javax/swing/JTableTest.java
-javax/swing/JTextAreaTest.java
 javax/swing/JTextArea_MultithreadedTest.java
 javax/swing/JTextFieldTest.java
 javax/swing/JTextField_NotifyActionRTest.java
@@ -47,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/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
Fri Aug 22 00:15:00 2008
@@ -336,9 +336,6 @@
                 dataModel.setSelectedItem(element);
             } else if (isEditable && element != null && !element.equals(getEditor().getItem()))
{
                 getEditor().setItem(element);
-            } else {
-                // fire action event even if selection is not changed
-                fireActionEvent();
             }
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComponent.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComponent.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComponent.java
Fri Aug 22 00:15:00 2008
@@ -330,7 +330,10 @@
     private static final String ILLEGAL_CONDITION_MESSAGE = 
             Messages.getString("swing.B3","JComponent.WHEN_IN_FOCUSED_WINDOW, JComponent.WHEN_FOCUSED
", //$NON-NLS-1$ //$NON-NLS-2$
                     "JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT"); //$NON-NLS-1$ 
-
+    
+    private static final String NULL_MAP_MESSAGE =
+            Messages.getString("swing.03", "map"); //$NON-NLS-1$ //$NON-NLS-2$
+    
     private boolean opaque;
 
     private boolean doubleBuffered;
@@ -687,6 +690,9 @@
         if (condition < FIRST_INPUT_MAP_INDEX || condition > LAST_INPUT_MAP_INDEX)
{
             throw new IllegalArgumentException(ILLEGAL_CONDITION_MESSAGE);
         }
+        if (condition == WHEN_IN_FOCUSED_WINDOW && map == null) {
+                	throw new IllegalArgumentException(NULL_MAP_MESSAGE);
+        }
         inputMaps[condition] = map;
         inputMapsCreated[condition] = true;
     }
@@ -1085,7 +1091,10 @@
         }
         result.setFont(getFont());
         result.setColor(getForeground());
-        ((Graphics2D) result).setBackground(getBackground());
+        if (result instanceof Graphics2D) { 		// DebugGraphics class does not have the setBackground
method
+        	((Graphics2D) result).setBackground(getBackground());
+        }
+                
         return result;
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
Fri Aug 22 00:15:00 2008
@@ -721,7 +721,9 @@
 
     protected void unconfigureEditor() {
         editor.removeFocusListener(editorFocusListener);
-        comboBox.getEditor().removeActionListener(editorActionListener);
+        if (comboBox.getEditor() != null) {
+            comboBox.getEditor().removeActionListener(editorActionListener);
+        }
         editorFocusListener = null;
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/metal/DefaultMetalTheme.java
Fri Aug 22 00:15:00 2008
@@ -31,9 +31,9 @@
     private static ColorUIResource primaryColor1 = new ColorUIResource(0x20, 0x50, 0x80);
     private static ColorUIResource primaryColor2 = new ColorUIResource(0x50, 0x80, 0xC0);
     private static ColorUIResource primaryColor3 = new ColorUIResource(0xC0, 0xE0, 0xFF);
-    private static ColorUIResource secondaryColor1 = new ColorUIResource(0x50, 0x50, 0x50);
+    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/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java
Fri Aug 22 00:15:00 2008
@@ -1103,7 +1103,7 @@
             py = heights;
             break;
         default:
-            assert false : "incorrect direction";
+            // do nothing to be compatible with RI
             return;
         }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
Fri Aug 22 00:15:00 2008
@@ -76,7 +76,7 @@
 swing.3A=Model must be not null
 swing.3B=Column model must be not null
 swing.3C=rows: {0}
-swing.3D=columns: {0} 
+swing.3D=columns: {0}
 swing.3E=Negative line
 swing.3F=No such line
 swing.40=Can't translate offset to line

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java
Fri Aug 22 00:15:00 2008
@@ -60,7 +60,7 @@
 
     @SuppressWarnings("deprecation")
     public void testSpinnerDateModel() {
-        assertEquals(model.getDate().getDay(), now.getDay() + 1);
+        assertEquals(model.getDate().getDay(), (now.getDay() + 1) % 7);
         assertEquals(Calendar.DAY_OF_MONTH, model.getCalendarField());
         assertNull(model.getStart());
         assertNull(model.getEnd());

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicBordersTest.java
Fri Aug 22 00:15:00 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);
         }
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/build.xml Fri Aug 22 00:15:00 2008
@@ -164,6 +164,11 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml Fri Aug 22 00:15:00 2008
@@ -296,6 +296,10 @@
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
 
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
                 <jvmarg line="${hy.test.vmargs}" />
 
                 <junit-elements />

Modified: harmony/enhanced/classlib/branches/java6/support/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/support/.classpath?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/support/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/support/.classpath Fri Aug 22 00:15:00 2008
@@ -2,6 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="lib" path="/home/xiaoxia/java/jdk/hdk/jre/lib/boot/test/derby.jar"/>
+	<classpathentry kind="lib" path="/home/xiaoxia/java/jdk/hdk/jre/lib/boot/test/jetty-6.0.0.jar"/>
+	<classpathentry kind="lib" path="/home/xiaoxia/java/jdk/hdk/jre/lib/boot/test/jetty-util-6.0.0.jar"/>
+	<classpathentry kind="lib" path="/home/xiaoxia/java/jdk/hdk/jre/lib/boot/test/servlet-api-2.5-6.0.0.jar"/>
+	<classpathentry kind="lib" path="/home/xiaoxia/java/jdk/hdk/jre/lib/boot/test/support.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>



Mime
View raw message