Reorganized tree packages.

This is in preparation for addition of a non-searching binary tree.

4 files changed, 17 insertions, 10 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/ITreePart.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITreePart.java
index dfcfedd..24e68d4 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/ITreePart.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITreePart.java
@@ -1,10 +1,12 @@
-package bjc.utils.funcdata.bst;
+package bjc.utils.funcdata;
 
 import java.util.Comparator;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import bjc.utils.funcdata.bst.DirectedWalkFunction;
+
 /**
  * A interface for the fundamental things that want to be part of a tree.
  * 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java
index 7665797..3f65481 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java
@@ -6,7 +6,8 @@ import java.util.List;
 import java.util.function.Predicate;
 
 import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.bst.ITreePart.TreeLinearizationMethod;
+import bjc.utils.funcdata.ITreePart;
+import bjc.utils.funcdata.ITreePart.TreeLinearizationMethod;
 
 /**
  * A binary search tree, with some mild support for functional traversal.
@@ -52,7 +53,7 @@ public class BinarySearchTree<T> {
 		nCount++;
 
 		if (root == null) {
-			root = new TreeNode<T>(dat, null, null);
+			root = new BinarySearchTreeNode<T>(dat, null, null);
 		} else {
 			root.add(dat, comp);
 		}
@@ -74,7 +75,7 @@ public class BinarySearchTree<T> {
 
 		while ((piv - adj) >= 0 && (piv + adj) < elms.getSize()) {
 			if (root == null) {
-				root = new TreeNode<T>(elms.getByIndex(piv), null, null);
+				root = new BinarySearchTreeNode<T>(elms.getByIndex(piv), null, null);
 			} else {
 				root.add(elms.getByIndex(piv + adj), comp);
 				root.add(elms.getByIndex(piv - adj), comp);
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/TreeLeaf.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeLeaf.java
index e2f204a..02b9c7a 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/TreeLeaf.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeLeaf.java
@@ -5,6 +5,8 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import bjc.utils.funcdata.ITreePart;
+
 /**
  * A leaf in a tree.
  * 
@@ -13,7 +15,7 @@ import java.util.function.Predicate;
  * @param <T>
  *            The data stored in the tree.
  */
-public class TreeLeaf<T> implements ITreePart<T> {
+public class BinarySearchTreeLeaf<T> implements ITreePart<T> {
 	/**
 	 * The data held in this tree leaf
 	 */
@@ -30,7 +32,7 @@ public class TreeLeaf<T> implements ITreePart<T> {
 	 * @param dat
 	 *            The data for the leaf to hold.
 	 */
-	public TreeLeaf(T dat) {
+	public BinarySearchTreeLeaf(T dat) {
 		data = dat;
 	}
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/TreeNode.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java
index e8c6c8b..30a9fbd 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/TreeNode.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java
@@ -7,6 +7,8 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import bjc.utils.funcdata.ITreePart;
+
 /**
  * A binary node in a tree.
  * 
@@ -15,7 +17,7 @@ import java.util.function.Predicate;
  * @param <T>
  *            The data type stored in the tree.
  */
-public class TreeNode<T> extends TreeLeaf<T> {
+public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> {
 	/**
 	 * The left child of this node
 	 */
@@ -36,7 +38,7 @@ public class TreeNode<T> extends TreeLeaf<T> {
 	 * @param right
 	 *            The right child of this node.
 	 */
-	public TreeNode(T data, ITreePart<T> left, ITreePart<T> right) {
+	public BinarySearchTreeNode(T data, ITreePart<T> left, ITreePart<T> right) {
 		super(data);
 		this.left = left;
 		this.right = right;
@@ -53,7 +55,7 @@ public class TreeNode<T> extends TreeLeaf<T> {
 		switch (comp.compare(data, dat)) {
 			case -1:
 				if (left == null) {
-					left = new TreeNode<T>(dat, null, null);
+					left = new BinarySearchTreeNode<T>(dat, null, null);
 				} else {
 					left.add(dat, comp);
 				}
@@ -66,7 +68,7 @@ public class TreeNode<T> extends TreeLeaf<T> {
 				}
 			case 1:
 				if (right == null) {
-					right = new TreeNode<T>(dat, null, null);
+					right = new BinarySearchTreeNode<T>(dat, null, null);
 				} else {
 					right.add(dat, comp);
 				}