harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r999786 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java drlvm/ jdktools/
Date Wed, 22 Sep 2010 07:47:21 GMT
Author: hindessm
Date: Wed Sep 22 07:47:20 2010
New Revision: 999786

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

  r998619 | regisxu | 2010-09-19 10:04:58 +0100 (Sun, 19 Sep 2010) | 1 line
  
  Apply patch for HARMONY-6616: [classlib][nio_char] Incompatible charsets of Charset.availableCharsets()
between RI6 and Harmony6


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/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.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 Sep 22 07:47:20 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:47:20 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
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619
 /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 Sep 22 07:47:20 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
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619
 /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/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java?rev=999786&r1=999785&r2=999786&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
Wed Sep 22 07:47:20 2010
@@ -365,8 +365,8 @@ public class CharsetProviderImpl extends
                                                   "X-UTF-16BE",
                                                   "UTF_16BE" } },
 
-            { "IBM866",      null, new String[] { "cp866",
-                                                  "IBM866",
+            { "IBM866",      null, new String[] { "IBM866",
+                                                  "cp866",
                                                   "866",
                                                   "csIBM866" } }, 
 
@@ -415,8 +415,8 @@ public class CharsetProviderImpl extends
                                                   "cp775",
                                                   "csPC775Baltic" } },
 
-            { "additional.IBM850",      null, new String[] { "cp850",
-                                                  "IBM850",
+            { "additional.IBM850",      null, new String[] { "IBM850",
+                                                  "cp850",
                                                   "850",
                                                   "csPC850Multilingual" } },
 
@@ -430,46 +430,46 @@ public class CharsetProviderImpl extends
                                                   "855",
                                                   "csIBM855" } },
 
