2005-10-12 Roman Kennke <kennke@aicas.com>

	* javax/swing/plaf/basic/BasicButtonUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
	(installDefaults): Use UIManager.get* methods instead of
	UIManager.getDefaults().get* methods.
	* javax/swing/plaf/basic/BasicColorChooserUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicComboBoxUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicDesktopPaneUI.java
	(installDefaults): Only install background color, if installed
	color is null or an UIResource instance.
	* javax/swing/plaf/basic/BasicInternalFrameUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicLabelUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicListUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicLookAndFeel.java
	(initComponentDefaults): Added default for List.font.
	* javax/swing/plaf/basic/BasicMenuBarUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicMenuItemUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicMenuUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicOptionPaneUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicPanelUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicPopupMenuUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicProgressBarUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicScrollBarUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicScrollPaneUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicSeparatorUI.java
	(installDefaults): Use UIManager.get* methods instead of
	UIManager.getDefaults().get* methods.
	* javax/swing/plaf/basic/BasicSliderUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicSpinnerUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicSplitPaneUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicTableHeaderUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicTableUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicTextUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
	(installDefaults): Use UIManager.get* methods instead of
	UIManager.getDefaults().get* methods.
	* javax/swing/plaf/basic/BasicToolBarUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicToolTipUI.java
	(installDefaults): Use new LookAndFeel install* methods.
	* javax/swing/plaf/basic/BasicTreeUI.java
	(installDefaults): Use new LookAndFeel install* methods. Use
	UIManager.get* methods instead of UIManager.getDefaults().get*
	methods.
	* javax/swing/plaf/basic/BasicViewportUI.java
	(installDefaults): Use new LookAndFeel install* methods.

1 files changed, 9 insertions, 11 deletions

diff --git a/javax/swing/plaf/basic/BasicOptionPaneUI.java b/javax/swing/plaf/basic/BasicOptionPaneUI.java
index b65706b50..b7bfbf5d0 100644
--- a/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -70,8 +70,8 @@ import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.LookAndFeel;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
@@ -1156,19 +1156,17 @@ public class BasicOptionPaneUI extends OptionPaneUI
    */
   protected void installDefaults()
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-
-    optionPane.setFont(defaults.getFont("OptionPane.font"));
-    optionPane.setBackground(defaults.getColor("OptionPane.background"));
-    optionPane.setForeground(defaults.getColor("OptionPane.foreground"));
-    optionPane.setBorder(defaults.getBorder("OptionPane.border"));
+    LookAndFeel.installColorsAndFont(optionPane, "OptionPane.background",
+                                     "OptionPane.foreground",
+                                     "OptionPane.font");
+    LookAndFeel.installBorder(optionPane, "OptionPane.border");
     optionPane.setOpaque(true);
 
-    messageBorder = defaults.getBorder("OptionPane.messageAreaBorder");
-    messageForeground = defaults.getColor("OptionPane.messageForeground");
-    buttonBorder = defaults.getBorder("OptionPane.buttonAreaBorder");
+    messageBorder = UIManager.getBorder("OptionPane.messageAreaBorder");
+    messageForeground = UIManager.getColor("OptionPane.messageForeground");
+    buttonBorder = UIManager.getBorder("OptionPane.buttonAreaBorder");
 
-    minimumSize = defaults.getDimension("OptionPane.minimumSize");
+    minimumSize = UIManager.getDimension("OptionPane.minimumSize");
 
     // FIXME: Image icons don't seem to work properly right now.
     // Once they do, replace the synthetic icons with these ones.