6983037: closed/java/awt/font/FontNames/Type1Fonts.java failed due to missed font
Reviewed-by: igor
--- a/jdk/src/share/classes/sun/font/SunFontManager.java Wed Jan 19 09:22:40 2011 -0800
+++ b/jdk/src/share/classes/sun/font/SunFontManager.java Wed Jan 19 17:02:52 2011 -0800
@@ -2221,7 +2221,7 @@
return FontUtilities.getFont2D(font).supportsEncoding(encoding);
}
- public abstract String getFontPath(boolean noType1Fonts);
+ protected abstract String getFontPath(boolean noType1Fonts);
private Thread fileCloser = null;
Vector<File> tmpFontFiles = null;
@@ -2935,7 +2935,7 @@
}
protected String[] getPlatformFontDirs(boolean noType1Fonts) {
- String path = getFontPath(true);
+ String path = getPlatformFontPath(noType1Fonts);
StringTokenizer parser =
new StringTokenizer(path, File.pathSeparator);
ArrayList<String> pathList = new ArrayList<String>();
@@ -3047,7 +3047,7 @@
/* A call to this method should be followed by a call to
* registerFontDirs(..)
*/
- protected String getPlatformFontPath(boolean noType1Font) {
+ public String getPlatformFontPath(boolean noType1Font) {
if (fontPath == null) {
fontPath = getFontPath(noType1Font);
}
--- a/jdk/src/solaris/classes/sun/awt/X11FontManager.java Wed Jan 19 09:22:40 2011 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11FontManager.java Wed Jan 19 17:02:52 2011 -0800
@@ -763,7 +763,7 @@
public synchronized native String getFontPathNative(boolean noType1Fonts);
- public synchronized String getFontPath(boolean noType1Fonts) {
+ protected synchronized String getFontPath(boolean noType1Fonts) {
isHeadless(); // make sure GE is inited, as its the X11 lock.
return getFontPathNative(noType1Fonts);
}