diff options
Diffstat (limited to 'libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java')
| -rw-r--r-- | libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java b/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java index fa1dbc412f4..e078a691978 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java @@ -1,4 +1,4 @@ -/* UTF_16Decoder.java -- +/* UTF_16Decoder.java -- Copyright (C) 2002, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,15 +117,15 @@ final class UTF_16Decoder extends CharsetDecoder } } - // FIXME: Change so you only do a single comparison here. + // FIXME: Change so you only do a single comparison here. char c = (byteOrder == BIG_ENDIAN - ? (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF)) - : (char) (((b2 & 0xFF) << 8) | (b1 & 0xFF))); + ? (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF)) + : (char) (((b2 & 0xFF) << 8) | (b1 & 0xFF))); if (0xD800 <= c && c <= 0xDFFF) { // c is a surrogate - + // make sure c is a high surrogate if (c > 0xDBFF) return CoderResult.malformedForLength (2); @@ -134,8 +134,8 @@ final class UTF_16Decoder extends CharsetDecoder byte b3 = in.get (); byte b4 = in.get (); char d = (byteOrder == BIG_ENDIAN - ? (char) (((b3 & 0xFF) << 8) | (b4 & 0xFF)) - : (char) (((b4 & 0xFF) << 8) | (b3 & 0xFF))); + ? (char) (((b3 & 0xFF) << 8) | (b4 & 0xFF)) + : (char) (((b4 & 0xFF) << 8) | (b3 & 0xFF))); // make sure d is a low surrogate if (d < 0xDC00 || d > 0xDFFF) return CoderResult.malformedForLength (2); |