[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: made charset codecs package private

[Kaffe CVS]

PatchSet 5422 
Date: 2004/11/08 10:47:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: made charset codecs package private

2004-11-08  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java,
        libraries/javalib/gnu/java/nio/charset/UTF_8.java,
        libraries/javalib/gnu/java/nio/charset/US_ASCII.java:
        Resynced with GNU Classpath.

        2004-11-06  Tom Tromey  <tromey at redhat.com>

        * gnu/java/nio/charset/ISO_8859_1.java (Decoder): Now
        package-private.
        (Encoder): Likewise.
        * gnu/java/nio/charset/UTF_8.java (Decoder): Now package-private.
        (Encoder): Likewise.
        * gnu/java/nio/charset/US_ASCII.java (Decoder): Now
        package-private.
        (Encoder): Likewise.

Members: 
	ChangeLog:1.2971->1.2972 
	libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java:1.1->1.2 
	libraries/javalib/gnu/java/nio/charset/US_ASCII.java:1.1->1.2 
	libraries/javalib/gnu/java/nio/charset/UTF_8.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2971 kaffe/ChangeLog:1.2972
--- kaffe/ChangeLog:1.2971	Mon Nov  8 10:13:12 2004
+++ kaffe/ChangeLog	Mon Nov  8 10:47:11 2004
@@ -1,3 +1,21 @@
+2004-11-08  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java,
+	libraries/javalib/gnu/java/nio/charset/UTF_8.java,
+	libraries/javalib/gnu/java/nio/charset/US_ASCII.java:
+        Resynced with GNU Classpath.
+
+	2004-11-06  Tom Tromey  <tromey at redhat.com>
+
+        * gnu/java/nio/charset/ISO_8859_1.java (Decoder): Now
+        package-private.
+        (Encoder): Likewise.
+        * gnu/java/nio/charset/UTF_8.java (Decoder): Now package-private.
+        (Encoder): Likewise.
+        * gnu/java/nio/charset/US_ASCII.java (Decoder): Now
+        package-private.
+        (Encoder): Likewise.
+
 2004-11-07  Robert Schuster <thebohemian at gmx.net>
 
 	Fixed regression:
Index: kaffe/libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java:1.1 kaffe/libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java:1.1	Thu Nov 28 13:39:26 2002
+++ kaffe/libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java	Mon Nov  8 10:47:13 2004
@@ -1,5 +1,5 @@
 /* ISO_8859_1.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -73,7 +73,8 @@
 
   private static final class Decoder extends CharsetDecoder
   {
-    private Decoder (Charset cs)
+    // Package-private to avoid a trampoline constructor.
+    Decoder (Charset cs)
     {
       super (cs, 1.0f, 1.0f);
     }
@@ -100,7 +101,8 @@
 
   private static final class Encoder extends CharsetEncoder
   {
-    private Encoder (Charset cs)
+    // Package-private to avoid a trampoline constructor.
+    Encoder (Charset cs)
     {
       super (cs, 1.0f, 1.0f);
     }
Index: kaffe/libraries/javalib/gnu/java/nio/charset/US_ASCII.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/US_ASCII.java:1.1 kaffe/libraries/javalib/gnu/java/nio/charset/US_ASCII.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/charset/US_ASCII.java:1.1	Thu Nov 28 13:39:26 2002
+++ kaffe/libraries/javalib/gnu/java/nio/charset/US_ASCII.java	Mon Nov  8 10:47:13 2004
@@ -1,5 +1,5 @@
 /* US_ASCII.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -73,7 +73,8 @@
 
   private static final class Decoder extends CharsetDecoder
   {
-    private Decoder (Charset cs)
+    // Package-private to avoid a trampoline constructor.
+    Decoder (Charset cs)
     {
       super (cs, 1.0f, 1.0f);
     }
@@ -105,7 +106,8 @@
 
   private static final class Encoder extends CharsetEncoder
   {
-    private Encoder (Charset cs)
+    // Package-private to avoid a trampoline constructor.
+    Encoder (Charset cs)
     {
       super (cs, 1.0f, 1.0f);
     }
Index: kaffe/libraries/javalib/gnu/java/nio/charset/UTF_8.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/UTF_8.java:1.1 kaffe/libraries/javalib/gnu/java/nio/charset/UTF_8.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/charset/UTF_8.java:1.1	Thu Nov 28 13:39:26 2002
+++ kaffe/libraries/javalib/gnu/java/nio/charset/UTF_8.java	Mon Nov  8 10:47:13 2004
@@ -1,5 +1,5 @@
 /* UTF_8.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -84,7 +84,8 @@
 
   private static final class Decoder extends CharsetDecoder
   {
-    private Decoder (Charset cs)
+    // Package-private to avoid a trampoline constructor.
+    Decoder (Charset cs)
     {
       super (cs, 1.0f, 1.0f);
     }
@@ -171,7 +172,8 @@
 
   private static final class Encoder extends CharsetEncoder
   {
-    private Encoder (Charset cs)
+    // Package-private to avoid a trampoline constructor.
+    Encoder (Charset cs)
     {
       // According to
       // http://www-106.ibm.com/developerworks/unicode/library/utfencodingforms/index.html