* javax/swing/plaf/basic/BasicTreeUI.java

       (updateCurrentVisiblePath): Check whether treeModel is null.

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4252f754a..ba4cf3703 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-10-30  Mark Wielaard  <mark@klomp.org>
 
+	* javax/swing/plaf/basic/BasicTreeUI.java
+	(updateCurrentVisiblePath): Check whether treeModel is null.
+
+2005-10-30  Mark Wielaard  <mark@klomp.org>
+
 	* examples/gnu/classpath/examples/swing/Demo.java (static): Set look
 	and feel before showing dialog. Clean up message text.
 
diff --git a/javax/swing/plaf/basic/BasicTreeUI.java b/javax/swing/plaf/basic/BasicTreeUI.java
index a7b7209b1..4f4646c8a 100644
--- a/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/javax/swing/plaf/basic/BasicTreeUI.java
@@ -3797,6 +3797,9 @@ public class BasicTreeUI extends TreeUI
    */
   void updateCurrentVisiblePath()
   {
+    if (treeModel == null)
+      return;
+
     Object next = treeModel.getRoot();
     Rectangle bounds = getCellBounds(0, 0, next);