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

*** 70,79 ****
--- 70,81 ----
       */
      protected Color disabledTextColor;
  
      private static final Object METAL_BUTTON_UI_KEY = new Object();
  
+     private TextUIDrawing textUIDrawing;
+ 
      // ********************************
      //          Create PLAF
      // ********************************
  
      /**
*** 96,109 ****
--- 98,116 ----
      // ********************************
      //          Install
      // ********************************
      public void installDefaults(AbstractButton b) {
          super.installDefaults(b);
+         textUIDrawing = SwingUtilities2.getTextUIDrawing(textUIDrawing);
      }
  
      public void uninstallDefaults(AbstractButton b) {
          super.uninstallDefaults(b);
+         if (textUIDrawing != SwingUtilities2.DEFAULT_UI_TEXT_DRAWING
+                 && textUIDrawing instanceof UIResource) {
+             textUIDrawing = SwingUtilities2.DEFAULT_UI_TEXT_DRAWING;
+         }
      }
  
      // ********************************
      //         Create Listeners
      // ********************************
*** 235,243 ****
          }
          else {
              /*** paint the text disabled ***/
              g.setColor(getDisabledTextColor());
          }
!         SwingUtilities2.drawStringUnderlineCharAt(c, g,text,mnemIndex,
                                    textRect.x, textRect.y + fm.getAscent());
      }
  }
--- 242,250 ----
          }
          else {
              /*** paint the text disabled ***/
              g.setColor(getDisabledTextColor());
          }
!         textUIDrawing.drawStringUnderlineCharAt(c, g,text,mnemIndex,
                                    textRect.x, textRect.y + fm.getAscent());
      }
  }