8165680: [macosx] Enhance handling of UTF-8 characters in CDataTransfer.java

Reviewed-by: serb, aniyogi
This commit is contained in:
Manajit Halder 2016-11-11 13:58:42 +05:30 committed by Manajit Halder
parent d666bc1ccf
commit a41bc73423

View File

@ -38,6 +38,7 @@ import java.text.Normalizer.Form;
import java.util.*; import java.util.*;
import java.util.regex.*; import java.util.regex.*;
import java.awt.datatransfer.*; import java.awt.datatransfer.*;
import java.nio.charset.StandardCharsets;
import sun.awt.datatransfer.*; import sun.awt.datatransfer.*;
public class CDataTransferer extends DataTransferer { public class CDataTransferer extends DataTransferer {
@ -132,7 +133,7 @@ public class CDataTransferer extends DataTransferer {
String charset = Charset.defaultCharset().name(); String charset = Charset.defaultCharset().name();
if (transferable != null && transferable.isDataFlavorSupported(javaTextEncodingFlavor)) { if (transferable != null && transferable.isDataFlavorSupported(javaTextEncodingFlavor)) {
try { try {
charset = new String((byte[]) transferable.getTransferData(javaTextEncodingFlavor), "UTF-8"); charset = new String((byte[]) transferable.getTransferData(javaTextEncodingFlavor), StandardCharsets.UTF_8);
} catch (UnsupportedFlavorException cannotHappen) { } catch (UnsupportedFlavorException cannotHappen) {
} }
} }