From 10beb8e502ec8cbb02162a09da2d826ea2a1b1fc Mon Sep 17 00:00:00 2001 From: bjculkin Date: Thu, 1 Mar 2018 14:53:15 -0500 Subject: Format pass --- .../main/java/bjc/utils/data/CircularIterator.java | 4 ++-- .../bjc/utils/data/TopDownTransformIterator.java | 20 ++++++++++---------- .../java/bjc/utils/data/internals/WrappedOption.java | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'base/src/main/java/bjc/utils/data') diff --git a/base/src/main/java/bjc/utils/data/CircularIterator.java b/base/src/main/java/bjc/utils/data/CircularIterator.java index 507ee01..4558b63 100644 --- a/base/src/main/java/bjc/utils/data/CircularIterator.java +++ b/base/src/main/java/bjc/utils/data/CircularIterator.java @@ -12,8 +12,8 @@ import java.util.Iterator; */ public class CircularIterator implements Iterator { /* The iterable, and our current iterator into it. */ - private Iterable source; - private Iterator curr; + private Iterable source; + private Iterator curr; /* Our current element. */ private E curElm; diff --git a/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java b/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java index 1e69071..8914ad4 100644 --- a/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java +++ b/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java @@ -25,22 +25,22 @@ import java.util.function.Function; * The type of the nodes in the tree. */ public class TopDownTransformIterator implements Iterator> { - private final Function picker; - private final BiFunction, Consumer>>, ITree> transform; + private final Function picker; + private final BiFunction, Consumer>>, ITree> transform; - private ITree preParent; - private ITree postParent; + private ITree preParent; + private ITree postParent; - private final Deque> preChildren; - private final Deque> postChildren; + private final Deque> preChildren; + private final Deque> postChildren; private TopDownTransformIterator curChild; - private boolean done; - private boolean initial; + private boolean done; + private boolean initial; - private final Deque>> toYield; - private Iterator> curYield; + private final Deque>> toYield; + private Iterator> curYield; /** * Create a new tree iterator. diff --git a/base/src/main/java/bjc/utils/data/internals/WrappedOption.java b/base/src/main/java/bjc/utils/data/internals/WrappedOption.java index b2fe71f..19d5e26 100644 --- a/base/src/main/java/bjc/utils/data/internals/WrappedOption.java +++ b/base/src/main/java/bjc/utils/data/internals/WrappedOption.java @@ -10,7 +10,8 @@ import bjc.utils.data.Option; * A wrapped optional value. * * @author Ben Culkin. - * @param The wrapped type. + * @param + * The wrapped type. */ public class WrappedOption implements IHolder { /* The held value. */ -- cgit v1.2.3