--- old/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java	Wed Aug  5 18:13:30 2009
+++ new/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java	Wed Aug  5 18:13:28 2009
@@ -63,7 +63,7 @@
 import sun.awt.SunToolkit;
 import sun.awt.OSInfo;
 import sun.awt.shell.ShellFolder;
-import sun.font.FontManager;
+import sun.font.FontUtilities;
 import sun.security.action.GetPropertyAction;
 
 import sun.swing.DefaultLayoutStyle;
@@ -2347,13 +2347,14 @@
                                                   font.getStyle(), size);
                     }
                 }
-                if (FontManager.fontSupportsDefaultEncoding(font)) {
+                
+                if (FontUtilities.fontSupportsDefaultEncoding(font)) {
                     if (!(font instanceof UIResource)) {
                         font = new FontUIResource(font);
                     }
                 }
                 else {
-                    font = FontManager.getCompositeFontUIResource(font);
+                    font = FontUtilities.getCompositeFontUIResource(font);
                 }
                 return font;