--- /home/cpdev/src/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java	2005-07-14 05:32:45.000000000 +0000
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	2005-06-30 05:35:18.000000000 +0000
@@ -47,16 +47,15 @@
 import java.util.Enumeration;
 import java.util.ResourceBundle;
 
-import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
 import javax.swing.UIDefaults;
-import javax.swing.border.BevelBorder;
-import javax.swing.border.Border;
 import javax.swing.plaf.BorderUIResource;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.DimensionUIResource;
 import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.IconUIResource;
 import javax.swing.plaf.InsetsUIResource;
 import javax.swing.text.JTextComponent;
 
@@ -70,7 +69,7 @@
   static final long serialVersionUID = -6096995660290287879L;
 
   /**
-   * Creates a new instance of the Basic look and feel.
+   * Constructor BasicLookAndFeel
    */
   public BasicLookAndFeel()
   {
@@ -78,10 +77,8 @@
   }
 
   /**
-   * Creates and returns a new instance of the default resources for this look 
-   * and feel.
-   * 
-   * @return The UI defaults.
+   * getDefaults
+   * @return UIDefaults
    */
   public UIDefaults getDefaults()
   {
@@ -98,10 +95,8 @@
   }
 
   /**
-   * Populates the <code>defaults</code> table with mappings between class IDs 
-   * and fully qualified class names for the UI delegates.
-   * 
-   * @param defaults  the defaults table (<code>null</code> not permitted).
+   * initClassDefaults
+   * @param value0 TODO
    */
   protected void initClassDefaults(UIDefaults defaults)
   {
@@ -117,7 +112,6 @@
       "DesktopIconUI", "javax.swing.plaf.basic.BasicDesktopIconUI",
       "DesktopPaneUI", "javax.swing.plaf.basic.BasicDesktopPaneUI",
       "EditorPaneUI", "javax.swing.plaf.basic.BasicEditorPaneUI",
-      "FileChooserUI", "javax.swing.plaf.basic.BasicFileChooserUI",
       "FormattedTextFieldUI", "javax.swing.plaf.basic.BasicFormattedTextFieldUI",
       "InternalFrameUI", "javax.swing.plaf.basic.BasicInternalFrameUI",
       "LabelUI", "javax.swing.plaf.basic.BasicLabelUI",
@@ -160,9 +154,8 @@
   }
 
   /**
-   * Populates the <code>defaults</code> table with system color defaults.
-   * 
-   * @param defaults  the defaults table (<code>null</code> not permitted).
+   * initSystemColorDefaults
+   * @param defaults TODO
    */
   protected void initSystemColorDefaults(UIDefaults defaults)
   {
@@ -204,14 +197,13 @@
   }
 
   /**
-   * Loads the system colors.  This method is not implemented yet.
-   * 
-   * @param defaults  the defaults table (<code>null</code> not permitted).
-   * @param systemColors TODO
-   * @param useNative TODO
+   * loadSystemColors
+   * @param defaults TODO
+   * @param value1 TODO
+   * @param value2 TODO
    */
-  protected void loadSystemColors(UIDefaults defaults, String[] systemColors,
-                                  boolean useNative)
+  protected void loadSystemColors(UIDefaults defaults, String[] value1,
+                                  boolean value2)
   {
     // TODO
   }
@@ -239,7 +231,7 @@
 
   /**
    * initComponentDefaults
-   * @param defaults  the defaults table (<code>null</code> not permitted).
+   * @param defaults TODO
    */
   protected void initComponentDefaults(UIDefaults defaults)
   {
@@ -254,7 +246,7 @@
 
       "AbstractUndoableEdit.undoText", "Undo",
       "AbstractUndoableEdit.redoText", "Redo",
-      "Button.background", new ColorUIResource(Color.LIGHT_GRAY),
+      "Button.background", new ColorUIResource(light),
       "Button.border",
       new UIDefaults.LazyValue() 
       {
@@ -263,17 +255,17 @@
           return BasicBorders.getButtonBorder();
         }
       },
-      "Button.darkShadow", new ColorUIResource(Color.BLACK),
+      "Button.darkShadow", new ColorUIResource(shadow),
       "Button.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
         "SPACE",  "pressed",
         "released SPACE", "released"
       }),
       "Button.font", new FontUIResource("Dialog", Font.PLAIN, 12),
