Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.5143
diff -u -r1.5143 ChangeLog
--- ChangeLog	6 Oct 2005 20:52:33 -0000	1.5143
+++ ChangeLog	6 Oct 2005 22:16:55 -0000
@@ -1,3 +1,9 @@
+2005-10-07  Jan Roehrich  <address@hidden>
+
+	* javax/swing/JTree.java: (JTree):
+	* javax/swing/plaf/basic/BasicTreeUI.java: (updateRenderer):
+	moved setting of TreeCellRenderer from JTree to BasicTreeUI.
+
 2005-10-06  Anthony Balkissoon  <address@hidden>
 
 	* javax/swing/text/PlainView.java:
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.44
diff -u -r1.44 JTree.java
--- javax/swing/JTree.java	6 Oct 2005 19:26:30 -0000	1.44
+++ javax/swing/JTree.java	6 Oct 2005 22:17:15 -0000
@@ -1479,9 +1479,8 @@
   {
     updateUI();
     setRootVisible(true);
-    setSelectionModel(EmptySelectionModel.sharedInstance());
-    setCellRenderer(new DefaultTreeCellRenderer());
     setModel(model);
+    setSelectionModel(EmptySelectionModel.sharedInstance());
   }
 
   /**
Index: javax/swing/plaf/basic/BasicTreeUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v
retrieving revision 1.88
diff -u -r1.88 BasicTreeUI.java
--- javax/swing/plaf/basic/BasicTreeUI.java	6 Oct 2005 19:26:30 -0000	1.88
+++ javax/swing/plaf/basic/BasicTreeUI.java	6 Oct 2005 22:17:23 -0000
@@ -1126,7 +1126,14 @@
   protected void updateRenderer()
   {
     if (tree != null)
-      tree.setCellRenderer(currentCellRenderer);
+      {
+        if(tree.getCellRenderer() == null)
+          {  
+            if(currentCellRenderer == null) 
+              currentCellRenderer = createDefaultCellRenderer();                
+            tree.setCellRenderer(currentCellRenderer);
+          }
+      }
   }
 
   /**