2005-01-16 Andrew John Hughes <gnu_andrew@member.fsf.org>

        * Merge of November 2004 HEAD patches to generics branch

1 files changed, 15 insertions, 6 deletions

diff --git a/javax/swing/tree/DefaultTreeModel.java b/javax/swing/tree/DefaultTreeModel.java
index d2a879af7..2e34a3522 100644
--- a/javax/swing/tree/DefaultTreeModel.java
+++ b/javax/swing/tree/DefaultTreeModel.java
@@ -175,9 +175,12 @@ public class DefaultTreeModel
    * @param value1 TODO
    * @return Object
    */
-  public Object getChild(Object value0, int value1)
+  public Object getChild(Object node, int idx)
   {
-    return null; // TODO
+    if (node instanceof TreeNode)
+      return ((TreeNode)node).getChildAt(idx);
+    else
+      return null;
   }
 
   /**
@@ -185,9 +188,12 @@ public class DefaultTreeModel
    * @param value0 TODO
    * @return int
    */
-  public int getChildCount(Object value0)
+  public int getChildCount(Object node)
   {
-    return 0; // TODO
+    if (node instanceof TreeNode)
+      return ((TreeNode)node).getChildCount();
+    else
+      return 0;
   }
 
   /**
@@ -195,9 +201,12 @@ public class DefaultTreeModel
    * @param value0 TODO
    * @return boolean
    */
-  public boolean isLeaf(Object value0)
+  public boolean isLeaf(Object node)
   {
-    return false; // TODO
+    if (node instanceof TreeNode)
+      return ((TreeNode)node).isLeaf();
+    else
+      return true;
   }
 
   /**