Cleanup more

1 files changed, 25 insertions, 8 deletions

diff --git a/base/src/main/java/bjc/utils/funcutils/CompoundCollector.java b/base/src/main/java/bjc/utils/funcutils/CompoundCollector.java
index 35695bc..928c3f4 100644
--- a/base/src/main/java/bjc/utils/funcutils/CompoundCollector.java
+++ b/base/src/main/java/bjc/utils/funcutils/CompoundCollector.java
@@ -12,26 +12,43 @@ import bjc.utils.data.IPair;
 import bjc.utils.data.Identity;
 import bjc.utils.data.Pair;
 
+/** 
+ * Implementation of a collecter that uses two collectors.
+ *
+ * @author Ben Culkin
+ */
 final class CompoundCollector<InitialType, AuxType1, AuxType2, FinalType1, FinalType2>
 		implements Collector<InitialType, IHolder<IPair<AuxType1, AuxType2>>, IPair<FinalType1, FinalType2>> {
-
+	/* Our characteristics. */
 	private final Set<java.util.stream.Collector.Characteristics> characteristicSet;
 
-	private final Collector<InitialType, AuxType1, FinalType1>	first;
-	private final Collector<InitialType, AuxType2, FinalType2>	second;
-
+	/* The first collector.  */
+	private final Collector<InitialType, AuxType1, FinalType1> first;
+	/* The second collector. */
+	private final Collector<InitialType, AuxType2, FinalType2> second;
+
+	/**
+	 * Create a collector that uses two collectors.
+	 *
+	 * @param first
+	 * 	The first collector.
+	 *
+	 * @param second
+	 * 	The second collector.
+	 */
 	public CompoundCollector(final Collector<InitialType, AuxType1, FinalType1> first,
 			final Collector<InitialType, AuxType2, FinalType2> second) {
 		this.first = first;
 		this.second = second;
 
+		/* Accumulate characteristics. */
 		characteristicSet = first.characteristics();
 		characteristicSet.addAll(second.characteristics());
 	}
 
 	@Override
 	public BiConsumer<IHolder<IPair<AuxType1, AuxType2>>, InitialType> accumulator() {
-		final BiConsumer<AuxType1, InitialType> firstAccumulator = first.accumulator();
+		final BiConsumer<AuxType1, InitialType> firstAccumulator  = first.accumulator();
 		final BiConsumer<AuxType2, InitialType> secondAccumulator = second.accumulator();
 
 		return (state, value) -> {
@@ -51,7 +68,7 @@ final class CompoundCollector<InitialType, AuxType1, AuxType2, FinalType1, Final
 
 	@Override
 	public BinaryOperator<IHolder<IPair<AuxType1, AuxType2>>> combiner() {
-		final BinaryOperator<AuxType1> firstCombiner = first.combiner();
+		final BinaryOperator<AuxType1> firstCombiner  = first.combiner();
 		final BinaryOperator<AuxType2> secondCombiner = second.combiner();
 
 		return (leftState, rightState) -> {
@@ -68,7 +85,7 @@ final class CompoundCollector<InitialType, AuxType1, AuxType2, FinalType1, Final
 		return state -> {
 			return state.unwrap(pair -> {
 				return pair.bind((left, right) -> {
-					final FinalType1 finalLeft = first.finisher().apply(left);
+					final FinalType1 finalLeft  = first.finisher().apply(left);
 					final FinalType2 finalRight = second.finisher().apply(right);
 
 					return new Pair<>(finalLeft, finalRight);
@@ -80,7 +97,7 @@ final class CompoundCollector<InitialType, AuxType1, AuxType2, FinalType1, Final
 	@Override
 	public Supplier<IHolder<IPair<AuxType1, AuxType2>>> supplier() {
 		return () -> {
-			final AuxType1 initialLeft = first.supplier().get();
+			final AuxType1 initialLeft  = first.supplier().get();
 			final AuxType2 initialRight = second.supplier().get();
 
 			return new Identity<>(new Pair<>(initialLeft, initialRight));