From a59159654bf123af6626677a0cf567b46d073990 Mon Sep 17 00:00:00 2001 From: Jesse Rosenstock Date: Sat, 15 Feb 2003 09:39:51 +0000 Subject: [PATCH] 2003-02-15 Jesse Rosenstock * java/nio/charset/Charset.java (isRegistered): Fixed method args and implementation. * java/nio/charset/CharsetEncoder.java (unmappableCharacterAction): New method. From-SVN: r62934 --- libjava/ChangeLog | 7 +++++++ libjava/java/nio/charset/Charset.java | 5 +++-- libjava/java/nio/charset/CharsetEncoder.java | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 785c9bbae63..331f7d00e37 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-02-15 Jesse Rosenstock + + * java/nio/charset/Charset.java + (isRegistered): Fixed method args and implementation. + * java/nio/charset/CharsetEncoder.java + (unmappableCharacterAction): New method. + 2003-02-15 Michael Koch * java/awt/CheckboxMenuItem.java diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java index cc60c99b9b6..889267f302f 100644 --- a/libjava/java/nio/charset/Charset.java +++ b/libjava/java/nio/charset/Charset.java @@ -187,9 +187,10 @@ public abstract class Charset implements Comparable return canonicalName; } - public final boolean isRegistered (String name) + public final boolean isRegistered () { - return !name.startsWith ("x-") && !name.startsWith ("X-"); + return (!canonicalName.startsWith ("x-") + && !canonicalName.startsWith ("X-")); } public abstract boolean contains (Charset cs); diff --git a/libjava/java/nio/charset/CharsetEncoder.java b/libjava/java/nio/charset/CharsetEncoder.java index dd434a79752..dc1fa99cd93 100644 --- a/libjava/java/nio/charset/CharsetEncoder.java +++ b/libjava/java/nio/charset/CharsetEncoder.java @@ -319,6 +319,11 @@ public abstract class CharsetEncoder return this; } + public CodingErrorAction unmappableCharacterAction () + { + return unmappableCharacterAction; + } + public final CharsetEncoder onUnmappableCharacter (CodingErrorAction newAction) { -- 2.30.2