--- old/src/solaris/classes/sun/font/FcFontConfiguration.java	Wed Aug  5 18:17:06 2009
+++ new/src/solaris/classes/sun/font/FcFontConfiguration.java	Wed Aug  5 18:17:05 2009
@@ -41,11 +41,12 @@
 import sun.awt.FontConfiguration;
 import sun.awt.FontDescriptor;
 import sun.awt.SunToolkit;
+import sun.awt.X11FontManager;
 import sun.font.CompositeFontDescriptor;
 import sun.font.FontManager;
-import sun.font.FontManager.FontConfigInfo;
-import sun.font.FontManager.FcCompFont;
-import sun.font.FontManager.FontConfigFont;
+import sun.font.FontConfigManager.FontConfigInfo;
+import sun.font.FontConfigManager.FcCompFont;
+import sun.font.FontConfigManager.FontConfigFont;
 import sun.java2d.SunGraphicsEnvironment;
 
 public class FcFontConfiguration extends FontConfiguration {
@@ -68,16 +69,16 @@
 
     private FcCompFont[] fcCompFonts = null;
 
-    public FcFontConfiguration(SunGraphicsEnvironment environment) {
-        super(environment);
+    public FcFontConfiguration(SunFontManager fm) {
+        super(fm);
         init();
     }
 
     /* This isn't called but is needed to satisfy super-class contract. */
-    public FcFontConfiguration(SunGraphicsEnvironment environment,
+    public FcFontConfiguration(SunFontManager fm,
                                boolean preferLocaleFonts,
                                boolean preferPropFonts) {
-        super(environment, preferLocaleFonts, preferPropFonts);
+        super(fm, preferLocaleFonts, preferPropFonts);
         init();
     }
 
@@ -89,24 +90,26 @@
 
         setFontConfiguration();
         readFcInfo();
+	X11FontManager fm = X11FontManager.getInstance();
+	FontConfigManager fcm = fm.getFontConfigManager();
         if (fcCompFonts == null) {
-            fcCompFonts = FontManager.loadFontConfig();
+            fcCompFonts = fcm.loadFontConfig();
             if (fcCompFonts != null) {
                 try {
                     writeFcInfo();
                 } catch (Exception e) {
-                    if (SunGraphicsEnvironment.debugFonts) {
+                    if (FontUtilities.debugFonts()) {
                         Logger logger =
                             Logger.getLogger("sun.awt.FontConfiguration");
                         logger.warning("Exception writing fcInfo " + e);
                     }
                 }
-            } else if (SunGraphicsEnvironment.debugFonts) {
+            } else if (FontUtilities.debugFonts()) {
                 Logger logger = Logger.getLogger("sun.awt.FontConfiguration");
                 logger.warning("Failed to get info from libfontconfig");
             }
         } else {
-            FontManager.populateFontConfig(fcCompFonts);
+            fcm.populateFontConfig(fcCompFonts);
         }
 
         if (fcCompFonts == null) {
@@ -184,7 +187,9 @@
     @Override
     public String[] getPlatformFontNames() {
         HashSet<String> nameSet = new HashSet<String>();
-        FcCompFont[] fcCompFonts = FontManager.loadFontConfig();
+	X11FontManager fm = X11FontManager.getInstance();
+	FontConfigManager fcm = fm.getFontConfigManager();
+        FcCompFont[] fcCompFonts = fcm.loadFontConfig();
         for (int i=0; i<fcCompFonts.length; i++) {
             for (int j=0; j<fcCompFonts[i].allFonts.length; j++) {
                 nameSet.add(fcCompFonts[i].allFonts[j].fontFile);
@@ -223,7 +228,9 @@
     @Override
     public CompositeFontDescriptor[] get2DCompositeFontInfo() {
 
-        FcCompFont[] fcCompFonts = FontManager.loadFontConfig();
+	X11FontManager fm = X11FontManager.getInstance();
+	FontConfigManager fcm = fm.getFontConfigManager();
+        FcCompFont[] fcCompFonts = fcm.loadFontConfig();
 
         CompositeFontDescriptor[] result =
                 new CompositeFontDescriptor[NUM_FONTS * NUM_STYLES];
@@ -321,7 +328,7 @@
                 osVersion = getVersionString(f);
             }
         } catch (Exception e) {
-            if (SunGraphicsEnvironment.debugFonts) {
+            if (FontUtilities.debugFonts()) {
                 Logger logger = Logger.getLogger("sun.awt.FontConfiguration");
                 logger.warning("Exception identifying Linux distro.");
             }
@@ -356,7 +363,9 @@
     private void writeFcInfo() {
         Properties props = new Properties();
         props.setProperty("version", fileVersion);
-        FontConfigInfo fcInfo = FontManager.getFontConfigInfo();
+	X11FontManager fm = X11FontManager.getInstance();
+	FontConfigManager fcm = fm.getFontConfigManager();
+        FontConfigInfo fcInfo = fcm.getFontConfigInfo();
         props.setProperty("fcversion", Integer.toString(fcInfo.fcVersion));
         if (fcInfo.cacheDirs != null) {
             for (int i=0;i<fcInfo.cacheDirs.length;i++) {
@@ -391,13 +400,13 @@
                       "JDK Font Configuration Generated File: *Do Not Edit*");
             fos.close();
             boolean renamed = tempFile.renameTo(fcInfoFile);
-            if (!renamed && SunGraphicsEnvironment.debugFonts) {
+            if (!renamed && FontUtilities.debugFonts()) {
                 System.out.println("rename failed");
                 Logger logger = Logger.getLogger("sun.awt.FontConfiguration");
                 logger.warning("Failed renaming file to "+ getFcInfoFile());
             }
         } catch (Exception e) {
-            if (SunGraphicsEnvironment.debugFonts) {
+            if (FontUtilities.debugFonts()) {
                 Logger logger = Logger.getLogger("sun.awt.FontConfiguration");
                 logger.warning("IOException writing to "+ getFcInfoFile());
             }
@@ -415,12 +424,14 @@
             return;
         }
         Properties props = new Properties();
+        X11FontManager fm = X11FontManager.getInstance();
+	FontConfigManager fcm = fm.getFontConfigManager();
         try {
             FileInputStream fis = new FileInputStream(fcFile);
             props.load(fis);
             fis.close();
         } catch (IOException e) {
-            if (SunGraphicsEnvironment.debugFonts) {
+            if (FontUtilities.debugFonts()) {
                 Logger logger = Logger.getLogger("sun.awt.FontConfiguration");
                 logger.warning("IOException reading from "+fcFile.toString());
             }
@@ -439,11 +450,11 @@
             try {
                 fcVersion = Integer.parseInt(fcVersionStr);
                 if (fcVersion != 0 &&
-                    fcVersion != FontManager.getFontConfigVersion()) {
+                    fcVersion != fcm.getFontConfigVersion()) {
                     return;
                 }
             } catch (Exception e) {
-                if (SunGraphicsEnvironment.debugFonts) {
+                if (FontUtilities.debugFonts()) {
                     Logger logger =
                         Logger.getLogger("sun.awt.FontConfiguration");
                     logger.warning("Exception parsing version " +
@@ -509,7 +520,7 @@
             }
             fcCompFonts = fci;
         } catch (Throwable t) {
-            if (SunGraphicsEnvironment.debugFonts) {
+            if (FontUtilities.debugFonts()) {
                 Logger logger = Logger.getLogger("sun.awt.FontConfiguration");
                 logger.warning(t.toString());
             }