diff -r 64f7ee2f31dd -r 2f6d68f22eae jdk/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java --- a/jdk/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java Mon Aug 29 14:27:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,133 +0,0 @@ -/* - * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.io; - -import sun.nio.cs.ext.DoubleByte; -import static sun.nio.cs.CharsetMapping.*; - -public abstract class ByteToCharDBCS_ASCII extends ByteToCharConverter -{ - private boolean savedBytePresent; - private int savedByte; - - private DoubleByte.Decoder dec; - - public ByteToCharDBCS_ASCII(DoubleByte.Decoder dec) { - super(); - savedBytePresent = false; - this.dec = dec; - } - - char decodeSingle(int b) { - return dec.decodeSingle(b); - } - - char decodeDouble(int b1, int b2) { - return dec.decodeDouble(b1, b2); - } - - public int flush(char [] output, int outStart, int outEnd) - throws MalformedInputException - { - - if (savedBytePresent) { - reset(); - badInputLength = 0; - throw new MalformedInputException(); - } - - reset(); - return 0; - } - - /** - * Character conversion - */ - public int convert(byte[] input, int inOff, int inEnd, - char[] output, int outOff, int outEnd) - throws UnknownCharacterException, MalformedInputException, - ConversionBufferFullException - { - int inputSize; - char outputChar = UNMAPPABLE_DECODING; - - charOff = outOff; - byteOff = inOff; - - while(byteOff < inEnd) - { - int byte1; - - if (!savedBytePresent) { - byte1 = input[byteOff] & 0xff; - inputSize = 1; - } else { - byte1 = savedByte; - savedBytePresent = false; - inputSize = 0; - } - - outputChar = decodeSingle(byte1); - if (outputChar == UNMAPPABLE_DECODING) { - - if (byteOff + inputSize >= inEnd) { - savedByte = byte1; - savedBytePresent = true; - byteOff += inputSize; - break; - } - - outputChar = decodeDouble(byte1, input[byteOff+inputSize] & 0xff); - inputSize++; - } - - if (outputChar == UNMAPPABLE_DECODING) { - if (subMode) - outputChar = subChars[0]; - else { - badInputLength = inputSize; - throw new UnknownCharacterException(); - } - } - - if (charOff >= outEnd) - throw new ConversionBufferFullException(); - - output[charOff++] = outputChar; - byteOff += inputSize; - - } - - return charOff - outOff; - } - - /** - * Resets the converter. - */ - public void reset() { - charOff = byteOff = 0; - savedBytePresent = false; - } -}