src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java

@@ -125,19 +125,19 @@
             v.paint(g, paintTextR);
             accelBL = BasicHTML.getHTMLBaseline(v, paintTextR.width,
                                                   paintTextR.height);
         } else {
             g.setFont(font);
-            SwingUtilities2.drawString(tip, g, tipText, paintTextR.x,
+            getTextUIDrawing().drawString(tip, g, tipText, paintTextR.x,
                                   paintTextR.y + metrics.getAscent());
             accelBL = metrics.getAscent();
         }
 
         if (!accelString.equals("")) {
             g.setFont(smallFont);
             g.setColor( MetalLookAndFeel.getPrimaryControlDarkShadow() );
-            SwingUtilities2.drawString(tip, g, accelString,
+            getTextUIDrawing().drawString(tip, g, accelString,
                                        tip.getWidth() - 1 - insets.right
                                            - accelSpacing
                                            + padSpaceBetweenStrings
                                            - 3,
                                        paintTextR.y + accelBL);

@@ -146,11 +146,11 @@
 
     private int calcAccelSpacing(JComponent c, FontMetrics fm, String accel) {
         return accel.equals("")
                ? 0
                : padSpaceBetweenStrings +
-                 SwingUtilities2.stringWidth(c, fm, accel);
+                 getTextUIDrawing().getStringWidth(c, fm, accel);
     }
 
     public Dimension getPreferredSize(JComponent c) {
         Dimension d = super.getPreferredSize(c);