src/share/classes/sun/font/Type1Font.java

rev 1379 : [mq]: fontmanager.patch

*** 633,643 ****
          return psName;
      }
  
      protected synchronized FontScaler getScaler() {
          if (scaler == null) {
!             scaler = FontManager.getScaler(this, 0, false, fileSize);
          }
  
          return scaler;
      }
  
--- 633,643 ----
          return psName;
      }
  
      protected synchronized FontScaler getScaler() {
          if (scaler == null) {
!             scaler = FontScaler.getScaler(this, 0, false, fileSize);
          }
  
          return scaler;
      }
  
*** 650,683 ****
  
      public int getNumGlyphs() {
          try {
              return getScaler().getNumGlyphs();
          } catch (FontScalerException e) {
!             scaler = FontManager.getNullScaler();
              return getNumGlyphs();
          }
      }
  
      public int getMissingGlyphCode() {
          try {
              return getScaler().getMissingGlyphCode();
          } catch (FontScalerException e) {
!             scaler = FontManager.getNullScaler();
              return getMissingGlyphCode();
          }
      }
  
      public int getGlyphCode(char charCode) {
          try {
              return getScaler().getGlyphCode(charCode);
          } catch (FontScalerException e) {
!             scaler = FontManager.getNullScaler();
              return getGlyphCode(charCode);
          }
      }
  
      public String toString() {
          return "** Type1 Font: Family="+familyName+ " Name="+fullName+
              " style="+style+" fileName="+platName;
      }
- 
  }
--- 650,682 ----
  
      public int getNumGlyphs() {
          try {
              return getScaler().getNumGlyphs();
          } catch (FontScalerException e) {
!             scaler = FontScaler.getNullScaler();
              return getNumGlyphs();
          }
      }
  
      public int getMissingGlyphCode() {
          try {
              return getScaler().getMissingGlyphCode();
          } catch (FontScalerException e) {
!             scaler = FontScaler.getNullScaler();
              return getMissingGlyphCode();
          }
      }
  
      public int getGlyphCode(char charCode) {
          try {
              return getScaler().getGlyphCode(charCode);
          } catch (FontScalerException e) {
!             scaler = FontScaler.getNullScaler();
              return getGlyphCode(charCode);
          }
      }
  
      public String toString() {
          return "** Type1 Font: Family="+familyName+ " Name="+fullName+
              " style="+style+" fileName="+platName;
      }
  }