2006-01-03 Lillian Angel <langel@redhat.com>

        * javax/swing/plaf/basic/BasicFileChooserUI.java
        (installStrings): Fixed installation of defaults that
        were changed in BasicLookAndFeel.
        * javax/swing/plaf/basic/BasicTabbedPaneUI.java
        (installDefaults): Fixed installation of defaults that
        were changed in BasicLookAndFeel.

3 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d2d1a194..aae9dba44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-01-03  Lillian Angel  <langel@redhat.com>
 
+	* javax/swing/plaf/basic/BasicFileChooserUI.java
+	(installStrings): Fixed installation of defaults that
+	were changed in BasicLookAndFeel.
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(installDefaults): Fixed installation of defaults that
+	were changed in BasicLookAndFeel.
+
+2006-01-03  Lillian Angel  <langel@redhat.com>
+
 	* javax/swing/plaf/basic/BasicLookAndFeel.java
 	(initComponentDefaults): Fixed several defaults that differed
 	from the JDK.
diff --git a/javax/swing/plaf/basic/BasicFileChooserUI.java b/javax/swing/plaf/basic/BasicFileChooserUI.java
index d82c28277..60ec8d8c5 100644
--- a/javax/swing/plaf/basic/BasicFileChooserUI.java
+++ b/javax/swing/plaf/basic/BasicFileChooserUI.java
@@ -949,28 +949,28 @@ public class BasicFileChooserUI extends FileChooserUI
     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();
   }
 
   /**
diff --git a/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 1ee041097..a8f52cef6 100644
--- a/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -1549,9 +1549,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     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();