harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r791082 [2/8] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/ depends/build/platform/ depends/manifests/asm-3.1/ make/ modules/accessibility/ modules/accessibility/make/ modules/accessibility/src/main/java/javax/accessibil...
Date Sat, 04 Jul 2009 08:38:24 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java Sat Jul  4 08:38:13 2009
@@ -235,6 +235,11 @@
         return value = getARGB();
     }
 
+    @Override
+    public int hashCode() {
+        return (index * 37) + value;
+    }
+
     private SystemColor(int index) {
         super(0, 0, 0);
         this.index = index;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/event/MouseEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/event/MouseEvent.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/event/MouseEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/event/MouseEvent.java Sat Jul  4 08:38:13 2009
@@ -96,7 +96,7 @@
     }
 
     public static String getMouseModifiersText(int modifiers) {
-        final StringBuffer text = new StringBuffer();
+        final StringBuilder text = new StringBuilder();
 
         if ((modifiers & META_MASK) != 0) {
             text.append(Toolkit.getProperty("AWT.meta", "Meta")).append("+"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java Sat Jul  4 08:38:13 2009
@@ -478,7 +478,7 @@
          *      NumericShaper.ARABIC | NumericShaper.TAMIL, 
          *      NumericShaper.EASTERN_ARABIC));
          */
-        StringBuffer sb = new StringBuffer(super.toString());
+        StringBuilder sb = new StringBuilder(super.toString());
 
         sb.append("[contextual:"); //$NON-NLS-1$
         sb.append(fContextual);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java Sat Jul  4 08:38:13 2009
@@ -822,7 +822,7 @@
     @Override
     public String toString() {
         int cnt = getRectCount();
-        StringBuffer sb = new StringBuffer((cnt << 5) + 128);
+        StringBuilder sb = new StringBuilder((cnt << 5) + 128);
         sb.append(getClass().getName()).append(" ["); //$NON-NLS-1$
         for(int i = 1; i < rect[0]; i += 4) {
             sb.append(i > 1 ? ", [" : "[").append(rect[i]).append(", ").append(rect[i + 1]). //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile Sat Jul  4 08:38:13 2009
@@ -37,7 +37,7 @@
 endif
 
 MDLLIBFILES += \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhypool.a $(LIBPATH)libvmi.so
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile Sat Jul  4 08:38:13 2009
@@ -39,7 +39,7 @@
 endif
 
 MDLLIBFILES += $(MDLLIBZLIB) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile Sat Jul  4 08:38:13 2009
@@ -25,7 +25,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libjpegdecoder$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile Sat Jul  4 08:38:13 2009
@@ -30,7 +30,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../liblcmm$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile Sat Jul  4 08:38:13 2009
@@ -30,7 +30,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) ../../fontlib/libFL.so
 
 OSLIBS += $(XLIBS)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile Sat Jul  4 08:38:13 2009
@@ -24,7 +24,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile Sat Jul  4 08:38:13 2009
@@ -27,7 +27,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/SystemColorRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/SystemColorRTest.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/SystemColorRTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/SystemColorRTest.java Sat Jul  4 08:38:13 2009
@@ -20,6 +20,8 @@
  */
 package java.awt;
 
+import java.util.HashMap;
+
 import junit.framework.TestCase;
 
 public class SystemColorRTest extends TestCase {
@@ -39,4 +41,17 @@
         assertEquals(color.getGreen(), g);
         assertEquals(color.getBlue(), b);
     }
+
+    public void testHashCode() {
+        // Regression test for HARMONY-6244
+        assertTrue(SystemColor.activeCaption.hashCode() != SystemColor.textHighlight
+                .hashCode());
+        HashMap<Object, String> hashMap = new HashMap<Object, String>();
+        hashMap.put(SystemColor.activeCaption, "activeCaption");
+        hashMap.put(SystemColor.textHighlight, "textHighlight");
+        assertEquals(2, hashMap.size());
+        assertEquals("activeCaption", hashMap.get(SystemColor.activeCaption));
+        assertEquals("textHighlight", hashMap.get(SystemColor.textHighlight));
+    }
+
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -198,7 +200,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -231,7 +233,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.beans.src.test.internal}">
                     <!-- if ${test.case}     -->
@@ -272,7 +274,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.beans.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -288,12 +290,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">beans${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">beans${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -46,7 +46,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java Sat Jul  4 08:38:13 2009
@@ -438,7 +438,7 @@
         }
 
         private String capitalize(String str) {
-            StringBuffer buf = new StringBuffer(str);
+            StringBuilder buf = new StringBuilder(str);
             buf.setCharAt(0, Character.toUpperCase(buf.charAt(0)));
             return buf.toString();
         }
@@ -570,9 +570,6 @@
 
     public XMLDecoder(InputStream inputStream, Object owner,
             ExceptionListener listener, ClassLoader cl) {
-        if (inputStream == null) {
-            throw new IllegalArgumentException("Input stream cannot be null"); //$NON-NLS-1$
-        }
         this.inputStream = inputStream;
         this.owner = owner;
         this.listener = (listener == null) ? new DefaultExceptionListener()
@@ -584,6 +581,9 @@
      * Close the input stream of xml data.
      */
     public void close() {
+        if (inputStream == null) {
+            return;
+        }
         try {
             inputStream.close();
         } catch (Exception e) {
@@ -618,6 +618,9 @@
      */
     @SuppressWarnings("nls")
     public Object readObject() {
+        if (inputStream == null) {
+            return null;
+        }
         if (saxHandler == null) {
             saxHandler = new SAXHandler();
             try {

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java Sat Jul  4 08:38:13 2009
@@ -78,33 +78,45 @@
     /*
      * test XMLDecoder constructor with null inputStream argument
      */
-    public void test_Constructor_NullInputStream() {
-        XMLDecoder xmlDecoder;
-        try {
-            xmlDecoder = new XMLDecoder(null);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException iae) {
-            // Expected
-        }
-        
-        try{
-            xmlDecoder = new XMLDecoder(null, null);
-        }catch(IllegalArgumentException iae){
-            // Expected
-        }
-        
-        try{
-            xmlDecoder = new XMLDecoder(null, null, null);
-        }catch(IllegalArgumentException iae){
-            // Expected
-        }
-        
-        try{
-            xmlDecoder = new XMLDecoder(null, null, null, null);
-        }catch(IllegalArgumentException iae){
-            // Expected
-        }
-        
+    public void test_Constructor_NullInputStream_scenario1() {
+        XMLDecoder xmlDecoder = new XMLDecoder(null);
+        assertNull(xmlDecoder.readObject());
+        assertNull(xmlDecoder.getOwner());
+        assertNotNull(xmlDecoder.getExceptionListener());
+        xmlDecoder.close();
+    }
+
+    /*
+     * test XMLDecoder constructor with null inputStream argument
+     */
+    public void test_Constructor_NullInputStream_scenario2() {
+        XMLDecoder xmlDecoder = new XMLDecoder(null, null);
+        assertNull(xmlDecoder.readObject());
+        assertNull(xmlDecoder.getOwner());
+        assertNotNull(xmlDecoder.getExceptionListener());
+        xmlDecoder.close();
+    }
+
+    /*
+     * test XMLDecoder constructor with null inputStream argument
+     */
+    public void test_Constructor_NullInputStream_scenario3() {
+        XMLDecoder xmlDecoder = new XMLDecoder(null, null, null);
+        assertNull(xmlDecoder.readObject());
+        assertNull(xmlDecoder.getOwner());
+        assertNotNull(xmlDecoder.getExceptionListener());
+        xmlDecoder.close();
+    }
+
+    /*
+     * test XMLDecoder constructor with null inputStream argument
+     */
+    public void test_Constructor_NullInputStream_scenario4() {
+        XMLDecoder xmlDecoder = new XMLDecoder(null, null, null, null);
+        assertNull(xmlDecoder.readObject());
+        assertNull(xmlDecoder.getOwner());
+        assertNotNull(xmlDecoder.getExceptionListener());
+        xmlDecoder.close();
     }
     
     /*

Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -142,7 +144,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -169,7 +171,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.concurrent.src.test.java}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -184,12 +186,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">concurrent${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">concurrent${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java Sat Jul  4 08:38:13 2009
@@ -437,7 +437,7 @@
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer("[");
+        StringBuilder sb = new StringBuilder("[");
 
         Iterator it = listIterator();
         while (it.hasNext()) {

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul  4 08:38:13 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-785553
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-790471

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul  4 08:38:13 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-785553
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-790471

Modified: harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -184,7 +186,7 @@
                     <pathelement path="../../build/tests" />
                 </classpath>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -202,7 +204,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/api.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/api/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -227,7 +229,7 @@
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -245,7 +247,7 @@
                 <!-- to pick up junit.jar               -->
                 <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
 
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.crypto.src.test}/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -263,12 +265,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">crypto${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">crypto${line.separator}</echo>
     </target>
     
@@ -309,7 +311,7 @@
         <sequential>
             <echo message="Running CRYPTO @{description}" />
 
-            <mkdir dir="${hy.tests.reports}" />
+            <mkdir dir="${tests.output}" />
 
             <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/classlib/branches/java6/modules/crypto/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/crypto/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/crypto/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/crypto/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -193,7 +195,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -219,7 +221,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.imageio.src.test.java}" >
                     <!-- if ${test.case}     -->
@@ -235,12 +237,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">imageio${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">imageio${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java Sat Jul  4 08:38:13 2009
@@ -146,7 +146,7 @@
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append("JPEGHuffmanTable:\nlengths:");
         for (short length : lengths) {

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java Sat Jul  4 08:38:13 2009
@@ -163,7 +163,7 @@
 	}
 
 	public String readLine() throws IOException {
-		final StringBuffer line = new StringBuffer(80);
+		final StringBuilder line = new StringBuilder(80);
 		boolean isEmpty = true;
 		int c = -1;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile Sat Jul  4 08:38:13 2009
@@ -29,7 +29,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libjpegencoder$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile Sat Jul  4 08:38:13 2009
@@ -30,7 +30,7 @@
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -177,7 +179,7 @@
     
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -206,7 +208,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.instrument.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -222,12 +224,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">instrument${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">instrument${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile Sat Jul  4 08:38:13 2009
@@ -27,7 +27,7 @@
 endif
 
 MDLLIBFILES += \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = ../libhyinstrument$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile Sat Jul  4 08:38:13 2009
@@ -37,7 +37,7 @@
 !ENDIF
 
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000
 COMMENT=/comment:"instrument component native code. (c) Copyright 2006, 2008 The Apache Software Foundation or its licensors, as applicable."

Propchange: harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul  4 08:38:13 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-785553
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-790471

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -152,7 +154,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -181,7 +183,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.jndi.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -198,7 +200,7 @@
                 </fileset>
             </batchtest>
             
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
                 <fileset dir="${hy.jndi.src.test.java}">
@@ -206,7 +208,7 @@
                 </fileset>
             </batchtest>
             
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
                 <fileset dir="${hy.jndi.src.test.java}">
@@ -214,7 +216,7 @@
                 </fileset>
             </batchtest>            
             
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
                 <fileset dir="${hy.jndi.src.test.java}">
@@ -228,12 +230,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">jndi${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">jndi${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -41,7 +41,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkException.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkException.java Sat Jul  4 08:38:13 2009
@@ -86,7 +86,7 @@
     }
 
     private String toStringImpl(boolean b) {
-        StringBuffer sb = new StringBuffer(super.toString());
+        StringBuilder sb = new StringBuilder(super.toString());
         sb
                 .append("; the link remaining name is - '").append(linkRemainingName).append( //$NON-NLS-1$
                         "'"); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameClassPair.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameClassPair.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameClassPair.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameClassPair.java Sat Jul  4 08:38:13 2009
@@ -202,7 +202,7 @@
      */
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (!isRel) {
             buf.append("(not relative)"); //$NON-NLS-1$
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NamingException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NamingException.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NamingException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NamingException.java Sat Jul  4 08:38:13 2009
@@ -300,7 +300,7 @@
 
     @SuppressWarnings("nls")
     private String toStringImpl(boolean flag) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(super.toString());
         if (null != rootException) {
             sb.append(" [Root exception is ").append(rootException.toString())

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/AttributeModificationException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/AttributeModificationException.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/AttributeModificationException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/AttributeModificationException.java Sat Jul  4 08:38:13 2009
@@ -119,7 +119,7 @@
     }
 
     private String toStringImpl(boolean flag) {
-        StringBuffer sb = new StringBuffer(super.toString(flag));
+        StringBuilder sb = new StringBuilder(super.toString(flag));
         if (null != unexecs && unexecs.length > 0) {
             sb.append(". The unexecuted modification items are: \""); //$NON-NLS-1$
             for (ModificationItem element : unexecs) {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/ModificationItem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/ModificationItem.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/ModificationItem.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/ModificationItem.java Sat Jul  4 08:38:13 2009
@@ -117,7 +117,7 @@
      */
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         switch (mod_op) {
             case DirContext.ADD_ATTRIBUTE:
                 sb.append("Operation is add attribute: "); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/SearchResult.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/SearchResult.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/SearchResult.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/SearchResult.java Sat Jul  4 08:38:13 2009
@@ -210,7 +210,7 @@
      */
     @Override
     public String toString() {
-        return new StringBuffer(super.toString()).append(":") //$NON-NLS-1$
+        return new StringBuilder(super.toString()).append(":") //$NON-NLS-1$
                 .append(attrs.toString()).toString();
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java Sat Jul  4 08:38:13 2009
@@ -304,7 +304,7 @@
             return ""; //$NON-NLS-1$
         }
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(rdns.get(rdns.size() - 1).toString());
         for (int i = rdns.size() - 2; i >= 0; i--) {
             sb.append(',');

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java Sat Jul  4 08:38:13 2009
@@ -308,7 +308,7 @@
     }
 
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (Iterator<Attribute> iter = list.iterator(); iter.hasNext();) {
             Attribute element = iter.next();
             NamingEnumeration<?> ne = null;

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java Sat Jul  4 08:38:13 2009
@@ -107,7 +107,7 @@
     }
 
     private static String getEscaped(char[] chars) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int leftSpaceCnt = 0, rightSpaceCnt = 0;
         int pos = chars.length - 1;
         while (pos >= 0 && chars[pos] == ' ') {
@@ -131,7 +131,7 @@
     }
 
     private static String getHexValues(byte[] byteArray) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < byteArray.length; i++) {
             sb.append(Integer.toHexString(byteArray[i] >> 4 & 0x0F));
             sb.append(Integer.toHexString(byteArray[i] & 0x0F));
@@ -190,7 +190,7 @@
     }
 
     private static String getUnEscapedValues(char[] chars) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         boolean trailing20h = false;
         for (int i = 0; i < chars.length; i++) {
             trailing20h = false;

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSName.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSName.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSName.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSName.java Sat Jul  4 08:38:13 2009
@@ -409,7 +409,7 @@
      */
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         for (int i = components.size() - 1; i >= 0; i--) {
             String comp = components.elementAt(i);

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/Message.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/Message.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/Message.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/Message.java Sat Jul  4 08:38:13 2009
@@ -317,7 +317,7 @@
     @Override
     @SuppressWarnings("nls")
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append("ID=" + id + "\n");
         if (qr) {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ProviderMgr.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ProviderMgr.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ProviderMgr.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ProviderMgr.java Sat Jul  4 08:38:13 2009
@@ -482,7 +482,7 @@
      *             if given array has the length less than four
      */
     public static String getIpStr(byte[] ip) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         if (ip == null || ip.length < 4) {
             // jndi.61=Given array is null or has the length less than four

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/QuestionRecord.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/QuestionRecord.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/QuestionRecord.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/QuestionRecord.java Sat Jul  4 08:38:13 2009
@@ -130,7 +130,7 @@
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         String qClassStr, qTypeStr;
 
         if (qType > 0 && qType < 256) {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ResourceRecord.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ResourceRecord.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ResourceRecord.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ResourceRecord.java Sat Jul  4 08:38:13 2009
@@ -382,7 +382,7 @@
                     serial + " " + refresh + " " + retry + " " + expire + " " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
                     minimum;
         } else if (rrType == ProviderConstants.TXT_TYPE) {
-            StringBuffer sbuf = new StringBuffer();
+            StringBuilder sbuf = new StringBuilder();
             int idx0 = idx;
 
             while (true) {
@@ -438,7 +438,7 @@
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(name);
         sb.append(" "); //$NON-NLS-1$
         sb.append(ProviderConstants.rrTypeNames[rrType]);

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/dnsURLContextFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/dnsURLContextFactory.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/dnsURLContextFactory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/dnsURLContextFactory.java Sat Jul  4 08:38:13 2009
@@ -71,7 +71,7 @@
         } else if (obj instanceof String[]) {
             Hashtable<Object, Object> newEnv = (Hashtable<Object, Object>) environment
                     .clone();
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             String urlArr[] = (String[]) obj;
 
             for (int i = 0; i < urlArr.length; i++) {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java Sat Jul  4 08:38:13 2009
@@ -162,7 +162,7 @@
    * string literal.
    */
   protected String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
+      StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java Sat Jul  4 08:38:13 2009
@@ -55,7 +55,7 @@
     * equivalents in the given string
     */
    protected static final String addEscapes(String str) {
-      StringBuffer retval = new StringBuffer();
+      StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))

Modified: harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -169,7 +171,7 @@
     <target name="run-tests" depends="run-tests-api,run-tests-impl" />
 
     <target name="run-tests-api">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -196,7 +198,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.lang-management.src.test.api.java}" >
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -211,7 +213,7 @@
     </target>
 
     <target name="run-tests-impl">
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -238,7 +240,7 @@
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
                 <fileset dir="${hy.lang-management.src.test.impl.java}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -253,11 +255,11 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures" append="true">lang-management${line.separator}</echo>
+        <echo file="${tests.output}/test.failures" append="true">lang-management${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors" append="true">lang-management${line.separator}</echo>
+        <echo file="${tests.output}/test.errors" append="true">lang-management${line.separator}</echo>
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/lang-management/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/lang-management/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/lang-management/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/lang-management/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -50,7 +50,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Propchange: harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul  4 08:38:13 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-785553
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-790471

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -164,7 +166,7 @@
 
     <target name="run-tests">
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -203,7 +205,7 @@
             <formatter type="xml" />
 
             <!-- run LogManagerTest in separated VM -->
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                 unless="test.case">
 
                 <fileset dir="${hy.logging.src.test.java}">
@@ -212,7 +214,7 @@
                 </fileset>
             </batchtest>
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+            <batchtest todir="${tests.output}" haltonfailure="no" >
 
                 <fileset dir="${hy.logging.src.test.java}">
                     <!-- if ${test.case}     -->
@@ -230,12 +232,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">logging${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">logging${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -43,7 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Throwable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Throwable.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Throwable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Throwable.java Sat Jul  4 08:38:13 2009
@@ -329,7 +329,7 @@
         if (msg == null) {
             return name;
         }
-        return new StringBuffer(name.length() + 2 + msg.length()).append(name).append(": ")
+        return new StringBuilder(name.length() + 2 + msg.length()).append(name).append(": ")
                 .append(msg).toString();
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF Sat Jul  4 08:38:13 2009
@@ -17,7 +17,6 @@
  java.math,
  java.nio,
  java.nio.channels,
- java.nio.channels.spi,
  java.nio.charset,
  java.security,
  java.security.cert,
@@ -25,10 +24,8 @@
  java.util.jar,
  java.util.regex,
  java.util.zip,
- javax.net;resolution:=optional,
  javax.net.ssl,
  javax.xml.parsers,
- org.apache.harmony.awt.www.content.image;resolution:=optional,
  org.apache.harmony.misc.accessors,
  org.apache.harmony.nio,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/build.xml Sat Jul  4 08:38:13 2009
@@ -23,6 +23,8 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -91,9 +93,6 @@
     <!-- Build the core luni native components -->
     <target name="build-native-core" >
 
-        <!-- Build fdlibm lib -->
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os.family}" />
-
         <!-- Build vmi dll -->
         <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" />
 
@@ -120,6 +119,10 @@
         />
 
     <target name="-build-native-secondary" >
+
+        <!-- Build fdlibm lib -->
+        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os.family}" />
+
         <!-- Build luni dll -->
         <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -295,7 +298,7 @@
         </jar>
     </target>
 
-    <target name="test-jar" depends="svn-info">
+    <target name="test-jar" depends="compile-tests, prepare-exclude">
         <mkdir dir="${tests.hdk.dir}"/>
 
         <jar destfile="${tests.hdk.dir}/${hy.luni.packaging.jarname}_tests_api.jar">
@@ -391,7 +394,7 @@
                     </fileset>
                 </classpath>
  
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.luni.src.test.api}/common">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -425,7 +428,7 @@
                         <include name="*.jar" />
                     </fileset>
                 </classpath>
-                <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+                <batchtest todir="${tests.output}" haltonfailure="no" >
                    <fileset dir="${hy.luni.src.test.impl}/common">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
@@ -450,12 +453,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">luni${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">luni${line.separator}</echo>
     </target>
 
@@ -512,7 +515,7 @@
         <sequential>
             <echo message="Running LUNI @{description}" />
 
-            <mkdir dir="${hy.tests.reports}" />
+            <mkdir dir="${tests.output}" />
 
             <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/make/hyproperties.xml Sat Jul  4 08:38:13 2009
@@ -46,10 +46,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-      <support>
-          <bin location="../../build/tests" />
-      </support>
-   </tests>
 </hy>

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java Sat Jul  4 08:38:13 2009
@@ -295,7 +295,7 @@
      */
     @Deprecated
     public final String readLine() throws IOException {
-        StringBuffer line = new StringBuffer(80); // Typical line length
+        StringBuilder line = new StringBuilder(80); // Typical line length
         boolean foundTerminator = false;
         while (true) {
             int nextByte = in.read();

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java Sat Jul  4 08:38:13 2009
@@ -300,9 +300,11 @@
             throw new ArrayIndexOutOfBoundsException();
         }
 
-        for (int i = offset + length - 1; i >= offset; i--) {
-            unread(buffer[i]);
+        if (buf == null) {
+            throw new IOException();
         }
+        System.arraycopy(buffer, offset, buf, pos - length, length);
+        pos = pos - length;
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StreamTokenizer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StreamTokenizer.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StreamTokenizer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StreamTokenizer.java Sat Jul  4 08:38:13 2009
@@ -336,7 +336,7 @@
         }
         // Check for words
         if ((currentType & TOKEN_WORD) != 0) {
-            StringBuffer word = new StringBuffer(20);
+            StringBuilder word = new StringBuilder(20);
             while (true) {
                 word.append((char) currentChar);
                 currentChar = read();
@@ -353,7 +353,7 @@
         // Check for quoted character
         if (currentType == TOKEN_QUOTE) {
             int matchQuote = currentChar;
-            StringBuffer quoteString = new StringBuffer();
+            StringBuilder quoteString = new StringBuilder();
             int peekOne = read();
             while (peekOne >= 0 && peekOne != matchQuote && peekOne != '\r'
                     && peekOne != '\n') {



Mime
View raw message