Package reorganization

12 files changed, 40 insertions, 20 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/IHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/IHolder.java
index a8c9f77..a05d90e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/IHolder.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/IHolder.java
@@ -4,6 +4,9 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
+import bjc.utils.data.internals.BoundListHolder;
+import bjc.utils.data.internals.WrappedLazy;
+import bjc.utils.data.internals.WrappedOption;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.theory.Functor;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Lazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/Lazy.java
index ffc4919..6339795 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Lazy.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Lazy.java
@@ -4,6 +4,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
+import bjc.utils.data.internals.BoundLazy;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java
index f20139e..e03b46e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java
@@ -4,6 +4,9 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import bjc.utils.data.internals.BoundLazyPair;
+import bjc.utils.data.internals.HalfBoundLazyPair;
+
 /**
  * A lazy implementation of a pair
  * 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java
index e7ae1fc..a77cd16 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java
@@ -3,6 +3,7 @@ package bjc.utils.data;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
+import bjc.utils.data.internals.BoundListHolder;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
index 9018347..04327e4 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
@@ -8,7 +8,6 @@ import java.util.function.UnaryOperator;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.bst.TreeLinearizationMethod;
-import bjc.utils.funcutils.StringUtils;
 
 /**
  * A node in a homogenous tree.
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazy.java
index b2ae7ce..beb2465 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazy.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazy.java
@@ -1,16 +1,18 @@
-package bjc.utils.data;
+package bjc.utils.data.internals;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
+import bjc.utils.data.IHolder;
+import bjc.utils.data.Lazy;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 
 /**
  * Implements a lazy holder that has been bound
  */
-class BoundLazy<OldType, BoundContainedType>
+public class BoundLazy<OldType, BoundContainedType>
 		implements IHolder<BoundContainedType> {
 	/*
 	 * The old value
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
index c7eb965..977fb37 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
@@ -1,13 +1,18 @@
-package bjc.utils.data;
+package bjc.utils.data.internals;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import bjc.utils.data.IHolder;
+import bjc.utils.data.IPair;
+import bjc.utils.data.Identity;
+import bjc.utils.data.LazyPair;
+
 /**
  * Implements a lazy pair that has been bound
  */
-class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight>
+public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight>
 		implements IPair<NewLeft, NewRight> {
 	/*
 	 * The supplier of the left value
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/BoundListHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundListHolder.java
index a967383..7a3eaa8 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/BoundListHolder.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundListHolder.java
@@ -1,14 +1,16 @@
-package bjc.utils.data;
+package bjc.utils.data.internals;
 
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
+import bjc.utils.data.IHolder;
+import bjc.utils.data.ListHolder;
 import bjc.utils.funcdata.IList;
 
 /*
  * Holds a list, converted into a holder
  */
-class BoundListHolder<ContainedType> implements IHolder<ContainedType> {
+public class BoundListHolder<ContainedType> implements IHolder<ContainedType> {
 	private IList<IHolder<ContainedType>> heldHolders;
 
 	public BoundListHolder(IList<IHolder<ContainedType>> toHold) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/HalfBoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/HalfBoundLazyPair.java
index 58c375b..1e8d109 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/HalfBoundLazyPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/HalfBoundLazyPair.java
@@ -1,13 +1,18 @@
-package bjc.utils.data;
+package bjc.utils.data.internals;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import bjc.utils.data.IHolder;
+import bjc.utils.data.IPair;
+import bjc.utils.data.Identity;
+import bjc.utils.data.LazyPair;
+
 /*
  * A lazy pair, with only one side bound
  */
-class HalfBoundLazyPair<OldType, NewLeft, NewRight>
+public class HalfBoundLazyPair<OldType, NewLeft, NewRight>
 		implements IPair<NewLeft, NewRight> {
 	private Supplier<OldType>							oldSupplier;
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/WrappedLazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedLazy.java
index d278358..7f0b8db 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/WrappedLazy.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedLazy.java
@@ -1,9 +1,12 @@
-package bjc.utils.data;
+package bjc.utils.data.internals;
 
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
-class WrappedLazy<ContainedType> implements IHolder<ContainedType> {
+import bjc.utils.data.IHolder;
+import bjc.utils.data.Lazy;
+
+public class WrappedLazy<ContainedType> implements IHolder<ContainedType> {
 	private IHolder<IHolder<ContainedType>> held;
 
 	public WrappedLazy(IHolder<ContainedType> wrappedHolder) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/WrappedOption.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedOption.java
index 554eb54..65c2463 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/WrappedOption.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/WrappedOption.java
@@ -1,9 +1,12 @@
-package bjc.utils.data;
+package bjc.utils.data.internals;
 
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
-class WrappedOption<ContainedType> implements IHolder<ContainedType> {
+import bjc.utils.data.IHolder;
+import bjc.utils.data.Option;
+
+public class WrappedOption<ContainedType> implements IHolder<ContainedType> {
 	private IHolder<IHolder<ContainedType>> held;
 
 	public WrappedOption(IHolder<ContainedType> seedValue) {
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/package-info.java b/BJC-Utils2/src/main/java/bjc/utils/data/package-info.java
deleted file mode 100644
index 7b97a72..0000000
--- a/BJC-Utils2/src/main/java/bjc/utils/data/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Experimental redoing of data structures
- * 
- * @author ben
- *
- */
-package bjc.utils.data;