Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 1757:11b38980893c
6870238: Font2DTest fails on Debian after FontManager refactoring
Summary: Use fontManager field instead of querying the FontManagerFactory
Reviewed-by: igor, prr
author | rkennke |
---|---|
date | Wed, 12 Aug 2009 17:21:08 +0200 |
parents | 92607d652d7a |
children | a389af17df10 |
files | src/solaris/classes/sun/font/FcFontConfiguration.java |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/classes/sun/font/FcFontConfiguration.java Fri Aug 07 19:36:28 2009 +0200 +++ b/src/solaris/classes/sun/font/FcFontConfiguration.java Wed Aug 12 17:21:08 2009 +0200 @@ -90,7 +90,7 @@ setFontConfiguration(); readFcInfo(); - X11FontManager fm = X11FontManager.getInstance(); + X11FontManager fm = (X11FontManager) fontManager; FontConfigManager fcm = fm.getFontConfigManager(); if (fcCompFonts == null) { fcCompFonts = fcm.loadFontConfig(); @@ -187,7 +187,7 @@ @Override public String[] getPlatformFontNames() { HashSet<String> nameSet = new HashSet<String>(); - X11FontManager fm = X11FontManager.getInstance(); + X11FontManager fm = (X11FontManager) fontManager; FontConfigManager fcm = fm.getFontConfigManager(); FcCompFont[] fcCompFonts = fcm.loadFontConfig(); for (int i=0; i<fcCompFonts.length; i++) { @@ -228,7 +228,7 @@ @Override public CompositeFontDescriptor[] get2DCompositeFontInfo() { - X11FontManager fm = X11FontManager.getInstance(); + X11FontManager fm = (X11FontManager) fontManager; FontConfigManager fcm = fm.getFontConfigManager(); FcCompFont[] fcCompFonts = fcm.loadFontConfig(); @@ -363,7 +363,7 @@ private void writeFcInfo() { Properties props = new Properties(); props.setProperty("version", fileVersion); - X11FontManager fm = X11FontManager.getInstance(); + X11FontManager fm = (X11FontManager) fontManager; FontConfigManager fcm = fm.getFontConfigManager(); FontConfigInfo fcInfo = fcm.getFontConfigInfo(); props.setProperty("fcversion", Integer.toString(fcInfo.fcVersion)); @@ -424,7 +424,7 @@ return; } Properties props = new Properties(); - X11FontManager fm = X11FontManager.getInstance(); + X11FontManager fm = (X11FontManager) fontManager; FontConfigManager fcm = fm.getFontConfigManager(); try { FileInputStream fis = new FileInputStream(fcFile);