From 63d88eb8db1f7a6d5924ec2a8b7f462373d5ac9a Mon Sep 17 00:00:00 2001
From: bjculkin <bjculkin@WIT-136XG42.wvu-ad.wvu.edu>
Date: Fri, 7 Apr 2017 10:51:31 -0400
Subject: Cleanup

---
 .../src/main/java/bjc/utils/data/ListHolder.java   | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java')

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java
index f460941..8807312 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/ListHolder.java
@@ -28,8 +28,8 @@ public class ListHolder<ContainedType> implements IHolder<ContainedType> {
 	public ListHolder(ContainedType... values) {
 		heldValues = new FunctionalList<>();
 
-		if(values != null) {
-			for(ContainedType containedValue : values) {
+		if (values != null) {
+			for (ContainedType containedValue : values) {
 				heldValues.add(containedValue);
 			}
 		}
@@ -48,7 +48,7 @@ public class ListHolder<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public <NewType> Function<ContainedType, IHolder<NewType>> lift(Function<ContainedType, NewType> func) {
-		return (val) -> {
+		return val -> {
 			return new ListHolder<>(new FunctionalList<>(func.apply(val)));
 		};
 	}
@@ -74,13 +74,7 @@ public class ListHolder<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public String toString() {
-		StringBuilder builder = new StringBuilder();
-
-		builder.append("ListHolder [heldValues=");
-		builder.append(heldValues);
-		builder.append("]");
-
-		return builder.toString();
+		return String.format("ListHolder [heldValues=%s]", heldValues);
 	}
 
 	@Override
@@ -95,15 +89,20 @@ public class ListHolder<ContainedType> implements IHolder<ContainedType> {
 
 	@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 ListHolder<?>))
+			return false;
 
 		ListHolder<?> other = (ListHolder<?>) obj;
 
-		if(heldValues == null) {
-			if(other.heldValues != null) return false;
-		} else if(!heldValues.equals(other.heldValues)) return false;
+		if (heldValues == null) {
+			if (other.heldValues != null)
+				return false;
+		} else if (!heldValues.equals(other.heldValues))
+			return false;
 
 		return true;
 	}
-- 
cgit v1.2.3