src/java.desktop/share/classes/sun/font/FontScaler.java

*** 94,110 ****
          boolean.class, int.class};
  
          try {
              @SuppressWarnings("unchecked")
              Class<? extends FontScaler> tmp = (Class<? extends FontScaler>)
!                 (!FontUtilities.useT2K ?
                   Class.forName("sun.font.FreetypeFontScaler") :
                   Class.forName("sun.font.T2KFontScaler"));
              scalerClass = tmp;
          } catch (ClassNotFoundException e) {
                  scalerClass = NullFontScaler.class;
          }
  
          //NB: rewrite using factory? constructor is ugly way
          try {
              scalerConstructor = scalerClass.getConstructor(arglst);
          } catch (NoSuchMethodException e) {
--- 94,121 ----
          boolean.class, int.class};
  
          try {
              @SuppressWarnings("unchecked")
              Class<? extends FontScaler> tmp = (Class<? extends FontScaler>)
!                 ((!FontUtilities.useT2K && !FontUtilities.useLegacy) ?
                   Class.forName("sun.font.FreetypeFontScaler") :
                   Class.forName("sun.font.T2KFontScaler"));
              scalerClass = tmp;
          } catch (ClassNotFoundException e) {
+             try {
+                 @SuppressWarnings("unchecked")
+                 Class<? extends FontScaler> tmp = (Class<? extends FontScaler>)
+                     Class.forName("sun.font.FreetypeFontScaler");
+                 scalerClass = tmp;
+             } catch (ClassNotFoundException e1) {
                  scalerClass = NullFontScaler.class;
              }
+         } finally {
+             if (FontUtilities.debugFonts()) {
+                 System.out.println("Scaler class="+scalerClass);
+             }
+         }
  
          //NB: rewrite using factory? constructor is ugly way
          try {
              scalerConstructor = scalerClass.getConstructor(arglst);
          } catch (NoSuchMethodException e) {