# HG changeset patch # User alexsch # Date 1362584546 -14400 # Node ID cdc681a6afd70cda95913b758c3abc182a1ce131 # Parent e5287fba4c74750eb7ec4dea4346a23335055250 6877495: JTextField and JTextArea does not support supplementary characters Reviewed-by: serb, alexp diff -r e5287fba4c74 -r cdc681a6afd7 jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Fri Mar 01 21:50:00 2013 +0400 +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Wed Mar 06 19:42:26 2013 +0400 @@ -1873,7 +1873,7 @@ */ public class ReencodingInputStream extends InputStream { protected BufferedReader wrapped; - protected final char[] in = new char[1]; + protected final char[] in = new char[2]; protected byte[] out; protected CharsetEncoder encoder; @@ -1926,7 +1926,7 @@ try { encoder = Charset.forName(targetEncoding).newEncoder(); - out = new byte[(int)(encoder.maxBytesPerChar() + 0.5)]; + out = new byte[(int)(encoder.maxBytesPerChar() * 2 + 0.5)]; inBuf = CharBuffer.wrap(in); outBuf = ByteBuffer.wrap(out); } catch (IllegalCharsetNameException e) { @@ -1950,31 +1950,50 @@ } } + private int readChar() throws IOException { + int c = wrapped.read(); + + if (c == -1) { // -1 is EOS + eos = true; + return -1; + } + + // "c == 0" is not quite correct, but good enough on Windows. + if (numTerminators > 0 && c == 0) { + eos = true; + return -1; + } else if (eoln != null && matchCharArray(eoln, c)) { + c = '\n' & 0xFFFF; + } + + return c; + } + public int read() throws IOException { if (eos) { return -1; } if (index >= limit) { - int c = wrapped.read(); - - if (c == -1) { // -1 is EOS - eos = true; + // deal with supplementary characters + int c = readChar(); + if (c == -1) { return -1; } - // "c == 0" is not quite correct, but good enough on Windows. - if (numTerminators > 0 && c == 0) { - eos = true; - return -1; - } else if (eoln != null && matchCharArray(eoln, c)) { - c = '\n' & 0xFFFF; + in[0] = (char) c; + in[1] = 0; + inBuf.limit(1); + if (Character.isHighSurrogate((char) c)) { + c = readChar(); + if (c != -1) { + in[1] = (char) c; + inBuf.limit(2); + } } - in[0] = (char)c; - inBuf.rewind(); - outBuf.rewind(); + outBuf.limit(out.length).rewind(); encoder.encode(inBuf, outBuf, false); outBuf.flip(); limit = outBuf.limit(); diff -r e5287fba4c74 -r cdc681a6afd7 jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java Wed Mar 06 19:42:26 2013 +0400 @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2013, 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. + * + * 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. + */ + +/* @test + @bug 6877495 + @summary JTextField and JTextArea does not support supplementary characters + @author Alexander Scherbatiy + @run main SuplementaryCharactersTransferTest +*/ + + +import java.io.*; +import java.util.*; +import java.awt.*; +import java.awt.datatransfer.*; +import sun.awt.datatransfer.*; +import sun.awt.datatransfer.DataTransferer.ReencodingInputStream; + +public class SuplementaryCharactersTransferTest { + + public static final long TEXT_FORMAT = 13; + + public static void main(String[] args) throws Exception { + + DataTransferer dataTransferer = new TestDataTransferer(); + dataTransferer.registerTextFlavorProperties("UNICODE TEXT", "utf-16le", "\r\n", "2"); + ByteTransferable transferable = new ByteTransferable(); + ReencodingInputStream is = dataTransferer.new ReencodingInputStream(transferable.getByteInputStream(), TEXT_FORMAT, + DataTransferer.getTextCharset(transferable.getDataFlavor()), transferable); + + byte[] bytes = transferable.getBytes(); + byte[] result = new byte[bytes.length]; + + is.read(result); + + for (int i = 0; i < bytes.length; i++) { + if (bytes[i] != result[i]) { + throw new RuntimeException("Characters are not equal!"); + } + } + + } + + static class ByteTransferable implements Transferable, ClipboardOwner { + + private final DataFlavor dataFlavor; + + public ByteTransferable() throws Exception { + dataFlavor = DataFlavor.getTextPlainUnicodeFlavor(); + } + + public DataFlavor getDataFlavor() { + return dataFlavor; + } + + public DataFlavor[] getTransferDataFlavors() { + return new DataFlavor[]{dataFlavor}; + } + + public boolean isDataFlavorSupported(DataFlavor flavor) { + return flavor.equals(dataFlavor); + } + + public byte[] getBytes() { + return new byte[]{97, 0, 64, -40, 32, -36, 98, 0}; + } + + public InputStream getByteInputStream() { + return new ByteArrayInputStream(getBytes()); + } + + public Object getTransferData(DataFlavor flavor) + throws UnsupportedFlavorException, IOException { + if (flavor.equals(dataFlavor)) { + return getByteInputStream(); + } else { + throw new UnsupportedFlavorException(flavor); + } + } + + public void lostOwnership(Clipboard clipboard, Transferable contents) { + } + } + + static class TestDataTransferer extends DataTransferer { + + @Override + public String getDefaultUnicodeEncoding() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public boolean isLocaleDependentTextFormat(long format) { + return false; + } + + @Override + public boolean isFileFormat(long format) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public boolean isImageFormat(long format) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + protected Long getFormatForNativeAsLong(String str) { + return TEXT_FORMAT; + } + + @Override + protected String getNativeForFormat(long format) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + protected ByteArrayOutputStream convertFileListToBytes( + ArrayList fileList) throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + protected String[] dragQueryFile(byte[] bytes) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + protected Image platformImageBytesOrStreamToImage(InputStream str, + byte[] bytes, long format) throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + protected byte[] imageToPlatformBytes(Image image, long format) + throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public ToolkitThreadBlockedHandler getToolkitThreadBlockedHandler() { + throw new UnsupportedOperationException("Not supported yet."); + } + } +} \ No newline at end of file