-      "Button.foreground", new ColorUIResource(Color.BLACK),
-      "Button.highlight", new ColorUIResource(Color.WHITE),
-      "Button.light", new ColorUIResource(Color.LIGHT_GRAY),
+      "Button.foreground", new ColorUIResource(darkShadow),
+      "Button.highlight", new ColorUIResource(highLight),
+      "Button.light", new ColorUIResource(highLight),
       "Button.margin", new InsetsUIResource(2, 2, 2, 2),
-      "Button.shadow", new ColorUIResource(Color.GRAY),
+      "Button.shadow", new ColorUIResource(shadow),
       "Button.textIconGap", new Integer(4),
       "Button.textShiftOffset", new Integer(0),
       "CheckBox.background", new ColorUIResource(light),
@@ -406,20 +398,20 @@
       "FileChooser.cancelButtonText", "Cancel",
       "FileChooser.cancelButtonToolTipText", "Abort file chooser dialog",
       // XXX Don't use gif
-//      "FileChooser.detailsViewIcon", new IconUIResource(new ImageIcon("icons/DetailsView.gif")),
+      "FileChooser.detailsViewIcon", new IconUIResource(new ImageIcon("icons/DetailsView.gif")),
       "FileChooser.directoryDescriptionText", "Directory",
       "FileChooser.fileDescriptionText", "Generic File",
       "FileChooser.helpButtonMnemonic", new Integer(72),
       "FileChooser.helpButtonText", "Help",
       "FileChooser.helpButtonToolTipText", "FileChooser help",
       // XXX Don't use gif
-//      "FileChooser.homeFolderIcon", new IconUIResource(new ImageIcon("icons/HomeFolder.gif")),
+      "FileChooser.homeFolderIcon", new IconUIResource(new ImageIcon("icons/HomeFolder.gif")),
       // XXX Don't use gif
-//      "FileChooser.listViewIcon", new IconUIResource(new ImageIcon("icons/ListView.gif")),
+      "FileChooser.listViewIcon", new IconUIResource(new ImageIcon("icons/ListView.gif")),
       "FileChooser.newFolderErrorSeparator", ":",
       "FileChooser.newFolderErrorText", "Error creating new folder",
       // XXX Don't use gif
-//      "FileChooser.newFolderIcon", new IconUIResource(new ImageIcon("icons/NewFolder.gif")),
+      "FileChooser.newFolderIcon", new IconUIResource(new ImageIcon("icons/NewFolder.gif")),
       "FileChooser.openButtonMnemonic", new Integer(79),
       "FileChooser.openButtonText", "Open",
       "FileChooser.openButtonToolTipText", "Open selected file",
@@ -427,20 +419,20 @@
       "FileChooser.saveButtonText", "Save",
       "FileChooser.saveButtonToolTipText", "Save selected file",
       // XXX Don't use gif
-//      "FileChooser.upFolderIcon", new IconUIResource(new ImageIcon("icons/UpFolder.gif")),
+      "FileChooser.upFolderIcon", new IconUIResource(new ImageIcon("icons/UpFolder.gif")),
       "FileChooser.updateButtonMnemonic", new Integer(85),
       "FileChooser.updateButtonText", "Update",
       "FileChooser.updateButtonToolTipText", "Update directory listing",
       // XXX Don't use gif
-//      "FileView.computerIcon", new IconUIResource(new ImageIcon("icons/Computer.gif")),
+      "FileView.computerIcon", new IconUIResource(new ImageIcon("icons/Computer.gif")),
       // XXX Don't use gif
-//      "FileView.directoryIcon", new IconUIResource(new ImageIcon("icons/Directory.gif")),
+      "FileView.directoryIcon", new IconUIResource(new ImageIcon("icons/Directory.gif")),
       // XXX Don't use gif
-//      "FileView.fileIcon", new IconUIResource(new ImageIcon("icons/File.gif")),
+      "FileView.fileIcon", new IconUIResource(new ImageIcon("icons/File.gif")),
       // XXX Don't use gif
-//      "FileView.floppyDriveIcon", new IconUIResource(new ImageIcon("icons/Floppy.gif")),
+      "FileView.floppyDriveIcon", new IconUIResource(new ImageIcon("icons/Floppy.gif")),
       // XXX Don't use gif
-//      "FileView.hardDriveIcon", new IconUIResource(new ImageIcon("icons/HardDrive.gif")),
+      "FileView.hardDriveIcon", new IconUIResource(new ImageIcon("icons/HardDrive.gif")),
       "FocusManagerClassName", "TODO",
       "FormattedTextField.background", new ColorUIResource(light),
       "FormattedTextField.caretForeground", new ColorUIResource(Color.black),
