src/solaris/classes/sun/font/NativeStrike.java

rev 1379 : [mq]: fontmanager.patch

@@ -110,15 +110,16 @@
          int ptSize = getNativePointSize();
          byte [] nameBytes = nativeFont.getPlatformNameBytes(ptSize);
          double scale = Math.abs(desc.devTx.getScaleX());
          pScalerContext = createScalerContext(nameBytes, ptSize, scale);
          if (pScalerContext == 0L) {
-             FontManager.deRegisterBadFont(nativeFont);
+             SunFontManager.getInstance().deRegisterBadFont(nativeFont);
              pScalerContext = createNullScalerContext();
              numGlyphs = 0;
-             if (FontManager.logging) {
-                 FontManager.logger.severe("Could not create native strike " +
+             if (FontUtilities.isLogging()) {
+                 FontUtilities.getLogger()
+                                   .severe("Could not create native strike " +
                                            new String(nameBytes));
              }
              return;
          }
          numGlyphs = nativeFont.getMapper().getNumGlyphs();

@@ -132,11 +133,11 @@
       * This may be restructured later when there's more room for changes
       */
      private boolean usingIntGlyphImages() {
          if (intGlyphImages != null) {
             return true;
-        } else if (FontManager.longAddresses) {
+        } else if (longAddresses) {
             return false;
         } else {
             /* We could obtain minGlyphIndex and index relative to that
              * if we need to save space.
              */

@@ -151,11 +152,11 @@
             return true;
         }
      }
 
      private long[] getLongGlyphImages() {
-        if (longGlyphImages == null && FontManager.longAddresses) {
+        if (longGlyphImages == null && longAddresses) {
 
             /* We could obtain minGlyphIndex and index relative to that
              * if we need to save space.
              */
             int glyphLenArray = getMaxGlyph(pScalerContext);