DataNode, DataTree fixes

diff --git a/ui/DataNode.java b/ui/DataNode.java
index 2d3ac267842325333484b68886998471981d8135..b4dbe7bb04130bf69e4e67ca12ea330b812544ef 100644 (file)
--- a/ui/DataNode.java
+++ b/ui/DataNode.java
@@ -78,8 +78,14 @@ public class DataNode<T> {
                return userData;
        }
 
-       protected int count() {
-               int s = 0;
+       /**
+        * The total number of nodes present in this {@link DataNode} (including
+        * itself and descendants).
+        * 
+        * @return the number
+        */
+       public int count() {
+               int s = 1;
                for (DataNode<T> child : children) {
                        s += child.count();
                }

diff --git a/ui/DataTree.java b/ui/DataTree.java
index e941a71d2ac00a238c0c6fd6a67932b7f08ca080..108476eadfc2a4384bc1724a2a0c64ddcbe7fe3f 100644 (file)
--- a/ui/DataTree.java
+++ b/ui/DataTree.java
@@ -65,24 +65,4 @@ public abstract class DataTree<E> {
 
                return new DataNode<E>(children, source.getUserData());
        }
-
-       // TODO: not in this class:
-
-       public void loadInto(DefaultMutableTreeNode root, String filter) {
-               DataNode<E> filtered = getRoot(filter);
-               for (DataNode<E> child : filtered.getChildren()) {
-                       root.add(nodeToNode(child));
-               }
-       }
-
-       private MutableTreeNode nodeToNode(DataNode<E> node) {
-               // TODO: node.toString
-               DefaultMutableTreeNode otherNode = new DefaultMutableTreeNode(
-                               node.toString());
-               for (DataNode<E> child : node.getChildren()) {
-                       otherNode.add(nodeToNode(child));
-               }
-
-               return otherNode;
-       }
 }