From c48883b9584a41db39154f3d6370d13b8c8f8018 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 23:56:29 +0200
Subject: More FindBugs cleanup

---
 .../java/com/c2kernel/utils/CastorArrayList.java   | 27 +++++++++++++++++++++-
 .../java/com/c2kernel/utils/ObjectProperties.java  |  4 ++--
 2 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/c2kernel/utils')

diff --git a/src/main/java/com/c2kernel/utils/CastorArrayList.java b/src/main/java/com/c2kernel/utils/CastorArrayList.java
index 99ac335..bd9799f 100644
--- a/src/main/java/com/c2kernel/utils/CastorArrayList.java
+++ b/src/main/java/com/c2kernel/utils/CastorArrayList.java
@@ -42,7 +42,32 @@ abstract public class CastorArrayList<E> {
 		list = new ArrayList<E>();
     }
 
-    public CastorArrayList(ArrayList<E> list) {
+    @Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((list == null) ? 0 : list.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		CastorArrayList<?> other = (CastorArrayList<?>) obj;
+		if (list == null) {
+			if (other.list != null)
+				return false;
+		} else if (!list.equals(other.list))
+			return false;
+		return true;
+	}
+
+	public CastorArrayList(ArrayList<E> list) {
         this();
         this.list = list;
     }
diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/com/c2kernel/utils/ObjectProperties.java
index 704f3ed..4087fa3 100644
--- a/src/main/java/com/c2kernel/utils/ObjectProperties.java
+++ b/src/main/java/com/c2kernel/utils/ObjectProperties.java
@@ -104,7 +104,7 @@ public class ObjectProperties extends Properties {
 	public boolean getBoolean(String aPropertyName,
 			boolean defaultValue) {
 
-		Object wValue = getObject(aPropertyName, new Boolean(defaultValue));
+		Object wValue = getObject(aPropertyName, Boolean.valueOf(defaultValue));
 		if (wValue instanceof Boolean) {
 			return ((Boolean) wValue).booleanValue();
 		}
@@ -141,7 +141,7 @@ public class ObjectProperties extends Properties {
 	 */
 	public int getInt(String aPropertyName, int defaultValue) {
 
-		Object wValue = getObject(aPropertyName, new Integer(defaultValue));
+		Object wValue = getObject(aPropertyName, Integer.valueOf(defaultValue));
 		if (wValue instanceof Integer) {
 			return ((Integer) wValue).intValue();
 		}
-- 
cgit v1.2.3