Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.67
diff -u -r1.67 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java	14 Nov 2005 12:37:07 -0000	1.67
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	15 Nov 2005 21:31:00 -0000
@@ -1159,7 +1159,7 @@
       "Tree.hash", new ColorUIResource(new Color(128, 128, 128)),
       "Tree.leftChildIndent", new Integer(7),
       "Tree.rightChildIndent", new Integer(13),
-      "Tree.rowHeight", new Integer(16),
+      "Tree.rowHeight", new Integer(0),
       "Tree.scrollsOnExpand", Boolean.TRUE,
       "Tree.selectionBackground", new ColorUIResource(Color.black),
       "Tree.nonSelectionBackground", new ColorUIResource(new Color(255, 255, 255)),
Index: javax/swing/plaf/basic/BasicTreeUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v
retrieving revision 1.112
diff -u -r1.112 BasicTreeUI.java
--- javax/swing/plaf/basic/BasicTreeUI.java	15 Nov 2005 20:32:47 -0000	1.112
+++ javax/swing/plaf/basic/BasicTreeUI.java	15 Nov 2005 21:31:00 -0000
@@ -243,6 +243,9 @@
   
   /** The gap between the icon and text. */
   int gap = 4;
+  
+  /** Default row height, if none was set. */
+  int rowHeight = 20;
 
   /** Listeners */
   private PropertyChangeListener propertyChangeListener;
@@ -433,6 +436,8 @@
    */
   protected void setRowHeight(int rowHeight)
   {
+    if (rowHeight == 0)
+      rowHeight = this.rowHeight;
     treeState.setRowHeight(rowHeight);
   }
 
@@ -1222,7 +1227,7 @@
     rightChildIndent = UIManager.getInt("Tree.rightChildIndent");
     leftChildIndent = UIManager.getInt("Tree.leftChildIndent");
     setRowHeight(UIManager.getInt("Tree.rowHeight"));
-    tree.setRowHeight(UIManager.getInt("Tree.rowHeight"));
+    tree.setRowHeight(getRowHeight());
     tree.requestFocusInWindow(false);
     tree.setScrollsOnExpand(UIManager.getBoolean("Tree.scrollsOnExpand"));
     setExpandedIcon(UIManager.getIcon("Tree.expandedIcon"));
@@ -3649,7 +3654,7 @@
                                              boolean isLeaf)
   {
     Object node = path.getLastPathComponent();
-    return (!isLeaf && getLevel(node) != 0);
+    return (!isLeaf && getLevel(node) != 0 && hasControlIcons());
   }
   
   /**
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.68
diff -u -r1.68 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java	24 Oct 2005 20:30:54 -0000	1.68
+++ javax/swing/plaf/metal/MetalLookAndFeel.java	15 Nov 2005 21:31:00 -0000
@@ -1162,7 +1162,7 @@
       "Tree.line", getPrimaryControl(),
       "Tree.openIcon", MetalIconFactory.getTreeFolderIcon(),
       "Tree.rightChildIndent", new Integer(13),
-      "Tree.rowHeight", new Integer(20),
+      "Tree.rowHeight", new Integer(0),
       "Tree.scrollsOnExpand", Boolean.TRUE,
       "Tree.selectionBackground", getTextHighlightColor(),
       "Tree.selectionBorder", new BorderUIResource.LineBorderUIResource(new Color(102, 102, 153)),