Cleanup

1 files changed, 20 insertions, 19 deletions

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 005c90e..ebb9d8c 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
@@ -28,14 +28,16 @@ public class QueueStack<T> extends Stack<T> {
 
 	@Override
 	public T pop() {
-		if(backing.isEmpty()) throw new StackUnderflowException();
+		if (backing.isEmpty())
+			throw new StackUnderflowException();
 
 		return backing.remove();
 	}
 
 	@Override
 	public T top() {
-		if(backing.isEmpty()) throw new StackUnderflowException();
+		if (backing.isEmpty())
+			throw new StackUnderflowException();
 
 		return backing.peek();
 	}
@@ -50,17 +52,6 @@ public class QueueStack<T> extends Stack<T> {
 		return backing.size() == 0;
 	}
 
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-
-		builder.append("QueueStack [backing=");
-		builder.append(backing);
-		builder.append("]");
-
-		return builder.toString();
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public T[] toArray() {
@@ -68,6 +59,11 @@ public class QueueStack<T> extends Stack<T> {
 	}
 
 	@Override
+	public String toString() {
+		return String.format("QueueStack [backing=%s]", backing);
+	}
+
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
@@ -79,15 +75,20 @@ public class QueueStack<T> extends Stack<T> {
 
 	@Override
 	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(obj == null) return false;
-		if(getClass() != obj.getClass()) return false;
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (!(obj instanceof QueueStack<?>))
+			return false;
 
 		QueueStack<?> other = (QueueStack<?>) obj;
 
-		if(backing == null) {
-			if(other.backing != null) return false;
-		} else if(!backing.equals(other.backing)) return false;
+		if (backing == null) {
+			if (other.backing != null)
+				return false;
+		} else if (!backing.equals(other.backing))
+			return false;
 
 		return true;
 	}