2005-04-29 Sven de Marothy <sven@physto.se>

           Mark Wielaard  <mark@klomp.org>

       * java/nio/charset/Charset.java (defaultCharset): Use
       SystemProperties.
       (provider): Check gnu.classpath.nio.charset.provider.iconv system
       property and return the IconvProvider when set.

       * NEWS: Document new character encoder framework.

3 files changed, 51 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d8bccd8f3..29ee34345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-29  Sven de Marothy  <sven@physto.se>
+	    Mark Wielaard  <mark@klomp.org>
+
+	* java/nio/charset/Charset.java (defaultCharset): Use
+	SystemProperties.
+	(provider): Check gnu.classpath.nio.charset.provider.iconv system
+	property and return the IconvProvider when set.
+
+	* NEWS: Document new character encoder framework.
+
 2005-04-29  Michael Koch  <konqueror@gmx.de>
 
 	* java/nio/charset/Charset.java
diff --git a/NEWS b/NEWS
index 0bb28d0ef..df8355153 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,37 @@
-New in release 0.15 ()
+New in release 0.15 (Apr 29, 2005)
+
+* The old character encoding framework (gnu.java.io.EncodingManager)
+has been replaced by a system based completely on nio.charset
+providers. Many converters have been added, both the io, lang and nio
+frameworks now use the same set of converters and the whole character
+stream framework (Readers and Writers) have been optimized. For some
+workloads this leads to 2x till 20x speedups.
+
+The default charsets supported are:
+
+  Cp424, Cp437, Cp737, Cp775, Cp850, Cp852, Cp855, Cp857, Cp860, Cp861,
+  Cp862, Cp863, Cp864, Cp865, Cp866, Cp869, Cp874, ISO_8859_1, ISO_8859_13,
+  ISO_8859_15, ISO_8859_2, ISO_8859_3, ISO_8859_4, ISO_8859_5, ISO_8859_6,
+  ISO_8859_7, ISO_8859_8, ISO_8859_9, KOI_8, MS874, MacCentralEurope,
+  MacCroatian, MacCyrillic, MacDingbat, MacGreek, MacIceland, MacRoman,
+  MacRomania, MacSymbol, MacThai, MacTurkish, US_ASCII, UTF_16, UTF_16BE,
+  UTF_16Decoder, UTF_16Encoder, UTF_16LE, UTF_8, UnicodeLittle, Windows1250,
+  Windows1251, Windows1252, Windows1253, Windows1254, Windows1255,
+  Windows1256, Windows1257, Windows1258.
+
+Many more encoding are supported through the new IconvProvider
+depending on the platform iconv support. GNU libiconv is recommended.
+The IconvProvider is currently not enabled by default. To enable it
+define the system property gnu.classpath.nio.charset.provider.iconv=true.
+Some runtimes might choose to enable this by default by setting it
+through VMSystemProperties. We would like to get feedback on whether
+enabling or disabling the IconvProvider by default results in the
+highest speedups.
 
 Runtime interface changes:
 
+* jni.h changed to better support more VMs; see VM integration guide
+  for details.
 * New --enable-default-toolkit option to configure can be used to set
   the fully qualified class name of the default AWT toolkit to use.
   If not given, the old default of gnu.java.awt.peerk.gtk.GtkToolkit
@@ -10,11 +40,6 @@ Runtime interface changes:
   "core" JNI libraries.  This is primarily useful if your VM can use the
   Gtk peers but not the core JNI libraries.
 
-VM Interface changes:
-
-* jni.h changed to better support more VMs; see VM integration guide
-  for details.
-
 Other changes:
 
 * Fixed compatibility problems in the Java Beans API which affected Eclipse's
diff --git a/java/nio/charset/Charset.java b/java/nio/charset/Charset.java
index 77190263b..349f0f86e 100644
--- a/java/nio/charset/Charset.java
+++ b/java/nio/charset/Charset.java
@@ -38,7 +38,10 @@ exception statement from your version. */
 
 package java.nio.charset;
 
+import gnu.classpath.SystemProperties;
+
 import gnu.java.nio.charset.Provider;
+import gnu.java.nio.charset.iconv.IconvProvider;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -129,7 +132,7 @@ public abstract class Charset implements Comparable
     
     try 
       {
-	encoding = System.getProperty("file.encoding");
+	encoding = SystemProperties.getProperty("file.encoding");
       }
     catch(SecurityException e)
       {
@@ -231,6 +234,12 @@ public abstract class Charset implements Comparable
 
   private static CharsetProvider provider()
   {
+    String useIconv = SystemProperties.getProperty
+      ("gnu.classpath.nio.charset.provider.iconv");
+
+    if (useIconv != null)
+      return IconvProvider.provider();
+
     return Provider.provider();
   }