From 2673f6a4c2649c299f1fbd340ffb8ac7315ad326 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 6 Jan 2020 17:50:40 -0500
Subject: General warning cleanup

Just clean up of some warnings/other misc. problems
---
 base/src/main/java/bjc/utils/data/ArrayIterator.java  |  6 +++++-
 base/src/main/java/bjc/utils/data/QueuedIterator.java | 13 +++++++------
 base/src/main/java/bjc/utils/data/Tree.java           |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'base/src/main/java/bjc/utils/data')

diff --git a/base/src/main/java/bjc/utils/data/ArrayIterator.java b/base/src/main/java/bjc/utils/data/ArrayIterator.java
index 6a00800..1592901 100644
--- a/base/src/main/java/bjc/utils/data/ArrayIterator.java
+++ b/base/src/main/java/bjc/utils/data/ArrayIterator.java
@@ -4,6 +4,8 @@ import java.util.Iterator;
 /**
  * Represents an iterator over an array of values.
  *
+ * @param <T> The type of values in the array.
+ * 
  * @author Ben Culkin
  */
 public class ArrayIterator<T> implements Iterator<T> {
@@ -13,9 +15,10 @@ public class ArrayIterator<T> implements Iterator<T> {
 	/**
 	 * Create a new array iterator.
 	 *
-	 * @param elems
+	 * @param elms
 	 * 	The array that will be iterated over.
 	 */
+	@SafeVarargs
 	public ArrayIterator(T... elms) {
 		arr = elms;
 		idx = 0;
@@ -26,6 +29,7 @@ public class ArrayIterator<T> implements Iterator<T> {
 		return idx < arr.length;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public T next() {
 		if (idx >= arr.length) return null;
diff --git a/base/src/main/java/bjc/utils/data/QueuedIterator.java b/base/src/main/java/bjc/utils/data/QueuedIterator.java
index 0eeac4d..ae3afb8 100644
--- a/base/src/main/java/bjc/utils/data/QueuedIterator.java
+++ b/base/src/main/java/bjc/utils/data/QueuedIterator.java
@@ -33,6 +33,7 @@ public class QueuedIterator<E> implements Iterator<E> {
 	 *
 	 * @return A queued iterator.
 	 */
+	@SafeVarargs
 	public static <E> QueuedIterator<E> queued(E... vals) {
 		return new QueuedIterator<>(new ArrayIterator<>(vals));
 	}
@@ -108,7 +109,7 @@ public class QueuedIterator<E> implements Iterator<E> {
 	 */
 	@SafeVarargs
 	public QueuedIterator(E... vals) {
-		this(new ArrayIterator(vals));
+		this(new ArrayIterator<>(vals));
 	}
 
 	/**
@@ -139,7 +140,7 @@ public class QueuedIterator<E> implements Iterator<E> {
 	 * @param vals
 	 * 		Values to iterate over first.
 	 */
-	public void before(E... vals) {
+	public void before(@SuppressWarnings("unchecked") E... vals) {
 		before(new ArrayIterator<>(vals));
 	}
 
@@ -169,7 +170,7 @@ public class QueuedIterator<E> implements Iterator<E> {
 	 * @param vals
 	 * 		The values to iterate over next.
 	 */
-	public void after(E... vals) {
+	public void after(@SuppressWarnings("unchecked") E... vals) {
 		after(new ArrayIterator<>(vals));
 	}
 	
@@ -196,10 +197,10 @@ public class QueuedIterator<E> implements Iterator<E> {
 	/**
 	 * Add a new set of values who we will iterate through last.
 	 * 
-	 * @param itr
-	 *                The iterable to go through last.
+	 * @param vals
+	 * 	The values we will iterate over.
 	 */
-	public void last(E... vals) {
+	public void last(@SuppressWarnings("unchecked") E... vals) {
 		last(new ArrayIterator<>(vals));
 	}
 
diff --git a/base/src/main/java/bjc/utils/data/Tree.java b/base/src/main/java/bjc/utils/data/Tree.java
index c8e167e..920ab80 100644
--- a/base/src/main/java/bjc/utils/data/Tree.java
+++ b/base/src/main/java/bjc/utils/data/Tree.java
@@ -109,7 +109,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 
 	@Override
 	public void addChild(final ContainedType child) {
-		addChild(new Tree(child));
+		addChild(new Tree<>(child));
 	}
 
 	@Override
-- 
cgit v1.2.3