diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-15 09:39:51 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-15 09:39:51 +0000 |
| commit | 53885037ffbf4d4f18c5fb74cb54cc1371b680fb (patch) | |
| tree | 909e9d7d829f4e000b87acca1b297d70a555511e /libjava | |
| parent | 97da26a07200506208144d5571c3d38e1b6147eb (diff) | |
| download | ppe42-gcc-53885037ffbf4d4f18c5fb74cb54cc1371b680fb.tar.gz ppe42-gcc-53885037ffbf4d4f18c5fb74cb54cc1371b680fb.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62934 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 785c9bbae63..331f7d00e37 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 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) { |
