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/collection/Collection.java   | 36 ++++++++++++++++++++--
 .../c2kernel/graph/model/GraphModelManager.java    |  2 +-
 .../com/c2kernel/graph/model/GraphableVertex.java  |  2 +-
 src/main/java/com/c2kernel/graph/model/Vertex.java |  8 ++---
 .../com/c2kernel/lifecycle/WfCastorHashMap.java    |  4 +--
 .../lifecycle/WfVertexDefOutlineCreator.java       |  8 ++---
 .../predefined/agent/SetAgentPassword.java         |  1 -
 .../c2kernel/persistency/TransactionManager.java   |  2 +-
 .../com/c2kernel/persistency/outcome/Outcome.java  |  4 +--
 .../resource/DefaultResourceImportHandler.java     |  2 --
 .../java/com/c2kernel/utils/CastorArrayList.java   | 27 +++++++++++++++-
 .../java/com/c2kernel/utils/ObjectProperties.java  |  4 +--
 12 files changed, 76 insertions(+), 24 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/collection/Collection.java b/src/main/java/com/c2kernel/collection/Collection.java
index 7ab9fb2..2bedfb2 100644
--- a/src/main/java/com/c2kernel/collection/Collection.java
+++ b/src/main/java/com/c2kernel/collection/Collection.java
@@ -20,8 +20,6 @@
  */
 package com.c2kernel.collection;
 
-import java.util.Iterator;
-
 import com.c2kernel.common.InvalidCollectionModification;
 import com.c2kernel.common.ObjectAlreadyExistsException;
 import com.c2kernel.common.ObjectNotFoundException;
@@ -173,6 +171,38 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal
 	public abstract void removeMember(int memberId) throws ObjectNotFoundException;
 
 	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((mMembers == null) ? 0 : mMembers.hashCode());
+		result = prime * result + ((mName == null) ? 0 : mName.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;
+		Collection<?> other = (Collection<?>) obj;
+		if (mMembers == null) {
+			if (other.mMembers != null)
+				return false;
+		} else if (!mMembers.equals(other.mMembers))
+			return false;
+		if (mName == null) {
+			if (other.mName != null)
+				return false;
+		} else if (!mName.equals(other.mName))
+			return false;
+		return true;
+	}
+
+	/*@Override
     public boolean equals(Object other) {
 		if (!(other instanceof Collection<?>)) return false;
 		Collection<?> otherColl = (Collection<?>)other;
@@ -188,7 +218,7 @@ abstract public class Collection<E extends CollectionMember> implements C2KLocal
 			}
 		}
 		return true;
-    }
+    }*/
 
 	
 }
diff --git a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java b/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
index f239527..a4209ce 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModelManager.java
@@ -100,7 +100,7 @@ public class GraphModelManager extends Observable
         GraphModel childModel = child.getChildGraphModel();
         if (childModel != null) {
             mParentModels.push(mGraphModel);
-            mParentIds.add(new Integer(child.getID()));
+            mParentIds.add(Integer.valueOf(child.getID()));
             setModel(childModel);
             Logger.msg(7, "ZoomIn - Stack size: "+mParentModels.size()+" ids:"+mParentIds.size());
         }
diff --git a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java b/src/main/java/com/c2kernel/graph/model/GraphableVertex.java
index 4bc73fd..b90441b 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphableVertex.java
@@ -50,7 +50,7 @@ public abstract class GraphableVertex extends Vertex
 		Object val = getProperties().get(propName);
 		if (val == null || val.equals("") || val.toString().equals("-1")) return null;
 		try {
-			return new Integer(val.toString());
+			return Integer.valueOf(val.toString());
 		} catch (NumberFormatException ex) {
 			throw new InvalidDataException("Invalid version number for property '"+propName+"': "+val.toString());
 		}
diff --git a/src/main/java/com/c2kernel/graph/model/Vertex.java b/src/main/java/com/c2kernel/graph/model/Vertex.java
index 97685ce..2aaa423 100644
--- a/src/main/java/com/c2kernel/graph/model/Vertex.java
+++ b/src/main/java/com/c2kernel/graph/model/Vertex.java
@@ -191,7 +191,7 @@ public class Vertex
 
         mInEdgeIdVector = new Vector<Integer>(10, 10);
        	for(i=0; i<ids.length; i++)
-       		mInEdgeIdVector.add(new Integer(ids[i]));
+       		mInEdgeIdVector.add(Integer.valueOf(ids[i]));
     }
 
 
@@ -207,7 +207,7 @@ public class Vertex
 
         mOutEdgeIdVector = new Vector<Integer>(10, 10);
        	for(i=0; i<ids.length; i++)
-       		mOutEdgeIdVector.add(new Integer(ids[i]));
+       		mOutEdgeIdVector.add(Integer.valueOf(ids[i]));
     }
 
 
@@ -235,7 +235,7 @@ public class Vertex
 
     public void addInEdgeId(int id)
     {
-        mInEdgeIdVector.add(new Integer(id));
+        mInEdgeIdVector.add(Integer.valueOf(id));
     }
 
 
