summaryrefslogtreecommitdiffstats
path: root/libjava/java
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2003-02-15 09:39:51 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2003-02-15 09:39:51 +0000
commit53885037ffbf4d4f18c5fb74cb54cc1371b680fb (patch)
tree909e9d7d829f4e000b87acca1b297d70a555511e /libjava/java
parent97da26a07200506208144d5571c3d38e1b6147eb (diff)
downloadppe42-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/java')
-rw-r--r--libjava/java/nio/charset/Charset.java5
-rw-r--r--libjava/java/nio/charset/CharsetEncoder.java5
2 files changed, 8 insertions, 2 deletions
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)
{
OpenPOWER on IntegriCloud