diff --git a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java index 215cff556a2..ba1aa41a0b3 100644 --- a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java +++ b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java @@ -852,11 +852,6 @@ public abstract class FontConfiguration { return parts; } - protected String[] split(String sequence) { - Vector v = splitSequence(sequence); - return v.toArray(new String[0]); - } - //////////////////////////////////////////////////////////////////////// // Methods for extracting information from the fontconfig data for AWT// //////////////////////////////////////////////////////////////////////// diff --git a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java index 73c61428059..c6fbc1b699b 100644 --- a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java +++ b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java @@ -74,8 +74,7 @@ public class MFontConfiguration extends FontConfiguration { reorderMap.put("UTF-8.zh.TW", "chinese-tw-iso10646"); reorderMap.put("UTF-8.zh.HK", "chinese-tw-iso10646"); reorderMap.put("UTF-8.zh.CN", "chinese-cn-iso10646"); - reorderMap.put("x-euc-jp-linux", - split("japanese-x0201,japanese-x0208")); + reorderMap.put("x-euc-jp-linux", new String[] {"japanese-x0201", "japanese-x0208"}); reorderMap.put("GB2312", "chinese-gb18030"); reorderMap.put("Big5", "chinese-big5"); reorderMap.put("EUC-KR", "korean"); diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java b/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java index c3a5a24e379..c663f8b4807 100644 --- a/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java +++ b/src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java @@ -79,8 +79,7 @@ public final class WFontConfiguration extends FontConfiguration { reorderMap.put("GBK", "chinese-ms936"); reorderMap.put("GB18030", "chinese-gb18030"); reorderMap.put("x-windows-950", "chinese-ms950"); - reorderMap.put("x-MS950-HKSCS", split("chinese-ms950,chinese-hkscs")); -// reorderMap.put("windows-1252", "alphabetic"); + reorderMap.put("x-MS950-HKSCS", new String[] {"chinese-ms950", "chinese-hkscs"}); } @Override