[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Fixed maxBytesPerChar handling in UTF_16Encoder

[Kaffe CVS]

PatchSet 5298 
Date: 2004/10/15 14:38:57
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Fixed maxBytesPerChar handling in UTF_16Encoder

2004-10-15  Dalibor Topic <robilad at kaffe.org>

        * libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java:
        Resynced with GNU Classpath.

        2004-10-15  Michael Koch  <konqueror at gmx.de>

        * gnu/java/nio/charset/UTF_16Encoder.java
        (UTF_16Encoder): Fixed maxBytesPerChar handling.

Members: 
	ChangeLog:1.2850->1.2851 
	libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2850 kaffe/ChangeLog:1.2851
--- kaffe/ChangeLog:1.2850	Fri Oct 15 14:24:58 2004
+++ kaffe/ChangeLog	Fri Oct 15 14:38:57 2004
@@ -1,5 +1,15 @@
 2004-10-15  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java:
+        Resynced with GNU Classpath.
+
+	2004-10-15  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/java/nio/charset/UTF_16Encoder.java
+        (UTF_16Encoder): Fixed maxBytesPerChar handling.
+
+2004-10-15  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/java/lang/Object.java,
 	libraries/javalib/java/lang/Thread.java,
 	libraries/javalib/java/lang/ThreadLocal.java:
Index: kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java:1.1 kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java:1.1	Thu Nov 28 13:39:26 2002
+++ kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Encoder.java	Fri Oct 15 14:38:58 2004
@@ -63,7 +63,7 @@
   UTF_16Encoder (Charset cs, int byteOrder, boolean useByteOrderMark)
   {
     super (cs, 2.0f,
-           useByteOrderMark ? 4.0f : 2.0f,
+           useByteOrderMark ? 2.0f : 4.0f,
            byteOrder == BIG_ENDIAN
              ? new byte[] { (byte) 0xFF, (byte) 0xFD }
              : new byte[] { (byte) 0xFD, (byte) 0xFF });