From 7da8d41adf41ef3a5b498c0cbdb1f88d36ae1d62 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 25 Sep 2006 21:04:01 +0000 Subject: PR libgcj/29178: * gnu/java/nio/charset/US_ASCII.java (Encoder.canEncode): New method. (Encoder.canEncode): Likewise. (Encoder.encodeLoop): Return unmappable for all non-ASCII characters. * gnu/java/nio/charset/ByteCharset.java (Encoder.canEncode): New method. (Encoder.canEncode): Likewise. * gnu/java/nio/charset/ISO_8859_1.java (Encoder.canEncode): New method. (Encoder.canEncode): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117209 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/gnu/java/nio/charset/US_ASCII.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'libjava/classpath/gnu/java/nio/charset/US_ASCII.java') diff --git a/libjava/classpath/gnu/java/nio/charset/US_ASCII.java b/libjava/classpath/gnu/java/nio/charset/US_ASCII.java index d26f7ffc9ab..8888416bebf 100644 --- a/libjava/classpath/gnu/java/nio/charset/US_ASCII.java +++ b/libjava/classpath/gnu/java/nio/charset/US_ASCII.java @@ -134,6 +134,19 @@ final class US_ASCII extends Charset super (cs, 1.0f, 1.0f); } + public boolean canEncode(char c) + { + return c <= 0x7f; + } + + public boolean canEncode(CharSequence cs) + { + for (int i = 0; i < cs.length(); ++i) + if (! canEncode(cs.charAt(i))) + return false; + return true; + } + protected CoderResult encodeLoop (CharBuffer in, ByteBuffer out) { // TODO: Optimize this in the case in.hasArray() / out.hasArray() @@ -141,7 +154,7 @@ final class US_ASCII extends Charset { char c = in.get (); - if (c > Byte.MAX_VALUE) + if (c > 0x7f) { in.position (in.position () - 1); return CoderResult.unmappableForLength (1); -- cgit v1.2.3