--- old/jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java 2015-03-25 15:40:21.000000000 -0700 +++ /dev/null 2015-03-25 15:40:21.000000000 -0700 @@ -1,150 +0,0 @@ -/* - * Copyright (c) 1996, 2005, 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.awt.motif; - -import java.nio.CharBuffer; -import java.nio.ByteBuffer; -import java.nio.charset.*; -import sun.nio.cs.*; -import sun.nio.cs.ext.*; -import static sun.nio.cs.CharsetMapping.*; - -public class X11GB2312 extends Charset { - public X11GB2312 () { - super("X11GB2312", null); - } - public CharsetEncoder newEncoder() { - return new Encoder(this); - } - public CharsetDecoder newDecoder() { - return new Decoder(this); - } - - public boolean contains(Charset cs) { - return cs instanceof X11GB2312; - } - - private class Encoder extends CharsetEncoder { - private DoubleByte.Encoder enc = (DoubleByte.Encoder)new EUC_CN().newEncoder(); - - public Encoder(Charset cs) { - super(cs, 2.0f, 2.0f); - } - - public boolean canEncode(char c) { - if (c <= 0x7F) { - return false; - } - return enc.canEncode(c); - } - - protected int encodeDouble(char c) { - return enc.encodeChar(c); - } - - protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) { - char[] sa = src.array(); - int sp = src.arrayOffset() + src.position(); - int sl = src.arrayOffset() + src.limit(); - - byte[] da = dst.array(); - int dp = dst.arrayOffset() + dst.position(); - int dl = dst.arrayOffset() + dst.limit(); - - try { - while (sp < sl) { - char c = sa[sp]; - if (c <= '\u007f') - return CoderResult.unmappableForLength(1); - int ncode = encodeDouble(c); - if (ncode != 0 && c != '\u0000' ) { - da[dp++] = (byte) ((ncode >> 8) & 0x7f); - da[dp++] = (byte) (ncode & 0x7f); - sp++; - continue; - } - return CoderResult.unmappableForLength(1); - } - return CoderResult.UNDERFLOW; - } finally { - src.position(sp - src.arrayOffset()); - dst.position(dp - dst.arrayOffset()); - } - } - public boolean isLegalReplacement(byte[] repl) { - return true; - } - } - - private class Decoder extends CharsetDecoder { - private DoubleByte.Decoder dec = (DoubleByte.Decoder)new EUC_CN().newDecoder(); - - public Decoder(Charset cs) { - super(cs, 0.5f, 1.0f); - } - - protected char decodeDouble(int b1, int b2) { - return dec.decodeDouble(b1, b2); - } - - protected CoderResult decodeLoop(ByteBuffer src, CharBuffer dst) { - byte[] sa = src.array(); - int sp = src.arrayOffset() + src.position(); - int sl = src.arrayOffset() + src.limit(); - assert (sp <= sl); - sp = (sp <= sl ? sp : sl); - char[] da = dst.array(); - int dp = dst.arrayOffset() + dst.position(); - int dl = dst.arrayOffset() + dst.limit(); - assert (dp <= dl); - dp = (dp <= dl ? dp : dl); - - try { - while (sp < sl) { - if ( sl - sp < 2) { - return CoderResult.UNDERFLOW; - } - int b1 = sa[sp] & 0xFF | 0x80; - int b2 = sa[sp + 1] & 0xFF | 0x80; - char c = decodeDouble(b1, b2); - if (c == UNMAPPABLE_DECODING) { - return CoderResult.unmappableForLength(2); - } - if (dl - dp < 1) - return CoderResult.OVERFLOW; - da[dp++] = c; - sp +=2; - } - return CoderResult.UNDERFLOW; - } finally { - src.position(sp - src.arrayOffset()); - dst.position(dp - dst.arrayOffset()); - } - - } - } - -} --- /dev/null 2015-03-25 15:40:21.000000000 -0700 +++ new/jdk/src/java.desktop/unix/classes/sun/font/X11GB2312.java 2015-03-25 15:40:21.000000000 -0700 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 1996, 2005, 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.font; + +import java.nio.CharBuffer; +import java.nio.ByteBuffer; +import java.nio.charset.*; +import sun.nio.cs.*; +import static sun.nio.cs.CharsetMapping.*; + +public class X11GB2312 extends Charset { + public X11GB2312 () { + super("X11GB2312", null); + } + public CharsetEncoder newEncoder() { + return new Encoder(this); + } + public CharsetDecoder newDecoder() { + return new Decoder(this); + } + + public boolean contains(Charset cs) { + return cs instanceof X11GB2312; + } + + private class Encoder extends CharsetEncoder { + private DoubleByte.Encoder enc = (DoubleByte.Encoder)new EUC_CN().newEncoder(); + + public Encoder(Charset cs) { + super(cs, 2.0f, 2.0f); + } + + public boolean canEncode(char c) { + if (c <= 0x7F) { + return false; + } + return enc.canEncode(c); + } + + protected int encodeDouble(char c) { + return enc.encodeChar(c); + } + + protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) { + char[] sa = src.array(); + int sp = src.arrayOffset() + src.position(); + int sl = src.arrayOffset() + src.limit(); + + byte[] da = dst.array(); + int dp = dst.arrayOffset() + dst.position(); + int dl = dst.arrayOffset() + dst.limit(); + + try { + while (sp < sl) { + char c = sa[sp]; + if (c <= '\u007f') + return CoderResult.unmappableForLength(1); + int ncode = encodeDouble(c); + if (ncode != 0 && c != '\u0000' ) { + da[dp++] = (byte) ((ncode >> 8) & 0x7f); + da[dp++] = (byte) (ncode & 0x7f); + sp++; + continue; + } + return CoderResult.unmappableForLength(1); + } + return CoderResult.UNDERFLOW; + } finally { + src.position(sp - src.arrayOffset()); + dst.position(dp - dst.arrayOffset()); + } + } + public boolean isLegalReplacement(byte[] repl) { + return true; + } + } + + private class Decoder extends CharsetDecoder { + private DoubleByte.Decoder dec = (DoubleByte.Decoder)new EUC_CN().newDecoder(); + + public Decoder(Charset cs) { + super(cs, 0.5f, 1.0f); + } + + protected char decodeDouble(int b1, int b2) { + return dec.decodeDouble(b1, b2); + } + + protected CoderResult decodeLoop(ByteBuffer src, CharBuffer dst) { + byte[] sa = src.array(); + int sp = src.arrayOffset() + src.position(); + int sl = src.arrayOffset() + src.limit(); + assert (sp <= sl); + sp = (sp <= sl ? sp : sl); + char[] da = dst.array(); + int dp = dst.arrayOffset() + dst.position(); + int dl = dst.arrayOffset() + dst.limit(); + assert (dp <= dl); + dp = (dp <= dl ? dp : dl); + + try { + while (sp < sl) { + if ( sl - sp < 2) { + return CoderResult.UNDERFLOW; + } + int b1 = sa[sp] & 0xFF | 0x80; + int b2 = sa[sp + 1] & 0xFF | 0x80; + char c = decodeDouble(b1, b2); + if (c == UNMAPPABLE_DECODING) { + return CoderResult.unmappableForLength(2); + } + if (dl - dp < 1) + return CoderResult.OVERFLOW; + da[dp++] = c; + sp +=2; + } + return CoderResult.UNDERFLOW; + } finally { + src.position(sp - src.arrayOffset()); + dst.position(dp - dst.arrayOffset()); + } + + } + } + +}