infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 21:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: igor
This commit is contained in:
Phil Race 2011-01-19 17:02:52 -08:00
parent 347b9111fb
commit 3be956cf8b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/sun/font/SunFontManager.java
View File

@ -2221,7 +2221,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
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 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
}
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 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
/* 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);
}

2
jdk/src/solaris/classes/sun/awt/X11FontManager.java
View File

@ -763,7 +763,7 @@ public class X11FontManager extends SunFontManager {
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);
}