@@ -456,32 +448,15 @@
       "InternalFrame.activeTitleBackground", new ColorUIResource(0, 0, 128),
       "InternalFrame.activeTitleForeground", new ColorUIResource(Color.white),
       "InternalFrame.border",
-      new UIDefaults.LazyValue()
-      {
-	public Object createValue(UIDefaults table)
-	{
-	  Color lineColor = new Color(238, 238, 238);
-	  Border inner = BorderFactory.createLineBorder(lineColor, 1);
-	  Color shadowInner = new Color(184, 207, 229);
-	  Color shadowOuter = new Color(122, 138, 153);
-	  Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
-							 Color.WHITE,
-							 Color.WHITE,
-							 shadowOuter,
-							 shadowInner);
-	  Border border = new BorderUIResource.CompoundBorderUIResource(outer,
-									inner);
-	  return border;
-	}
-      },
+      new BorderUIResource.CompoundBorderUIResource(null, null),
       "InternalFrame.borderColor", new ColorUIResource(light),
-      "InternalFrame.borderDarkShadow", new ColorUIResource(Color.BLACK),
-      "InternalFrame.borderHighlight", new ColorUIResource(Color.WHITE),
-      "InternalFrame.borderLight", new ColorUIResource(Color.LIGHT_GRAY),
-      "InternalFrame.borderShadow", new ColorUIResource(Color.GRAY),
+      "InternalFrame.borderDarkShadow", new ColorUIResource(shadow),
+      "InternalFrame.borderHighlight", new ColorUIResource(highLight),
+      "InternalFrame.borderLight", new ColorUIResource(light),
+      "InternalFrame.borderShadow", new ColorUIResource(shadow),
       "InternalFrame.closeIcon", BasicIconFactory.createEmptyFrameIcon(),
       // XXX Don't use gif
-//      "InternalFrame.icon", new IconUIResource(new ImageIcon("icons/JavaCup.gif")),
+      "InternalFrame.icon", new IconUIResource(new ImageIcon("icons/JavaCup.gif")),
       "InternalFrame.iconifyIcon", BasicIconFactory.createEmptyFrameIcon(),
       "InternalFrame.inactiveTitleBackground", new ColorUIResource(Color.gray),
       "InternalFrame.inactiveTitleForeground",
@@ -582,13 +557,13 @@
       new BorderUIResource.EmptyBorderUIResource(0, 0, 0, 0),
       "OptionPane.cancelButtonText", "Cancel",
       // XXX Don't use gif
-//      "OptionPane.errorIcon",
-//      new IconUIResource(new ImageIcon("icons/Error.gif")),
+      "OptionPane.errorIcon",
+      new IconUIResource(new ImageIcon("icons/Error.gif")),
       "OptionPane.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "OptionPane.foreground", new ColorUIResource(darkShadow),
       // XXX Don't use gif
-//      "OptionPane.informationIcon",
-//      new IconUIResource(new ImageIcon("icons/Inform.gif")),
+      "OptionPane.informationIcon",
+      new IconUIResource(new ImageIcon("icons/Inform.gif")),
       "OptionPane.messageAreaBorder",
       new BorderUIResource.EmptyBorderUIResource(0, 0, 0, 0),
       "OptionPane.messageForeground", new ColorUIResource(darkShadow),
@@ -596,11 +571,11 @@
       "OptionPane.noButtonText", "No",
       "OptionPane.okButtonText", "OK",
       // XXX Don't use gif
-//      "OptionPane.questionIcon",
-//      new IconUIResource(new ImageIcon("icons/Question.gif")),
+      "OptionPane.questionIcon",
+      new IconUIResource(new ImageIcon("icons/Question.gif")),
       // XXX Don't use gif
-//      "OptionPane.warningIcon",
-//      new IconUIResource(new ImageIcon("icons/Warn.gif")),
+      "OptionPane.warningIcon",
+      new IconUIResource(new ImageIcon("icons/Warn.gif")),
       "OptionPane.windowBindings", new Object[] {
         "ESCAPE",  "close"
       },
@@ -850,8 +825,7 @@
       "Table.focusCellBackground", new ColorUIResource(light),
       "Table.focusCellForeground", new ColorUIResource(darkShadow),
       "Table.focusCellHighlightBorder",
