harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r555607 - in /harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar: CharsetProviderImpl.java charset/additional/x_windows_949.java
Date Thu, 12 Jul 2007 12:12:15 GMT
Author: apetrenko
Date: Thu Jul 12 05:12:14 2007
New Revision: 555607

URL: http://svn.apache.org/viewvc?view=rev&rev=555607
Log:
Patch for HARMONY-4393 "[classlib][nio charset] Charset KSC_5601 does not contains itself
"

Modified:
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java?view=diff&rev=555607&r1=555606&r2=555607
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
Thu Jul 12 05:12:14 2007
@@ -624,8 +624,7 @@
                                                             "x-MS950-HKSCS",
                                                             "MS950_HKSCS" } },
 
-            { "additional.x_windows_949",         null, new String[] { "KSC_5601",
-                                                            "x-windows-949",
+            { "additional.x_windows_949",         null, new String[] { "x-windows-949",
                                                             "MS949" } },
 
             { "additional.GB18030",                null, new String[] { "GB18030",

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java?view=diff&rev=555607&r1=555606&r2=555607
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java
Thu Jul 12 05:12:14 2007
@@ -32,7 +32,7 @@
         }
 
         public boolean contains(Charset cs) {
-            return cs.name().equalsIgnoreCase("IBM367") || cs.name().equalsIgnoreCase("US-ASCII")
;
+            return cs.name().equalsIgnoreCase("x-windows-949") || cs.name().equalsIgnoreCase("IBM367")
|| cs.name().equalsIgnoreCase("US-ASCII") ;
         }
 
         public CharsetDecoder newDecoder() {



Mime
View raw message