src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java

*** 23,32 ****
--- 23,33 ----
   * questions.
   */
  
  package javax.swing.plaf.basic;
  
+ import javax.swing.plaf.TextUIDrawing;
  import java.awt.*;
  import java.awt.event.*;
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
  
*** 146,155 ****
--- 147,157 ----
      public static ComponentUI createUI(JComponent c) {
          return new BasicMenuItemUI();
      }
  
      public void installUI(JComponent c) {
+         super.installUI(c);
          menuItem = (JMenuItem) c;
  
          installDefaults();
          installComponents(menuItem);
          installListeners();
*** 672,691 ****
              g.setFont(lh.getAccFontMetrics().getFont());
              if (!model.isEnabled()) {
                  // *** paint the accText disabled
                  if (disabledForeground != null) {
                      g.setColor(disabledForeground);
!                     SwingUtilities2.drawString(lh.getMenuItem(), g,
                          lh.getAccText(), lr.getAccRect().x,
                          lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
                  } else {
                      g.setColor(lh.getMenuItem().getBackground().brighter());
!                     SwingUtilities2.drawString(lh.getMenuItem(), g,
                          lh.getAccText(), lr.getAccRect().x,
                          lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
                      g.setColor(lh.getMenuItem().getBackground().darker());
!                     SwingUtilities2.drawString(lh.getMenuItem(), g,
                          lh.getAccText(), lr.getAccRect().x - 1,
                          lr.getAccRect().y + lh.getFontMetrics().getAscent() - 1);
                  }
              } else {
                  // *** paint the accText normally
--- 674,693 ----
              g.setFont(lh.getAccFontMetrics().getFont());
              if (!model.isEnabled()) {
                  // *** paint the accText disabled
                  if (disabledForeground != null) {
                      g.setColor(disabledForeground);
!                     getTextUIDrawing().drawString(lh.getMenuItem(), g,
                          lh.getAccText(), lr.getAccRect().x,
                          lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
                  } else {
                      g.setColor(lh.getMenuItem().getBackground().brighter());
!                     getTextUIDrawing().drawString(lh.getMenuItem(), g,
                          lh.getAccText(), lr.getAccRect().x,
                          lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
                      g.setColor(lh.getMenuItem().getBackground().darker());
!                     getTextUIDrawing().drawString(lh.getMenuItem(), g,
                          lh.getAccText(), lr.getAccRect().x - 1,
                          lr.getAccRect().y + lh.getFontMetrics().getAscent() - 1);
                  }
              } else {
                  // *** paint the accText normally
*** 694,704 ****
                          && model.isSelected())) {
                      g.setColor(acceleratorSelectionForeground);
                  } else {
                      g.setColor(acceleratorForeground);
                  }
!                 SwingUtilities2.drawString(lh.getMenuItem(), g, lh.getAccText(),
                          lr.getAccRect().x, lr.getAccRect().y +
                          lh.getAccFontMetrics().getAscent());
              }
          }
      }
--- 696,706 ----
                          && model.isSelected())) {
                      g.setColor(acceleratorSelectionForeground);
                  } else {
                      g.setColor(acceleratorForeground);
                  }
!                 getTextUIDrawing().drawString(lh.getMenuItem(), g, lh.getAccText(),
                          lr.getAccRect().x, lr.getAccRect().y +
                          lh.getAccFontMetrics().getAscent());
              }
          }
      }
*** 789,815 ****
  
          if(!model.isEnabled()) {
              // *** paint the text disabled
              if ( UIManager.get("MenuItem.disabledForeground") instanceof Color ) {
                  g.setColor( UIManager.getColor("MenuItem.disabledForeground") );
!                 SwingUtilities2.drawStringUnderlineCharAt(menuItem, g,text,
                            mnemIndex, textRect.x,  textRect.y + fm.getAscent());
              } else {
                  g.setColor(menuItem.getBackground().brighter());
!                 SwingUtilities2.drawStringUnderlineCharAt(menuItem, g, text,
                             mnemIndex, textRect.x, textRect.y + fm.getAscent());
                  g.setColor(menuItem.getBackground().darker());
!                 SwingUtilities2.drawStringUnderlineCharAt(menuItem, g,text,
                             mnemIndex,  textRect.x - 1, textRect.y +
                             fm.getAscent() - 1);
              }
          } else {
              // *** paint the text normally
              if (model.isArmed()|| (menuItem instanceof JMenu && model.isSelected())) {
                  g.setColor(selectionForeground); // Uses protected field.
              }
!             SwingUtilities2.drawStringUnderlineCharAt(menuItem, g,text,
                             mnemIndex, textRect.x, textRect.y + fm.getAscent());
          }
      }
  
      /**
--- 791,817 ----
  
          if(!model.isEnabled()) {
              // *** paint the text disabled
              if ( UIManager.get("MenuItem.disabledForeground") instanceof Color ) {
                  g.setColor( UIManager.getColor("MenuItem.disabledForeground") );
!                 getTextUIDrawing().drawStringUnderlineCharAt(menuItem, g,text,
                            mnemIndex, textRect.x,  textRect.y + fm.getAscent());
              } else {
                  g.setColor(menuItem.getBackground().brighter());
!                 getTextUIDrawing().drawStringUnderlineCharAt(menuItem, g, text,
                             mnemIndex, textRect.x, textRect.y + fm.getAscent());
                  g.setColor(menuItem.getBackground().darker());
!                 getTextUIDrawing().drawStringUnderlineCharAt(menuItem, g,text,
                             mnemIndex,  textRect.x - 1, textRect.y +
                             fm.getAscent() - 1);
              }
          } else {
              // *** paint the text normally
              if (model.isArmed()|| (menuItem instanceof JMenu && model.isSelected())) {
                  g.setColor(selectionForeground); // Uses protected field.
              }
!             getTextUIDrawing().drawStringUnderlineCharAt(menuItem, g,text,
                             mnemIndex, textRect.x, textRect.y + fm.getAscent());
          }
      }
  
      /**