src/share/classes/javax/swing/text/StyleContext.java

rev 1379 : [mq]: fontmanager.patch

@@ -33,11 +33,11 @@
 import javax.swing.event.EventListenerList;
 import javax.swing.event.ChangeEvent;
 import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
 
-import sun.font.FontManager;
+import sun.font.FontUtilities;
 
 /**
  * A pool of styles and their associated resources.  This class determines
  * the lifetime of a group of resources by being a container that holds
  * caches for various resources such as font and color that get reused

@@ -261,12 +261,12 @@
                 }
             }
             if (f == null) {
                 f = new Font(family, style, size);
             }
-            if (! FontManager.fontSupportsDefaultEncoding(f)) {
-                f = FontManager.getCompositeFontUIResource(f);
+            if (! FontUtilities.fontSupportsDefaultEncoding(f)) {
+                f = FontUtilities.getCompositeFontUIResource(f);
             }
             FontKey key = new FontKey(family, style, size);
             fontTable.put(key, f);
         }
         return f;