2006-08-09 Sven de Marothy <sven@physto.se>

	* javax/swing/JTree.java
	(JTree): Default SelectionModel should be DefaultTreeSelectionModel.
	(setSelectionModel): Null parameter should create an EmptySelectionM.

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 02efaeca6..a3ee34352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-09  Sven de Marothy  <sven@physto.se>
+
+	* javax/swing/JTree.java
+	(JTree): Default SelectionModel should be DefaultTreeSelectionModel.
+	(setSelectionModel): Null parameter should create an EmptySelectionM.
+
 2006-08-09  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/text/AbstractDocument.java
diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java
index fa898c5a9..b71c44e1f 100644
--- a/javax/swing/JTree.java
+++ b/javax/swing/JTree.java
@@ -1509,8 +1509,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   public JTree(TreeModel model)
   {
     setRootVisible(true);
-    setSelectionModel(new EmptySelectionModel());
-    selectionModel.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+    setSelectionModel( new DefaultTreeSelectionModel() );
     
     // The root node appears expanded by default.
     nodeStates = new Hashtable();
@@ -2050,14 +2049,16 @@ public class JTree extends JComponent implements Scrollable, Accessible
     if (selectionModel == model)
       return;
 
+    if( model == null )
+      model = EmptySelectionModel.sharedInstance();
+
     if (selectionModel != null)
       selectionModel.removeTreeSelectionListener(selectionRedirector);
 
     TreeSelectionModel oldValue = selectionModel;
     selectionModel = model;
 
-    if (selectionModel != null)
-      selectionModel.addTreeSelectionListener(selectionRedirector);
+    selectionModel.addTreeSelectionListener(selectionRedirector);
 
     firePropertyChange(SELECTION_MODEL_PROPERTY, oldValue, model);
     revalidate();