Index: javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java,v
retrieving revision 1.12
diff -u -r1.12 BasicCheckBoxMenuItemUI.java
--- javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java	21 Oct 2005 19:37:32 -0000	1.12
+++ javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java	1 Nov 2005 15:31:29 -0000
@@ -60,8 +60,6 @@
   public BasicCheckBoxMenuItemUI()
   {
     super();
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    checkIcon = UIManager.getIcon("CheckBoxMenuItem.checkIcon");
   }
   
   /**
@@ -99,6 +97,7 @@
                                 MenuElement[] path,
                                 MenuSelectionManager manager)
   {
+    // TODO: May not be implemented properly.
     item.processMouseEvent(e, path, manager);
   }
 }
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.64
diff -u -r1.64 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java	19 Oct 2005 14:54:55 -0000	1.64
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	1 Nov 2005 15:31:29 -0000
@@ -648,7 +648,6 @@
       "MenuItem.background", new ColorUIResource(light),
       "MenuItem.border", new BasicBorders.MarginBorder(),
       "MenuItem.borderPainted", Boolean.FALSE,
-      "MenuItem.checkIcon", BasicIconFactory.getMenuItemCheckIcon(),
       "MenuItem.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "MenuItem.foreground", new ColorUIResource(darkShadow),
       "MenuItem.margin", new InsetsUIResource(2, 2, 2, 2),
Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.32
diff -u -r1.32 BasicMenuItemUI.java
--- javax/swing/plaf/basic/BasicMenuItemUI.java	25 Oct 2005 13:49:47 -0000	1.32
+++ javax/swing/plaf/basic/BasicMenuItemUI.java	1 Nov 2005 15:31:29 -0000
@@ -398,17 +398,19 @@
    */
   protected void installDefaults()
   {
-    LookAndFeel.installBorder(menuItem, "MenuItem.border");
-    LookAndFeel.installColorsAndFont(menuItem, "MenuItem.background",
-                                     "MenuItem.foreground", "MenuItem.font");
-    menuItem.setMargin(UIManager.getInsets("MenuItem.margin"));
-    acceleratorFont = UIManager.getFont("MenuItem.acceleratorFont");
-    acceleratorForeground = UIManager.getColor("MenuItem.acceleratorForeground");
-    acceleratorSelectionForeground = UIManager.getColor("MenuItem.acceleratorSelectionForeground");
-    selectionBackground = UIManager.getColor("MenuItem.selectionBackground");
-    selectionForeground = UIManager.getColor("MenuItem.selectionForeground");
-    acceleratorDelimiter = UIManager.getString("MenuItem.acceleratorDelimiter");
-
+    String prefix = getPropertyPrefix();
+    LookAndFeel.installBorder(menuItem, prefix + ".border");
+    LookAndFeel.installColorsAndFont(menuItem, prefix + ".background",
+                                     prefix + ".foreground", prefix + ".font");
+    menuItem.setMargin(UIManager.getInsets(prefix + ".margin"));
+    acceleratorFont = UIManager.getFont(prefix + ".acceleratorFont");
+    acceleratorForeground = UIManager.getColor(prefix + ".acceleratorForeground");
+    acceleratorSelectionForeground = UIManager.getColor(prefix + ".acceleratorSelectionForeground");
+    selectionBackground = UIManager.getColor(prefix + ".selectionBackground");
+    selectionForeground = UIManager.getColor(prefix + ".selectionForeground");
+    acceleratorDelimiter = UIManager.getString(prefix + ".acceleratorDelimiter");
+    checkIcon = UIManager.getIcon(prefix + ".checkIcon");
+    
     menuItem.setHorizontalTextPosition(SwingConstants.TRAILING);
     menuItem.setHorizontalAlignment(SwingConstants.LEADING);
     menuItem.setOpaque(true);
Index: javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,v
retrieving revision 1.11
diff -u -r1.11 BasicRadioButtonMenuItemUI.java
--- javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java	21 Oct 2005 19:37:32 -0000	1.11
+++ javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java	1 Nov 2005 15:31:29 -0000
@@ -59,8 +59,6 @@
   public BasicRadioButtonMenuItemUI()
   {
     super();
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    checkIcon = defaults.getIcon("RadioButtonMenuItem.checkIcon");
   }
 
   /**
@@ -98,6 +96,7 @@
                                 MenuElement[] path,
                                 MenuSelectionManager manager)
   {
+    // TODO: May not be implemented properly.
     item.processMouseEvent(e, path, manager);
   }
 }