[Bug classpath/27905] nio charsets inaccessible

[cvs-commit at developer dot classpath dot org]

------- Comment #3 from cvs-commit at developer dot classpath dot org  
2006-06-07 19:43 -------
Subject: Bug 27905

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Tom Tromey <tromey>     06/06/07 19:26:59

Modified files:
        .              : ChangeLog 
        gnu/java/nio/charset: Provider.java 

Log message:
                PR classpath/27905:
                * gnu/java/nio/charset/Provider.java (loadExtended): Now
synchronized.
                Added missing charsets.
                (charsetForName): Don't check 'extendedLoaded'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7702&r2=1.7703
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/nio/charset/Provider.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7702
retrieving revision 1.7703
diff -u -b -r1.7702 -r1.7703
--- ChangeLog   7 Jun 2006 19:12:03 -0000       1.7702
+++ ChangeLog   7 Jun 2006 19:26:59 -0000       1.7703
@@ -1,3 +1,10 @@
+2006-06-07  Tom Tromey  <address@hidden>
+
+       PR classpath/27905:
+       * gnu/java/nio/charset/Provider.java (loadExtended): Now synchronized.
+       Added missing charsets.
+       (charsetForName): Don't check 'extendedLoaded'.
+
 2006-06-07  Roman Kennke  <address@hidden>

        PR 27833

Index: gnu/java/nio/charset/Provider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/Provider.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/java/nio/charset/Provider.java  20 Feb 2006 19:20:49 -0000      1.9
+++ gnu/java/nio/charset/Provider.java  7 Jun 2006 19:26:59 -0000       1.10
@@ -155,9 +155,9 @@
  /**
   * Load non-mandatory charsets.
   */
-  private void loadExtended ()
+  private synchronized void loadExtended ()
   {
-    if(extendedLoaded)
+    if (extendedLoaded)
       return;

     addCharset (new ISO_8859_3 ());    // ISO-8859-3 aka ISO-LATIN-3
@@ -165,6 +165,12 @@
     addCharset (new ISO_8859_8 ());    // ISO-8859-8 (Hebrew)

     // Some more codepages
+    addCharset (new Cp424());
+    addCharset (new Cp437());
+    addCharset (new Cp737());
+    addCharset (new Cp775());
+    addCharset (new Cp850());
+    addCharset (new Cp852());
     addCharset (new Cp855()); // IBM Cyrillic
     addCharset (new Cp857()); // IBM Turkish
     addCharset (new Cp860()); // MSDOS Portugese
@@ -176,6 +182,24 @@
     addCharset (new Cp866()); // MSDOS Russian
     addCharset (new Cp869()); // IBM modern Greek
     addCharset (new Cp874()); // IBM Thai
+
+    addCharset (new MacCentralEurope());
+    addCharset (new MacCroatian());
+    addCharset (new MacCyrillic());
+    addCharset (new MacDingbat());
+    addCharset (new MacGreek());
+    addCharset (new MacIceland());
+    addCharset (new MacRoman());
+    addCharset (new MacRomania());
+    addCharset (new MacSymbol());
+    addCharset (new MacThai());
+    addCharset (new MacTurkish());
+    addCharset (new MS874());
+
+    addCharset (new Windows1255());
+    addCharset (new Windows1256());
+    addCharset (new Windows1258());
+
     extendedLoaded = true;
   }

@@ -199,7 +223,7 @@
   public Charset charsetForName (String charsetName)
   {
     Charset cs = (Charset)
charsets.get(canonicalNames.get(charsetName.toLowerCase()));
-    if(cs == null && !extendedLoaded)
+    if (cs == null)
      {
        loadExtended();
        cs = (Charset)
charsets.get(canonicalNames.get(charsetName.toLowerCase()));


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27905