From: Niki Roo <niki@nikiroo.be>
Date: Sat, 25 Apr 2020 23:23:11 +0000 (+0200)
Subject: DataNode, DataTree fixes
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=2da37d38f809da144338309b478f3b2e3287e4f8;p=fanfix-swing.git

DataNode, DataTree fixes
---

diff --git a/ui/DataNode.java b/ui/DataNode.java
index 2d3ac267..b4dbe7bb 100644
--- 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 e941a71d..108476ea 100644
--- 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;
-	}
 }