From be6b4608bdea970657d0257460ab92874314ca9b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 26 Sep 2014 11:06:51 +0200
Subject: Various problems found by FindBugs

---
 .../lifecycle/instance/stateMachine/State.java     | 22 +++++++++++++++++++++
 .../instance/stateMachine/StateMachine.java        |  2 +-
 .../instance/stateMachine/Transition.java          | 23 ++++++++++++++++++++++
 .../instance/stateMachine/TransitionOutcome.java   |  4 +++-
 .../instance/stateMachine/TransitionScript.java    |  4 +++-
 5 files changed, 52 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/stateMachine')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
index fd712f4..dd0c763 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
@@ -57,4 +57,26 @@ public class State implements Serializable {
 	public Set<Integer> getPossibleTransitionIds() {
 		return possibleTransitions.keySet();
 	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + id;
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		State other = (State) obj;
+		if (id != other.id)
+			return false;
+		return true;
+	}
 }
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java
index ff9d5a8..f9814dd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java
@@ -63,7 +63,7 @@ public class StateMachine implements DescriptionObject
 		for (Transition trans : transitions) {
 			Logger.debug(6, "Transition "+trans.id+": "+trans.name);
 			transitionCodes.put(trans.getId(), trans);
-			isCoherent &= trans.resolveStates(stateCodes);
+			isCoherent = isCoherent && trans.resolveStates(stateCodes);
 		}
 		
 	}
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
index 8a82bc1..b16520c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
@@ -299,4 +299,27 @@ public class Transition implements Serializable {
 			return false;
 		return true;
 	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + id;
+		return result;
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Transition other = (Transition) obj;
+		if (id != other.id)
+			return false;
+		return true;
+	}
 }
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
index 71ba3b3..ad2d54c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
@@ -1,6 +1,8 @@
 package com.c2kernel.lifecycle.instance.stateMachine;
 
-public class TransitionOutcome extends TransitionResource {
+import java.io.Serializable;
+
+public class TransitionOutcome extends TransitionResource implements Serializable {
 	
 	// schema properties
 	String schemaName, schemaVersion; // Name & version of the schema of the data required for this transition. 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
index 9585102..271b44d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
@@ -1,6 +1,8 @@
 package com.c2kernel.lifecycle.instance.stateMachine;
 
-public class TransitionScript extends TransitionResource {
+import java.io.Serializable;
+
+public class TransitionScript extends TransitionResource implements Serializable {
 
 	// script properties
 	String scriptName, scriptVersion; // Name & version of the script to be run by the agent during this transition
-- 
cgit v1.2.3