-      new BorderUIResource.LineBorderUIResource(
-                                             new ColorUIResource(255, 255, 0)),
+      new BorderUIResource.LineBorderUIResource(Color.white),
       "Table.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "Table.foreground", new ColorUIResource(darkShadow),
       "Table.gridColor", new ColorUIResource(Color.gray),
@@ -862,8 +836,7 @@
       "TableHeader.cellBorder", new BorderUIResource.BevelBorderUIResource(0),
       "TableHeader.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "TableHeader.foreground", new ColorUIResource(darkShadow),
-
-            "TextArea.background", new ColorUIResource(light),
+      "TextArea.background", new ColorUIResource(light),
       "TextArea.border", new BasicBorders.MarginBorder(),
       "TextArea.caretBlinkRate", new Integer(500),
       "TextArea.caretForeground", new ColorUIResource(Color.black),
@@ -904,11 +877,11 @@
                                                              0),
                                       "notify-field-accept"),
         new JTextComponent.KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT,
-                                 InputEvent.SHIFT_DOWN_MASK),
-                                 "selection-backward"),
+							     InputEvent.SHIFT_DOWN_MASK),
+							     "selection-backward"),
         new JTextComponent.KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT,
-                                 InputEvent.SHIFT_DOWN_MASK),
-                                 "selection-forward"),
+							     InputEvent.SHIFT_DOWN_MASK),
+							     "selection-forward"),
           },
       "TextField.margin", new InsetsUIResource(0, 0, 0, 0),
       "TextField.selectionBackground", new ColorUIResource(Color.black),
@@ -988,8 +961,8 @@
       }),
       "Tree.background", new ColorUIResource(light),
       "Tree.changeSelectionWithFocus", Boolean.TRUE,
-//      "Tree.closedIcon", new IconUIResource(new ImageIcon("icons/TreeClosed.png")),
-//      "Tree.collapsedIcon", new IconUIResource(new ImageIcon("icons/TreeCollapsed.png")),
+      "Tree.closedIcon", new IconUIResource(new ImageIcon("icons/TreeClosed.png")),
+      "Tree.collapsedIcon", new IconUIResource(new ImageIcon("icons/TreeCollapsed.png")),
       "Tree.drawsFocusBorderAroundIcon", Boolean.FALSE,
       "Tree.editorBorder", new BorderUIResource.LineBorderUIResource(Color.lightGray),
       "Tree.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
@@ -1036,18 +1009,20 @@
         "PAGE_UP",  "scrollUpChangeSelection",
         "ctrl PAGE_DOWN", "scrollDownChangeLead"
       }),
-      "Tree.font", new FontUIResource(new Font("Helvetica", Font.PLAIN, 12)),
+      "Tree.font", new FontUIResource("Dialog", Font.PLAIN, 12),
+      "Tree.expandedIcon", new IconUIResource(new ImageIcon("icons/TreeExpanded.png")),
       "Tree.foreground", new ColorUIResource(Color.black),
-      "Tree.hash", new ColorUIResource(new Color(128, 128, 128)),
+      "Tree.hash", new ColorUIResource(Color.gray),
+      "Tree.leafIcon", new IconUIResource(new ImageIcon("icons/TreeLeaf.png")),
       "Tree.leftChildIndent", new Integer(7),
+      "Tree.openIcon", new IconUIResource(new ImageIcon("icons/TreeOpen.png")),
       "Tree.rightChildIndent", new Integer(13),
-      "Tree.rowHeight", new Integer(20), // FIXME
+      "Tree.rowHeight", new Integer(16),
       "Tree.scrollsOnExpand", Boolean.TRUE,
       "Tree.selectionBackground", new ColorUIResource(Color.black),
-      "Tree.nonSelectionBackground", new ColorUIResource(new Color(239, 235, 231)),
       "Tree.selectionBorderColor", new ColorUIResource(Color.black),
-      "Tree.selectionForeground", new ColorUIResource(new Color(255, 255, 255)),
-      "Tree.textBackground", new ColorUIResource(new Color(255, 255, 255)),
+      "Tree.selectionForeground", new ColorUIResource(Color.white),
+      "Tree.textBackground", new ColorUIResource(Color.white),
       "Tree.textForeground", new ColorUIResource(Color.black),
       "Viewport.background", new ColorUIResource(light),
       "Viewport.foreground", new ColorUIResource(Color.black),
