提交 ed62d159 编写于 作者: P prr

6983037: closed/java/awt/font/FontNames/Type1Fonts.java failed due to missed font

Reviewed-by: igor
上级 6aaa1651
...@@ -2221,7 +2221,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { ...@@ -2221,7 +2221,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
return FontUtilities.getFont2D(font).supportsEncoding(encoding); return FontUtilities.getFont2D(font).supportsEncoding(encoding);
} }
public abstract String getFontPath(boolean noType1Fonts); protected abstract String getFontPath(boolean noType1Fonts);
private Thread fileCloser = null; private Thread fileCloser = null;
Vector<File> tmpFontFiles = null; Vector<File> tmpFontFiles = null;
...@@ -2935,7 +2935,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { ...@@ -2935,7 +2935,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
} }
protected String[] getPlatformFontDirs(boolean noType1Fonts) { protected String[] getPlatformFontDirs(boolean noType1Fonts) {
String path = getFontPath(true); String path = getPlatformFontPath(noType1Fonts);
StringTokenizer parser = StringTokenizer parser =
new StringTokenizer(path, File.pathSeparator); new StringTokenizer(path, File.pathSeparator);
ArrayList<String> pathList = new ArrayList<String>(); ArrayList<String> pathList = new ArrayList<String>();
...@@ -3047,7 +3047,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { ...@@ -3047,7 +3047,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
/* A call to this method should be followed by a call to /* A call to this method should be followed by a call to
* registerFontDirs(..) * registerFontDirs(..)
*/ */
protected String getPlatformFontPath(boolean noType1Font) { public String getPlatformFontPath(boolean noType1Font) {
if (fontPath == null) { if (fontPath == null) {
fontPath = getFontPath(noType1Font); fontPath = getFontPath(noType1Font);
} }
......
...@@ -763,7 +763,7 @@ public class X11FontManager extends SunFontManager { ...@@ -763,7 +763,7 @@ public class X11FontManager extends SunFontManager {
public synchronized native String getFontPathNative(boolean noType1Fonts); 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. isHeadless(); // make sure GE is inited, as its the X11 lock.
return getFontPathNative(noType1Fonts); return getFontPathNative(noType1Fonts);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册