Index: javax/swing/JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.52
diff -u -r1.52 JTree.java
--- javax/swing/JTree.java	14 Nov 2005 20:40:41 -0000	1.52
+++ javax/swing/JTree.java	4 Jan 2006 16:57:44 -0000
@@ -1481,6 +1481,7 @@
     setRootVisible(true);
     setModel(model);
     setSelectionModel(new EmptySelectionModel());
+    selectionModel.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
   }
 
   /**
Index: javax/swing/plaf/basic/BasicFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,v
retrieving revision 1.22
diff -u -r1.22 BasicFileChooserUI.java
--- javax/swing/plaf/basic/BasicFileChooserUI.java	3 Jan 2006 20:06:29 -0000	1.22
+++ javax/swing/plaf/basic/BasicFileChooserUI.java	4 Jan 2006 16:57:44 -0000
@@ -669,7 +669,7 @@
   JButton accept;
 
   /** An optional accessory panel. */
-  JPanel accessoryPanel;
+  JPanel accessoryPanel = new JPanel();
 
   /** A property change listener. */
   PropertyChangeListener propertyChangeListener;
Index: javax/swing/plaf/metal/MetalFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java,v
retrieving revision 1.16
diff -u -r1.16 MetalFileChooserUI.java
--- javax/swing/plaf/metal/MetalFileChooserUI.java	3 Jan 2006 16:47:42 -0000	1.16
+++ javax/swing/plaf/metal/MetalFileChooserUI.java	4 Jan 2006 16:57:45 -0000
@@ -1350,6 +1350,7 @@
     buttonPanel.add(cancelButton);
     bottomPanel.add(buttonPanel);
     fc.add(bottomPanel, BorderLayout.SOUTH);
+    fc.add(getAccessoryPanel(), BorderLayout.EAST);
   }
   
   /**
@@ -1509,7 +1510,6 @@
       {
         fileList.setModel(getModel());
         fileListPanel.removeAll();
-        scrollPane.setViewport(new JViewport());
         scrollPane.getViewport().setView(fileList);
       }
     fileListPanel.add(scrollPane);
@@ -1579,7 +1579,6 @@
     while (rc > size)
       mod.removeRow(--rc);
 
-    scrollPane.setViewport(new JViewport());
     scrollPane.getViewport().setView(fileTable);
     scrollPane.setColumnHeaderView(fileTable.getTableHeader());
     scrollPane.getViewport().setScrollMode(JViewport.BACKINGSTORE_SCROLL_MODE);