diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/nio/charset/Charset.java | 5 | ||||
| -rw-r--r-- | libjava/java/nio/charset/CharsetEncoder.java | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 785c9bb..331f7d0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-02-15 Jesse Rosenstock <jmr@ugcs.caltech.edu> + + * java/nio/charset/Charset.java + (isRegistered): Fixed method args and implementation. + * java/nio/charset/CharsetEncoder.java + (unmappableCharacterAction): New method. + 2003-02-15 Michael Koch <konqueror@gmx.de> * java/awt/CheckboxMenuItem.java diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java index cc60c99b..889267f 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 dd434a7..dc1fa99 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) { |