Index: javax/swing/plaf/basic/BasicFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,v
retrieving revision 1.11
diff -u -r1.11 BasicFileChooserUI.java
--- javax/swing/plaf/basic/BasicFileChooserUI.java	14 Sep 2005 16:52:08 -0000	1.11
+++ javax/swing/plaf/basic/BasicFileChooserUI.java	15 Sep 2005 17:49:22 -0000
@@ -44,6 +44,7 @@
 import java.awt.Graphics;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Point;
 import java.awt.Polygon;
 import java.awt.Window;
@@ -945,7 +946,7 @@
   File currDir = null;
 
   JPanel bottomPanel;
-
+  
   /** DOCUMENT ME! */
   JPanel closePanel;
 
@@ -997,46 +998,6 @@
     }
   }
 
-  /**
-   * DOCUMENT ME!
-   */
-  public class CBLabelRenderer extends JLabel implements ListCellRenderer
-  {
-    /**
-     * Creates a new CBLabelRenderer object.
-     */
-    public CBLabelRenderer()
-    {
-      super();
-      setOpaque(true);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param list DOCUMENT ME!
-     * @param value DOCUMENT ME!
-     * @param index DOCUMENT ME!
-     * @param isSelected DOCUMENT ME!
-     * @param cellHasFocus DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Component getListCellRendererComponent(JList list, Object value,
-                                                  int index,
-                                                  boolean isSelected,
-                                                  boolean cellHasFocus)
-    {
-      setHorizontalAlignment(SwingConstants.LEFT);
-      setIcon(directoryIcon);
-      setText(value.toString());
-      setForeground(Color.BLACK);
-      setBackground(Color.WHITE);
-
-      return this;
-    }
-  }
-
   void closeDialog()
   {
     Window owner = SwingUtilities.windowForComponent(filechooser);
@@ -1210,7 +1171,7 @@
     JLabel look = new JLabel("Look In:");
 
     parents = new JComboBox();
-    parents.setRenderer(new CBLabelRenderer());
+    parents.setRenderer(new BasicComboBoxRenderer());
     boxEntries();
     look.setLabelFor(parents);
     JPanel parentsPanel = new JPanel();
@@ -1242,9 +1203,9 @@
     buttonPanel.add(detailsViewButton);
 
     JPanel topPanel = new JPanel();
-    topPanel.setLayout(new java.awt.FlowLayout());
+    parentsPanel.add(buttonPanel);
+    topPanel.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 0, 0));
     topPanel.add(parentsPanel);
-    topPanel.add(buttonPanel);
 
     accessoryPanel = new JPanel();
     if (filechooser.getAccessory() != null)