From f7a10e0e57d6f0ea83643c3d5763ff405af73337 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 28 Sep 2016 13:44:04 -0400 Subject: Formatting pass --- .../bjc/utils/funcutils/CompoundCollector.java | 31 +++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java index 60eb163..257f005 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java @@ -12,13 +12,16 @@ import bjc.utils.data.IPair; import bjc.utils.data.Identity; import bjc.utils.data.Pair; -final class CompoundCollector - implements - Collector>, IPair> { - private Set characteristicSet; +final class CompoundCollector implements + Collector>, + IPair> { + private Set< + java.util.stream.Collector.Characteristics> characteristicSet; private Collector firstCollector; - private Collector secondCollector; + private Collector secondCollector; public CompoundCollector( Collector firstCollector, @@ -31,11 +34,13 @@ final class CompoundCollector>, InitialType> accumulator() { + public BiConsumer>, + InitialType> accumulator() { BiConsumer firstAccumulator = firstCollector .accumulator(); - BiConsumer secondAccumulator = secondCollector - .accumulator(); + BiConsumer secondAccumulator = secondCollector + .accumulator(); return (state, value) -> { state.doWith((statePair) -> { @@ -48,15 +53,16 @@ final class CompoundCollector characteristics() { + public Set< + java.util.stream.Collector.Characteristics> characteristics() { return characteristicSet; } @Override public BinaryOperator>> combiner() { BinaryOperator firstCombiner = firstCollector.combiner(); - BinaryOperator secondCombiner = secondCollector - .combiner(); + BinaryOperator< + AuxType2> secondCombiner = secondCollector.combiner(); return (leftState, rightState) -> { return leftState.unwrap((leftPair) -> { @@ -69,7 +75,8 @@ final class CompoundCollector>, IPair> finisher() { + public Function>, + IPair> finisher() { return (state) -> { return state.unwrap((pair) -> { return pair.bind((leftVal, rightVal) -> { -- cgit v1.2.3