--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java	2016-01-25 00:13:21.000000000 +0400
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java	2016-01-25 00:13:20.000000000 +0400
@@ -827,11 +827,11 @@
 
         if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
             g2.setColor(getSelectionBackground());
-            SwingUtilities2.drawString(progressBar, g2, progressString,
+            getTextUIDrawing().drawString(progressBar, g2, progressString,
                                        renderLocation.x, renderLocation.y);
             g2.setColor(getSelectionForeground());
             g2.clipRect(fillStart, y, amountFull, height);
-            SwingUtilities2.drawString(progressBar, g2, progressString,
+            getTextUIDrawing().drawString(progressBar, g2, progressString,
                                        renderLocation.x, renderLocation.y);
         } else { // VERTICAL
             g2.setColor(getSelectionBackground());
@@ -840,11 +840,11 @@
             g2.setFont(progressBar.getFont().deriveFont(rotate));
             renderLocation = getStringPlacement(g2, progressString,
                                                   x, y, width, height);
-            SwingUtilities2.drawString(progressBar, g2, progressString,
+            getTextUIDrawing().drawString(progressBar, g2, progressString,
                                        renderLocation.x, renderLocation.y);
             g2.setColor(getSelectionForeground());
             g2.clipRect(x, fillStart, width, amountFull);
-            SwingUtilities2.drawString(progressBar, g2, progressString,
+            getTextUIDrawing().drawString(progressBar, g2, progressString,
                                        renderLocation.x, renderLocation.y);
         }
         g2.setClip(oldClip);
@@ -870,7 +870,7 @@
                                        int x,int y,int width,int height) {
         FontMetrics fontSizer = SwingUtilities2.getFontMetrics(progressBar, g,
                                             progressBar.getFont());
-        int stringWidth = SwingUtilities2.stringWidth(progressBar, fontSizer,
+        int stringWidth = getTextUIDrawing().getStringWidth(progressBar, fontSizer,
                                                       progressString);
 
         if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
@@ -899,7 +899,7 @@
             if (progressBar.isStringPainted()) {
                 // I'm doing this for completeness.
                 String progString = progressBar.getString();
-                int stringWidth = SwingUtilities2.stringWidth(
+                int stringWidth = getTextUIDrawing().getStringWidth(
                           progressBar, fontSizer, progString);
                 if (stringWidth > size.width) {
                     size.width = stringWidth;
@@ -926,7 +926,7 @@
                     size.width = stringHeight;
                 }
                 // This is also for completeness.
-                int stringWidth = SwingUtilities2.stringWidth(
+                int stringWidth = getTextUIDrawing().getStringWidth(
                                        progressBar, fontSizer, progString);
                 if (stringWidth > size.height) {
                     size.height = stringWidth;