Cleanliness

6 files changed, 4 insertions, 19 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 04327e4..5fed73f 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
@@ -133,7 +133,6 @@ 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);
 			});
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
index 8f8059b..00b1555 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
@@ -1,10 +1,7 @@
 package bjc.utils.esodata;
 
-import java.util.ArrayList;
 import java.util.Deque;
-import java.util.List;
 import java.util.LinkedList;
-import java.util.function.Consumer;
 
 /**
  * A FIFO implementation of a stack.
@@ -20,7 +17,7 @@ public class QueueStack<T> extends Stack<T> {
 	 *
 	 */
 	public QueueStack() {
-		backing = new LinkedList();
+		backing = new LinkedList<>();
 	}
 
 	@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java
index 67f228f..5f86ecc 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java
@@ -1,10 +1,7 @@
 package bjc.utils.esodata;
 
-import java.util.ArrayList;
 import java.util.Deque;
-import java.util.List;
 import java.util.LinkedList;
-import java.util.function.Consumer;
 
 /**
  * Simple implementation of a stack.
@@ -20,7 +17,7 @@ public class SimpleStack<T> extends Stack<T> {
 	 *
 	 */
 	public SimpleStack() {
-		backing = new LinkedList();
+		backing = new LinkedList<>();
 	}
 
 	@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
index 3f82910..e5b1422 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
@@ -1,11 +1,5 @@
 package bjc.utils.esodata;
 
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.function.Consumer;
-
 /*
  * Implements a spaghetti stack, which is a stack that is branched off of a
  * parent stack.
@@ -24,7 +18,7 @@ class SpaghettiStack<T> extends Stack<T> {
 	 * @param par The parent stack
 	 */
 	public SpaghettiStack(Stack<T> par) {
-		backing = new SimpleStack();
+		backing = new SimpleStack<>();
 
 		parent = par;
 	}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java
index 43e10ab..1fc644e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java
@@ -1,9 +1,7 @@
 package bjc.utils.esodata;
 
 import java.util.ArrayList;
-import java.util.Deque;
 import java.util.List;
-import java.util.LinkedList;
 import java.util.function.Consumer;
 
 /**
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java
index e633ca9..711c15e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java
@@ -13,7 +13,7 @@ import java.util.Map;
  * @param T The element type of the tapes.
  */
 public class TapeLibrary<T> implements Tape<T> {
-	private Map<String, Tape> tapes;
+	private Map<String, Tape<T>> tapes;
 	private Tape<T>           currentTape;
 
 	/**