--- old/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java	2016-01-25 00:13:07.000000000 +0400
+++ new/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java	2016-01-25 00:13:07.000000000 +0400
@@ -78,7 +78,7 @@
         }
 
         g.setColor(l.getForeground());
-        SwingUtilities2.drawStringUnderlineCharAt(l, g, s, mnemonicIndex,
+        getTextUIDrawing().drawStringUnderlineCharAt(l, g, s, mnemonicIndex,
                                                      textX, textY);
     }
 
@@ -92,20 +92,20 @@
         if ( UIManager.getColor("Label.disabledForeground") instanceof Color &&
              UIManager.getColor("Label.disabledShadow") instanceof Color) {
             g.setColor( UIManager.getColor("Label.disabledShadow") );
-            SwingUtilities2.drawStringUnderlineCharAt(l, g, s,
+            getTextUIDrawing().drawStringUnderlineCharAt(l, g, s,
                                                          mnemonicIndex,
                                                          textX + 1, textY + 1);
             g.setColor( UIManager.getColor("Label.disabledForeground") );
-            SwingUtilities2.drawStringUnderlineCharAt(l, g, s,
+            getTextUIDrawing().drawStringUnderlineCharAt(l, g, s,
                                                          mnemonicIndex,
                                                          textX, textY);
         } else {
             Color background = l.getBackground();
             g.setColor(background.brighter());
-            SwingUtilities2.drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
+            getTextUIDrawing().drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
                                                          textX + 1, textY + 1);
             g.setColor(background.darker());
-            SwingUtilities2.drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
+            getTextUIDrawing().drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
                                                          textX, textY);
         }
     }