From b796788feb62b4d42a5f69e37668587e99cf0acb Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 6 Nov 2004 22:44:47 +0000
Subject: [PATCH] * 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90196 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 11 +++++++++++
libjava/gnu/java/nio/charset/ISO_8859_1.java | 8 +++++---
libjava/gnu/java/nio/charset/US_ASCII.java | 8 +++++---
libjava/gnu/java/nio/charset/UTF_8.java | 8 +++++---
4 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 924288c0ed7c..7ce832afd5e6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-06 Tom Tromey <tromey@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-06 Mark Wielaard <mark@klomp.org>
* Makefile.am: Add new javax.imageio files.
diff --git a/libjava/gnu/java/nio/charset/ISO_8859_1.java b/libjava/gnu/java/nio/charset/ISO_8859_1.java
index f29fa2603006..a7fcb6363535 100644
--- a/libjava/gnu/java/nio/charset/ISO_8859_1.java
+++ b/libjava/gnu/java/nio/charset/ISO_8859_1.java
@@ -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 @@ final class ISO_8859_1 extends Charset
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 @@ final class ISO_8859_1 extends Charset
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);
}
diff --git a/libjava/gnu/java/nio/charset/US_ASCII.java b/libjava/gnu/java/nio/charset/US_ASCII.java
index a1ff25104025..9efb8ecf6f88 100644
--- a/libjava/gnu/java/nio/charset/US_ASCII.java
+++ b/libjava/gnu/java/nio/charset/US_ASCII.java
@@ -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 @@ final class US_ASCII extends Charset
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 @@ final class US_ASCII extends Charset
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);
}
diff --git a/libjava/gnu/java/nio/charset/UTF_8.java b/libjava/gnu/java/nio/charset/UTF_8.java
index aa623b2f2cfd..acb34e2bbce6 100644
--- a/libjava/gnu/java/nio/charset/UTF_8.java
+++ b/libjava/gnu/java/nio/charset/UTF_8.java
@@ -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 @@ final class UTF_8 extends Charset
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 @@ final class UTF_8 extends Charset
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
--
GitLab