-            { "additional.IBM857",      null, new String[] { "cp857",
-                                                  "IBM857",
+            { "additional.IBM857",      null, new String[] { "IBM857",
+                                                  "cp857",
                                                   "857",
                                                   "csIBM857" } },
 
-            { "additional.IBM860",      null, new String[] { "cp860",
-                                                  "IBM860",
+            { "additional.IBM860",      null, new String[] { "IBM860",
+                                                  "cp860",
                                                   "860",
                                                   "csIBM860" } },
 
-            { "additional.IBM861",      null, new String[] { "cp861",
-                                                  "IBM861",
+            { "additional.IBM861",      null, new String[] { "IBM861",
+                                                  "cp861",
                                                   "861",
                                                   "cp-is",
                                                   "csIBM861" } },
 
-            { "additional.IBM862",      null, new String[] { "cp862",
-                                                  "IBM862",
+            { "additional.IBM862",      null, new String[] { "IBM862",
+                                                  "cp862",
                                                   "862",
                                                   "csPC862LatinHebrew" } },
 
-            { "additional.IBM863",      null, new String[] { "cp863",
-                                                  "IBM863",
+            { "additional.IBM863",      null, new String[] { "IBM863",
+                                                  "cp863",
                                                   "863",
                                                   "csIBM863" } },
 
-            { "additional.IBM865",      null, new String[] { "cp865",
-                                                  "IBM865",
+            { "additional.IBM865",      null, new String[] { "IBM865",
+                                                  "cp865",
                                                   "865",
                                                   "csIBM865" } },
 
-            { "additional.IBM869",      null, new String[] { "cp869",
-                                                  "IBM869",
+            { "additional.IBM869",      null, new String[] { "IBM869",
+                                                  "cp869",
                                                   "869",
                                                   "cp-gr",
                                                   "csIBM869" } },
 
 
-            { "additional.IBM00858",    null, new String[] { "cp858",
-                                                  "IBM00858",
+            { "additional.IBM00858",    null, new String[] { "IBM00858",
+                                                  "cp858",
                                                   "CCSID00858",
                                                   "CP00858" } },
 
@@ -580,12 +580,12 @@ public class CharsetProviderImpl extends
                                                   "ebcdic-cp-ar1",
                                                   "csIBM420" } },
 
-            { "additional.IBM864",      null, new String[] { "cp864",
-                                                  "IBM864",
+            { "additional.IBM864",      null, new String[] { "IBM864",
+                                                  "cp864",
                                                   "csIBM864" } },
 
-            { "additional.IBM868",      null, new String[] { "cp868",
-                                                  "IBM868",
+            { "additional.IBM868",      null, new String[] { "IBM868",
+                                                  "cp868",
                                                   "cp-ar",
                                                   "csIBM868" } },
 
@@ -620,66 +620,66 @@ public class CharsetProviderImpl extends
             { "additional.IBM_Thai",    null, new String[] { "IBM-Thai",
                                                   "cp838" } },
 
-            { "additional.x_IBM737",    null, new String[] { "x-ibm-737_P100-1997",
-                                                  "x-IBM737",
+            { "additional.x_IBM737",    null, new String[] { "x-IBM737",
+                                                  "x-ibm-737_P100-1997",
                                                   "cp737" } },
 
-            { "additional.x_IBM856",    null, new String[] { "cp856",
-                                                  "x-IBM856"} },
+            { "additional.x_IBM856",    null, new String[] { "x-IBM856",
+                                                  "cp856"} },
 
             { "additional.x_IBM874",    null, new String[] { "TIS-620",
                                                   "x-IBM874",
                                                   "cp874"} },
 
-            { "additional.x_IBM875",    null, new String[] { "x-ibm-875_P100-1995",
-                                                  "x-IBM875",
+            { "additional.x_IBM875",    null, new String[] { "x-IBM875",
+                                                  "x-ibm-875_P100-1995",
                                                   "cp875"} },
 
-            { "additional.x_IBM922",    null, new String[] { "cp922",
-                                                  "x-IBM922"} },
+            { "additional.x_IBM922",    null, new String[] {"x-IBM922",
+                    "cp922"} },
 
-            { "additional.x_IBM1006",   null, new String[] { "x-ibm-1006_P100-1995",
-                                                  "x-IBM1006",
+            { "additional.x_IBM1006",   null, new String[] { "x-IBM1006",
+                                                  "x-ibm-1006_P100-1995",
                                                   "cp1006"} },
 
-            { "additional.x_IBM1025",   null, new String[] { "x-ibm-1025_P100-1995",
-                                                  "x-IBM1025",
+            { "additional.x_IBM1025",   null, new String[] { "x-IBM1025",
+                                                  "x-ibm-1025_P100-1995",
                                                   "cp1025"} },
 
-            { "additional.x_IBM1112",   null, new String[] { "x-ibm-1112_P100-1995",
-                                                  "x-IBM1112",
+            { "additional.x_IBM1112",   null, new String[] { "x-IBM1112",
+                                                  "x-ibm-1112_P100-1995",
                                                   "cp1112"} },
 
-            { "additional.x_IBM1122",   null, new String[] { "x-ibm-1122_P100-1999",
-                                                  "x-IBM1122",
+            { "additional.x_IBM1122",   null, new String[] { "x-IBM1122",
+                                                  "x-ibm-1122_P100-1999",
                                                   "cp1122"} },
 
-            { "additional.x_IBM1123",   null, new String[] { "x-ibm-1123_P100-1995",
-                                                  "x-IBM1123",
+            { "additional.x_IBM1123",   null, new String[] { "x-IBM1123",
+                                                  "x-ibm-1123_P100-1995",
                                                   "cp1123"} },
 
-            { "additional.x_IBM1124",   null, new String[] { "x-ibm-1124_P100-1996",
-                                                  "x-IBM1124",
+            { "additional.x_IBM1124",   null, new String[] { "x-IBM1124",
+                                                  "x-ibm-1124_P100-1996",
                                                   "cp1124"} },
 
-            { "additional.x_IBM1097",   null, new String[] { "x-ibm-1097_P100-1995",
-                                                  "x-IBM1097",
+            { "additional.x_IBM1097",   null, new String[] { "x-IBM1097",
+                                                  "x-ibm-1097_P100-1995",
                                                   "cp1097"} },
 
-            { "additional.x_IBM1098",   null, new String[] { "x-ibm-1098_P100-1995",
-                                                  "x-IBM1098",
+            { "additional.x_IBM1098",   null, new String[] { "x-IBM1098",
+                                                  "x-ibm-1098_P100-1995",
                                                   "cp1098"} },
 
-            { "additional.x_MacCyrillic",           null, new String[] { "x-mac-cyrillic",
-                                                              "x-MacCyrillic",
+            { "additional.x_MacCyrillic",           null, new String[] { "x-MacCyrillic",
+                                                              "x-mac-cyrillic",
                                                               "MacCyrillic"} },
 
-            { "additional.x_MacGreek",              null, new String[] { "x-mac-greek",
-                                                              "x-MacGreek",
+            { "additional.x_MacGreek",              null, new String[] { "x-MacGreek",
+                                                              "x-mac-greek",
                                                               "MacGreek"} },
 
-            { "additional.x_MacTurkish",              null, new String[] { "x-mac-turkish",
-                                                              "x-MacTurkish",
+            { "additional.x_MacTurkish",              null, new String[] { "x-MacTurkish",
+                                                              "x-mac-turkish",
                                                               "MacTurkish"} },
 
             { "additional.windows_31j",            null, new String[] { "Shift_JIS",

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 07:47:20 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
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619
 /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 Sep 22 07:47:20 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message