harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1027820 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java drlvm/ jdktools/
Date Wed, 27 Oct 2010 05:57:57 GMT
Author: hindessm
Date: Wed Oct 27 05:57:57 2010
New Revision: 1027820

URL: http://svn.apache.org/viewvc?rev=1027820&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1022832:

  r1022832 | zhoukevin | 2010-10-15 07:37:14 +0100 (Fri, 15 Oct 2010) | 1 line
  
  Given a test case of using java.beans.XMLEncoder.writeObject() to write any object. Of the
encoding output, for each line, Oracle JDK6 always ends with a space while HARMONY doesn't.
This is a non-bug difference between, but it's nice for HARMONY to have it.

Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 05:57:57 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 05:57:57 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 05:57:57 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java?rev=1027820&r1=1027819&r2=1027820&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
Wed Oct 27 05:57:57 2010
@@ -126,7 +126,7 @@ public class XMLEncoder extends Encoder 
      */
     public void close() {
         flush();
-        out.println("</java>"); //$NON-NLS-1$
+        out.println("</java> "); //$NON-NLS-1$
         out.close();
     }
 
@@ -157,10 +157,10 @@ public class XMLEncoder extends Encoder 
         synchronized (this) {
             // write xml header
             if (!hasXmlHeader) {
-                out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+                out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?> ");
                 out.println("<java version=\""
                         + System.getProperty("java.version")
-                        + "\" class=\"java.beans.XMLDecoder\">");
+                        + "\" class=\"java.beans.XMLDecoder\"> ");
                 hasXmlHeader = true;
             }
 
@@ -201,7 +201,7 @@ public class XMLEncoder extends Encoder 
         }
         flushIndent(indent);
         if (obj == null) {
-            out.println("<null />");
+            out.println("<null /> ");
         } else if (obj instanceof String) {
             Record rec = objRecordMap.get(obj);
             if (null != rec) {
@@ -211,25 +211,25 @@ public class XMLEncoder extends Encoder 
             }
             out.print("<string>");
             flushString((String) obj);
-            out.println("</string>");
+            out.println("</string> ");
         } else if (obj instanceof Class<?>) {
-            out.println("<class>" + ((Class<?>) obj).getName() + "</class>");
+            out.println("<class>" + ((Class<?>) obj).getName() + "</class>
");
         } else if (obj instanceof Boolean) {
-            out.println("<boolean>" + obj + "</boolean>");
+            out.println("<boolean>" + obj + "</boolean> ");
         } else if (obj instanceof Byte) {
-            out.println("<byte>" + obj + "</byte>");
+            out.println("<byte>" + obj + "</byte> ");
         } else if (obj instanceof Character) {
-            out.println("<char>" + obj + "</char>");
+            out.println("<char>" + obj + "</char> ");
         } else if (obj instanceof Double) {
-            out.println("<double>" + obj + "</double>");
+            out.println("<double>" + obj + "</double> ");
         } else if (obj instanceof Float) {
-            out.println("<float>" + obj + "</float>");
+            out.println("<float>" + obj + "</float> ");
         } else if (obj instanceof Integer) {
-            out.println("<int>" + obj + "</int>");
+            out.println("<int>" + obj + "</int> ");
         } else if (obj instanceof Long) {
-            out.println("<long>" + obj + "</long>");
+            out.println("<long>" + obj + "</long> ");
         } else if (obj instanceof Short) {
-            out.println("<short>" + obj + "</short>");
+            out.println("<short>" + obj + "</short> ");
         } else {
             getExceptionListener().exceptionThrown(
                     new Exception(Messages.getString("beans.73", obj)));
@@ -253,7 +253,7 @@ public class XMLEncoder extends Encoder 
             flushIndent(indent);
             out.print("<object idref=\"");
             out.print(rec.id);
-            out.println("\" />");
+            out.println("\"/> ");
             return;
         }
 
@@ -313,10 +313,10 @@ public class XMLEncoder extends Encoder 
 
         // open tag, end
         if (rec.exp.getArguments().length == 0 && rec.stats.isEmpty()) {
-            out.println("/>");
+            out.println("/> ");
             return;
         }
-        out.println(">");
+        out.println("> ");
 
         // arguments
         for (int i = 0; i < rec.exp.getArguments().length; i++) {
@@ -330,7 +330,7 @@ public class XMLEncoder extends Encoder 
         flushIndent(indent);
         out.print("</");
         out.print(tagName);
-        out.println(">");
+        out.println("> ");
     }
 
     @SuppressWarnings("nls")
@@ -356,17 +356,17 @@ public class XMLEncoder extends Encoder 
 
         // open tag, end
         if (subStats.isEmpty()) {
-            out.println("/>");
+            out.println("/> ");
             return;
         }
-        out.println(">");
+        out.println("> ");
 
         // sub statements
         flushSubStatements(subStats, indent);
 
         // close tag
         flushIndent(indent);
-        out.println("</array>");
+        out.println("</array> ");
     }
 
     @SuppressWarnings("nls")
@@ -401,10 +401,10 @@ public class XMLEncoder extends Encoder 
 
         // open tag, end
         if (stat.getArguments().length == 0 && subStats.isEmpty()) {
-            out.println("/>");
+            out.println("/> ");
             return;
         }
-        out.println(">");
+        out.println("> ");
 
         // arguments
         for (int i = 0; i < stat.getArguments().length; i++) {
@@ -418,7 +418,7 @@ public class XMLEncoder extends Encoder 
         flushIndent(indent);
         out.print("</");
         out.print(tagName);
-        out.println(">");
+        out.println("> ");
     }
 
     @SuppressWarnings("nls")
@@ -484,15 +484,15 @@ public class XMLEncoder extends Encoder 
             out.print(" field=\"");
             out.print(stat.getArguments()[0]);
             out.print("\"");
-            out.println("/>");
+            out.println("/> ");
         } else {
             out.print(" method=\"");
             out.print(stat.getMethodName());
             out.print("\"");
-            out.println(">");
+            out.println("> ");
             flushObject(stat.getArguments()[0], indent + INDENT_UNIT);
             flushIndent(indent);
-            out.println("</object>");
+            out.println("</object> ");
         }
     }
 
@@ -526,10 +526,10 @@ public class XMLEncoder extends Encoder 
 
         // open tag, end
         if (stat.getArguments().length == 0 && subStats.isEmpty()) {
-            out.println("/>");
+            out.println("/> ");
             return;
         }
-        out.println(">");
+        out.println("> ");
 
         // arguments
         for (int i = 0; i < stat.getArguments().length; i++) {
@@ -543,7 +543,7 @@ public class XMLEncoder extends Encoder 
         flushIndent(indent);
         out.print("</");
         out.print(tagName);
-        out.println(">");
+        out.println("> ");
     }
 
     @SuppressWarnings("nls")
@@ -576,10 +576,10 @@ public class XMLEncoder extends Encoder 
 
         // open tag, end
         if (stat.getArguments().length == 1 && subStats.isEmpty()) {
-            out.println("/>");
+            out.println("/> ");
             return;
         }
-        out.println(">");
+        out.println("> ");
 
         // arguments
         for (int i = 1; i < stat.getArguments().length; i++) {
@@ -593,7 +593,7 @@ public class XMLEncoder extends Encoder 
         flushIndent(indent);
         out.print("</");
         out.print(tagName);
-        out.println(">");
+        out.println("> ");
     }
 
     @SuppressWarnings("nls")

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 05:57:57 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 05:57:57 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message