--- a/jdk/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java Tue Mar 03 10:39:40 2015 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java Wed Mar 04 15:42:02 2015 +0100
@@ -39,10 +39,10 @@
import java.util.HashSet;
import java.util.Properties;
import java.util.Scanner;
+import sun.awt.FcFontManager;
import sun.awt.FontConfiguration;
import sun.awt.FontDescriptor;
import sun.awt.SunToolkit;
-import sun.awt.X11FontManager;
import sun.font.CompositeFontDescriptor;
import sun.font.FontManager;
import sun.font.FontConfigManager.FontConfigInfo;
@@ -92,7 +92,7 @@
setFontConfiguration();
readFcInfo();
- X11FontManager fm = (X11FontManager) fontManager;
+ FcFontManager fm = (FcFontManager) fontManager;
FontConfigManager fcm = fm.getFontConfigManager();
if (fcCompFonts == null) {
fcCompFonts = fcm.loadFontConfig();
@@ -194,7 +194,7 @@
@Override
public String[] getPlatformFontNames() {
HashSet<String> nameSet = new HashSet<String>();
- X11FontManager fm = (X11FontManager) fontManager;
+ FcFontManager fm = (FcFontManager) fontManager;
FontConfigManager fcm = fm.getFontConfigManager();
FcCompFont[] fcCompFonts = fcm.loadFontConfig();
for (int i=0; i<fcCompFonts.length; i++) {
@@ -235,7 +235,7 @@
@Override
public CompositeFontDescriptor[] get2DCompositeFontInfo() {
- X11FontManager fm = (X11FontManager) fontManager;
+ FcFontManager fm = (FcFontManager) fontManager;
FontConfigManager fcm = fm.getFontConfigManager();
FcCompFont[] fcCompFonts = fcm.loadFontConfig();
@@ -368,7 +368,7 @@
private void writeFcInfo() {
Properties props = new Properties();
props.setProperty("version", fileVersion);
- X11FontManager fm = (X11FontManager) fontManager;
+ FcFontManager fm = (FcFontManager) fontManager;
FontConfigManager fcm = fm.getFontConfigManager();
FontConfigInfo fcInfo = fcm.getFontConfigInfo();
props.setProperty("fcversion", Integer.toString(fcInfo.fcVersion));
@@ -427,7 +427,7 @@
return;
}
Properties props = new Properties();
- X11FontManager fm = (X11FontManager) fontManager;
+ FcFontManager fm = (FcFontManager) fontManager;
FontConfigManager fcm = fm.getFontConfigManager();
try {
FileInputStream fis = new FileInputStream(fcFile);