@@ -259,7 +259,7 @@ public class Vertex
 
     public void addOutEdgeId(int id)
     {
-        mOutEdgeIdVector.add(new Integer(id));
+        mOutEdgeIdVector.add(Integer.valueOf(id));
     }
 
 
diff --git a/src/main/java/com/c2kernel/lifecycle/WfCastorHashMap.java b/src/main/java/com/c2kernel/lifecycle/WfCastorHashMap.java
index 02d467a..922a92d 100644
--- a/src/main/java/com/c2kernel/lifecycle/WfCastorHashMap.java
+++ b/src/main/java/com/c2kernel/lifecycle/WfCastorHashMap.java
@@ -31,8 +31,8 @@ public class WfCastorHashMap extends CastorHashMap
 	 */
 	public WfCastorHashMap()
 	{
-		put("Show time", new Boolean(true));
-		put("Breakpoint", new Boolean(false));
+		put("Show time", true);
+		put("Breakpoint", false);
 		put("Description", "");
         put("Agent Role", "");
         put("Agent Name", "");
diff --git a/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java b/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java
index cf6c04d..d2322d3 100644
--- a/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java
+++ b/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java
@@ -26,10 +26,10 @@ import com.c2kernel.graph.model.VertexOutlineCreator;
 
 public class WfVertexDefOutlineCreator implements VertexOutlineCreator
 {
-    private final int mActivityWidth   = 130;
-    private final int mActivityHeight  = 60;
-    private final int mSplitJoinWidth  = 60;
-    private final int mSplitJoinHeight = 25;
+    private static final int mActivityWidth   = 130;
+    private static final int mActivityHeight  = 60;
+    private static final int mSplitJoinWidth  = 60;
+    private static final int mSplitJoinHeight = 25;
 
     @Override
 	public void setOutline(Vertex vertex)
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java
index f54e2a8..3832337 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentPassword.java
@@ -54,7 +54,6 @@ public class SetAgentPassword extends PredefinedStep {
 		} catch (InvalidItemPathException ex) {
 			throw new InvalidDataException("Can only set password on an Agent. "+item+" is an Item.");
 		}
-		String agentName = targetAgent.getAgentName();
 		
 		try {
 			Gateway.getLookupManager().setAgentPassword(targetAgent, params[0]);
diff --git a/src/main/java/com/c2kernel/persistency/TransactionManager.java b/src/main/java/com/c2kernel/persistency/TransactionManager.java
index 4fc3f8c..45f3459 100644
--- a/src/main/java/com/c2kernel/persistency/TransactionManager.java
+++ b/src/main/java/com/c2kernel/persistency/TransactionManager.java
@@ -302,7 +302,7 @@ public class TransactionManager {
 
     /** Used in the transaction table to store details of a put until commit
      */
-    class TransactionEntry {
+    static class TransactionEntry {
         public ItemPath itemPath;
         public String path;
         public C2KLocalObject obj;
diff --git a/src/main/java/com/c2kernel/persistency/outcome/Outcome.java b/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
index e039476..a8683ab 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
+++ b/src/main/java/com/c2kernel/persistency/outcome/Outcome.java
@@ -105,7 +105,7 @@ public class Outcome implements C2KLocalObject {
             throw new PersistencyException("Outcome() - Outcome version was an invalid number: "+verstring);
         }
         try {
-            mID = new Integer(objId);
+            mID = Integer.valueOf(objId);
         } catch (NumberFormatException ex) {
             mID = null;
         }
@@ -123,7 +123,7 @@ public class Outcome implements C2KLocalObject {
     @Override
 	public void setName(String name) {
     	try {
-    		mID = new Integer(name);
+    		mID = Integer.valueOf(name);
     	} catch (NumberFormatException e) {
     		Logger.error("Invalid id set on Outcome:"+name);
     	}
diff --git a/src/main/java/com/c2kernel/process/resource/DefaultResourceImportHandler.java b/src/main/java/com/c2kernel/process/resource/DefaultResourceImportHandler.java
index 6378dfd..3e6d6dd 100644
--- a/src/main/java/com/c2kernel/process/resource/DefaultResourceImportHandler.java
+++ b/src/main/java/com/c2kernel/process/resource/DefaultResourceImportHandler.java
@@ -30,7 +30,6 @@ import com.c2kernel.property.PropertyDescriptionList;
 
 public class DefaultResourceImportHandler implements ResourceImportHandler {
 
-	String resType;
 	String schemaName;
 	String typeRoot;
 	DomainPath typeRootPath;
@@ -38,7 +37,6 @@ public class DefaultResourceImportHandler implements ResourceImportHandler {
 	PropertyDescriptionList props;
 	
 	public DefaultResourceImportHandler(String resType) throws Exception {
-		this.resType = resType;
     	if (resType.equals("CA")) {
     		wfDef = "ManageCompositeActDef";
     		schemaName = "CompositeActivityDef";
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