diff options
Diffstat (limited to 'base/src/main/java/bjc/utils/data')
5 files changed, 21 insertions, 13 deletions
diff --git a/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java b/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java index 8f3e40c..d4a676c 100644 --- a/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java +++ b/base/src/main/java/bjc/utils/data/TopDownTransformIterator.java @@ -12,6 +12,7 @@ import java.util.function.Function; /* * @TODO 10/11/17 Ben Culkin :TopDownStep + * * Figure out what is broken with this, and fix it so that step-wise * iteration works correctly. */ diff --git a/base/src/main/java/bjc/utils/data/Tree.java b/base/src/main/java/bjc/utils/data/Tree.java index 6b7e03a..f7ff90a 100644 --- a/base/src/main/java/bjc/utils/data/Tree.java +++ b/base/src/main/java/bjc/utils/data/Tree.java @@ -140,13 +140,13 @@ public class Tree<ContainedType> implements ITree<ContainedType> { public int revFind(final Predicate<ITree<ContainedType>> childPred) { if(childCount == 0) { return -1; - } else { - for(int i = childCount - 1; i >= 0; i--) { - if(childPred.test(getChild(i))) return i; - } + } - return -1; + for(int i = childCount - 1; i >= 0; i--) { + if(childPred.test(getChild(i))) return i; } + + return -1; } @Override @@ -234,8 +234,10 @@ public class Tree<ContainedType> implements ITree<ContainedType> { } protected void internalToString(final StringBuilder builder, final int indentLevel, final boolean initial) { - for(int i = 0; i < indentLevel; i++) { - builder.append(">\t"); + if(!initial) { + for(int i = 0; i < indentLevel; i++) { + builder.append(">\t"); + } } builder.append("Node #"); diff --git a/base/src/main/java/bjc/utils/data/ValueToggle.java b/base/src/main/java/bjc/utils/data/ValueToggle.java index 09f314c..0fddddf 100644 --- a/base/src/main/java/bjc/utils/data/ValueToggle.java +++ b/base/src/main/java/bjc/utils/data/ValueToggle.java @@ -39,18 +39,18 @@ public class ValueToggle<E> implements Toggle<E> { public E get() { if(alignment.get()) { return lft; - } else { - return rght; } + + return rght; } @Override public E peek() { if(alignment.peek()) { return lft; - } else { - return rght; } + + return rght; } @Override diff --git a/base/src/main/java/bjc/utils/data/internals/WrappedLazy.java b/base/src/main/java/bjc/utils/data/internals/WrappedLazy.java index 57f9302..c08e502 100644 --- a/base/src/main/java/bjc/utils/data/internals/WrappedLazy.java +++ b/base/src/main/java/bjc/utils/data/internals/WrappedLazy.java @@ -10,6 +10,8 @@ import bjc.utils.data.Lazy; * A wrapped lazy value. * * @author Ben Culkin + * @param <ContainedType> + * The type of the wrapped value. */ public class WrappedLazy<ContainedType> implements IHolder<ContainedType> { /* Held value. */ @@ -33,7 +35,8 @@ public class WrappedLazy<ContainedType> implements IHolder<ContainedType> { * the compiler could know which one we meant without the dummy * parameter. */ - private WrappedLazy(final IHolder<IHolder<ContainedType>> wrappedHolder, final boolean dummy) { + private WrappedLazy(final IHolder<IHolder<ContainedType>> wrappedHolder, + @SuppressWarnings("unused") final boolean dummy) { held = wrappedHolder; } 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 6260ce4..b2fe71f 100644 --- a/base/src/main/java/bjc/utils/data/internals/WrappedOption.java +++ b/base/src/main/java/bjc/utils/data/internals/WrappedOption.java @@ -10,6 +10,7 @@ import bjc.utils.data.Option; * A wrapped optional value. * * @author Ben Culkin. + * @param <ContainedType> The wrapped type. */ public class WrappedOption<ContainedType> implements IHolder<ContainedType> { /* The held value. */ @@ -30,7 +31,8 @@ public class WrappedOption<ContainedType> implements IHolder<ContainedType> { * method, because without this method erases to the same type as the * public one. */ - private WrappedOption(final IHolder<IHolder<ContainedType>> toHold, final boolean dummy) { + private WrappedOption(final IHolder<IHolder<ContainedType>> toHold, + @SuppressWarnings("unused") final boolean dummy) { held = toHold; } |