OpenJDK / jdk7 / jdk7 / jdk
changeset 3355:e58e9e32399a
6983037: closed/java/awt/font/FontNames/Type1Fonts.java failed due to missed font
Reviewed-by: igor
| author | prr |
|---|---|
| date | Wed, 19 Jan 2011 17:02:52 -0800 |
| parents | 00cc1c09c6dd |
| children | fe1b5c15afab |
| files | src/share/classes/sun/font/SunFontManager.java src/solaris/classes/sun/awt/X11FontManager.java |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/font/SunFontManager.java Wed Jan 19 09:22:40 2011 -0800 +++ b/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/src/solaris/classes/sun/awt/X11FontManager.java Wed Jan 19 09:22:40 2011 -0800 +++ b/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); }