diff --git a/jdk/src/share/classes/sun/font/SunFontManager.java b/jdk/src/share/classes/sun/font/SunFontManager.java index 1ea53c1c204..7bd2864db91 100644 --- a/jdk/src/share/classes/sun/font/SunFontManager.java +++ b/jdk/src/share/classes/sun/font/SunFontManager.java @@ -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 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 pathList = new ArrayList(); @@ -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); } diff --git a/jdk/src/solaris/classes/sun/awt/X11FontManager.java b/jdk/src/solaris/classes/sun/awt/X11FontManager.java index 36eeb15d607..573d250acba 100644 --- a/jdk/src/solaris/classes/sun/awt/X11FontManager.java +++ b/jdk/src/solaris/classes/sun/awt/X11FontManager.java @@ -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); }