Index: javax/swing/plaf/basic/BasicFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,v
retrieving revision 1.21
diff -u -r1.21 BasicFileChooserUI.java
--- javax/swing/plaf/basic/BasicFileChooserUI.java	30 Nov 2005 19:42:40 -0000	1.21
+++ javax/swing/plaf/basic/BasicFileChooserUI.java	3 Jan 2006 20:03:44 -0000
@@ -949,28 +949,28 @@
     acceptAllFileFilterText = defaults.getString("FileChooser.acceptAllFileFilterText");
     cancelButtonText = "Cancel";
     cancelButtonToolTipText = "Abort file chooser dialog";
-    cancelButtonMnemonic = defaults.getInt("FileChooser.cancelButtonMnemonic");
+    cancelButtonMnemonic = new Integer((String) UIManager.get("FileChooser.cancelButtonMnemonic")).intValue();
 
     directoryOpenButtonText = "Open";
     directoryOpenButtonToolTipText = "Open selected directory";
     directoryOpenButtonMnemonic 
-        = defaults.getInt("FileChooser.directoryOpenButtonMnemonic");
+        = new Integer((String) UIManager.get("FileChooser.directoryOpenButtonMnemonic")).intValue();
     
     helpButtonText = "Help";
     helpButtonToolTipText = "FileChooser help";
-    helpButtonMnemonic = defaults.getInt("FileChooser.helpButtonMnemonic");
+    helpButtonMnemonic = new Integer((String) UIManager.get("FileChooser.helpButtonMnemonic")).intValue();
 
     openButtonText = "Open";
     openButtonToolTipText = "Open selected file";
-    openButtonMnemonic = defaults.getInt("FileChooser.openButtonMnemonic");
+    openButtonMnemonic = new Integer((String) UIManager.get("FileChooser.openButtonMnemonic")).intValue();
 
     saveButtonText = "Save";
     saveButtonToolTipText = "Save selected file";
-    saveButtonMnemonic = UIManager.getInt("FileChooser.saveButtonMnemonic");
+    saveButtonMnemonic = new Integer((String) UIManager.get("FileChooser.saveButtonMnemonic")).intValue();
   
     updateButtonText = "Update";
     updateButtonToolTipText = "Update directory listing";
-    updateButtonMnemonic = defaults.getInt("FileChooser.updateButtonMnemonic");
+    updateButtonMnemonic = new Integer((String) UIManager.get("FileChooser.updateButtonMnemonic")).intValue();
   }
 
   /**
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.31
diff -u -r1.31 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	25 Nov 2005 14:00:04 -0000	1.31
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	3 Jan 2006 20:03:45 -0000
@@ -1549,9 +1549,9 @@
     textIconGap = UIManager.getInt("TabbedPane.textIconGap");
     tabRunOverlay = UIManager.getInt("TabbedPane.tabRunOverlay");
 
-    tabInsets = UIManager.getInsets("TabbedPane.tabbedPaneTabInsets");
+    tabInsets = UIManager.getInsets("TabbedPane.tabInsets");
     selectedTabPadInsets = UIManager.getInsets("TabbedPane.tabbedPaneTabPadInsets");
-    tabAreaInsets = UIManager.getInsets("TabbedPane.tabbedPaneTabAreaInsets");
+    tabAreaInsets = UIManager.getInsets("TabbedPane.tabAreaInsets");
     contentBorderInsets = UIManager.getInsets("TabbedPane.tabbedPaneContentBorderInsets");
 
     calcRect = new Rectangle();