--- old/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java	2016-01-25 00:13:02.000000000 +0400
+++ new/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java	2016-01-25 00:13:01.000000000 +0400
@@ -113,13 +113,15 @@
         }
 
         if (justification == CENTER) {
-            drawWidth = SwingUtilities2.stringWidth(c, fontMetrics, aString);
+            drawWidth = SwingUtilities2.getTextUIDrawing(c)
+                    .getStringWidth(c, fontMetrics, aString);
             if (drawWidth > width) {
                 drawWidth = width;
             }
             startX = x + (width - drawWidth) / 2;
         } else if (justification == RIGHT) {
-            drawWidth = SwingUtilities2.stringWidth(c, fontMetrics, aString);
+            drawWidth = SwingUtilities2.getTextUIDrawing(c)
+                    .getStringWidth(c, fontMetrics, aString);
             if (drawWidth > width) {
                 drawWidth = width;
             }
@@ -135,7 +137,8 @@
 
         startY = y + height - delta - fontMetrics.getDescent();
 
-        SwingUtilities2.drawString(c, g, aString, startX, startY);
+        SwingUtilities2.getTextUIDrawing(c)
+                .drawString(c, g, aString, startX, startY);
     }
 
   /**
@@ -254,11 +257,12 @@
                 if(!model.isEnabled()) {
                     // *** paint the text disabled
                     g.setColor(b.getBackground().brighter());
-                    SwingUtilities2.drawStringUnderlineCharAt(b, g,text,
+                    SwingUtilities2.getTextUIDrawing(c).drawStringUnderlineCharAt(b, g,text,
                         mnemIndex,
                         textRect.x, textRect.y + fmAccel.getAscent());
                     g.setColor(b.getBackground().darker());
-                    SwingUtilities2.drawStringUnderlineCharAt(b, g,text,
+                    SwingUtilities2.getTextUIDrawing(c).
+                            drawStringUnderlineCharAt(b, g,text,
                         mnemIndex,
                         textRect.x - 1, textRect.y + fmAccel.getAscent() - 1);
 
@@ -269,7 +273,8 @@
                     } else {
                         g.setColor(b.getForeground());
                     }
-                    SwingUtilities2.drawStringUnderlineCharAt(b, g,text,
+                    SwingUtilities2.getTextUIDrawing(c)
+                            .drawStringUnderlineCharAt(b, g,text,
                                                   mnemIndex,
                                                   textRect.x,
                                                   textRect.y + fm.getAscent());
@@ -297,10 +302,10 @@
             if(!model.isEnabled()) {
                 // *** paint the acceleratorText disabled
                 g.setColor(b.getBackground().brighter());
-                SwingUtilities2.drawString(c, g,acceleratorText,
+                SwingUtilities2.getTextUIDrawing(c).drawString(c, g,acceleratorText,
                                               acceleratorRect.x - accOffset, acceleratorRect.y + fm.getAscent());
                 g.setColor(b.getBackground().darker());
-                SwingUtilities2.drawString(c, g,acceleratorText,
+                SwingUtilities2.getTextUIDrawing(c).drawString(c, g,acceleratorText,
                                               acceleratorRect.x - accOffset - 1, acceleratorRect.y + fm.getAscent() - 1);
             } else {
                 // *** paint the acceleratorText normally
@@ -310,7 +315,7 @@
                     } else {
                         g.setColor(b.getForeground());
                     }
-                SwingUtilities2.drawString(c, g,acceleratorText,
+                SwingUtilities2.getTextUIDrawing(c).drawString(c, g,acceleratorText,
                                               acceleratorRect.x - accOffset,
                                               acceleratorRect.y + fmAccel.getAscent());
             }
@@ -383,7 +388,8 @@
         }
         else {
             acceleratorR.width
-                = SwingUtilities2.stringWidth(c, fmAccel, acceleratorText);
+                = SwingUtilities2.getTextUIDrawing(c)
+                        .getStringWidth(c, fmAccel, acceleratorText);
             acceleratorR.height = fmAccel.getHeight();
         }