diff options
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc')
8 files changed, 6 insertions, 15 deletions
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 c44eece..90e6793 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java @@ -131,9 +131,9 @@ public class Tree<ContainedType> implements ITree<ContainedType> { if (hasChildren) { Function<IList<NewType>, NewType> nodeTransformer = nodeCollapser.apply(data); + @SuppressWarnings("unchecked") IList<NewType> collapsedChildren = (IList<NewType>) children.map((child) -> { - return child.collapse(leafTransform, nodeCollapser, - (subTreeVal) -> subTreeVal); + return child.collapse(leafTransform, nodeCollapser, (subTreeVal) -> subTreeVal); }); return nodeTransformer.apply(collapsedChildren); @@ -302,8 +302,9 @@ public class Tree<ContainedType> implements ITree<ContainedType> { } public boolean equals(Object other) { - if(!(other instanceof Tree)) return false; + if(!(other instanceof Tree<?>)) return false; + @SuppressWarnings("unchecked") Tree<ContainedType> otr = (Tree<ContainedType>) other; if(!otr.data.equals(data)) return false; diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java index 410acf6..bc8ac51 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java @@ -1,7 +1,5 @@ package bjc.utils.esodata; -import java.util.ArrayList; - /** * Double-sided tape is essentially two tapes stuck together with a shared cursor. * diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/Tape.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/Tape.java index d08feb1..425feb0 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Tape.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Tape.java @@ -1,7 +1,5 @@ package bjc.utils.esodata; -import java.util.ArrayList; - /** * Interface for something that acts like a tape. * diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java index 1d132fa..790e3fd 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java @@ -27,6 +27,7 @@ public class TapeChanger<T> implements Tape<T> { * * @param taps The tapes to put in this tape changer. */ + @SafeVarargs public TapeChanger(Tape<T> current, Tape<T>... others) { this(); diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java index cda27b1..0251de3 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java @@ -206,7 +206,6 @@ public class FunctionalList<E> implements Cloneable, IList<E> { return returned; } - @Override public void forEach(Consumer<E> action) { if (action == null) { throw new NullPointerException("Action is null"); diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java index 798b6f1..fc58b6a 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java @@ -3,7 +3,6 @@ package bjc.utils.funcutils; import java.util.function.Consumer; import java.util.function.Function; -import bjc.utils.data.IHolder; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.IList; diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java index 2f7b4fb..ad7dbad 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java @@ -6,9 +6,7 @@ import java.util.Iterator; 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.funcdata.FunctionalList; import bjc.utils.funcdata.IList; @@ -62,8 +60,6 @@ public class ListUtils { } else { StringBuilder state = new StringBuilder(); - String tok = ""; - int i = 1; for(String itm : input.toIterable()) { state.append(itm); @@ -214,7 +210,7 @@ public class ListUtils { */ IList<E> rejected = new FunctionalList<>(); - GroupPartIteration it = new GroupPartIteration<>(returned, rejected, partitionSize, counter); + GroupPartIteration<E> it = new GroupPartIteration<>(returned, rejected, partitionSize, counter); /* * Run up to a certain number of passes diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java index 2aa92e5..0ce6dc1 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java @@ -1,6 +1,5 @@ package bjc.utils.funcutils; -import java.util.Iterator; import java.util.function.BiFunction; import bjc.utils.funcdata.FunctionalList; |