From e99ed30f6cae36c5f3fa03007d991e67894a01bb Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 23 Jul 2013 09:41:43 +0200
Subject: More

---
 .../com/c2kernel/lifecycle/instance/stateMachine/State.java  | 10 +++++-----
 .../c2kernel/lifecycle/instance/stateMachine/Transition.java | 12 +++++++++++-
 .../lifecycle/instance/stateMachine/TransitionScript.java    |  6 +++---
 3 files changed, 19 insertions(+), 9 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 8ad53bb..0325656 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
@@ -8,7 +8,7 @@ public class State implements Serializable {
 
 	int id;
 	String name;
-	boolean proceeds = false; // If true, this state deactivates the current activity and the lifecycle proceeds
+	boolean finished = false; // If true, this state deactivates the current activity and the lifecycle proceeds
 
 	HashMap<Integer, Transition> possibleTransitions;
 
@@ -33,12 +33,12 @@ public class State implements Serializable {
 		this.id = id;
 	}
 
-	public boolean isProceeds() {
-		return proceeds;
+	public boolean isFinished() {
+		return finished;
 	}
 
-	public void setProceeds(boolean proceeds) {
-		this.proceeds = proceeds;
+	public void setFinished(boolean finished) {
+		this.finished = finished;
 	}
 	
 	public HashMap<Integer, Transition> getPossibleTransitions() {
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 471e72c..b88ddab 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
@@ -29,6 +29,7 @@ public class Transition implements Serializable {
 	
 	// activation properties
 	boolean requiresActive = true; // Whether the activity must be active for this transition to be available
+	boolean finishing; // whether the terminal state is a finishing state;
 	
 	// permissions
 	String roleOverride;
@@ -61,6 +62,7 @@ public class Transition implements Serializable {
 
 	public void setTerminalState(State terminalState) {
 		this.terminalState = terminalState;
+		finishing = terminalState.finished;
 	}
 
 	public String getEnabledProp() {
@@ -74,6 +76,10 @@ public class Transition implements Serializable {
 	public boolean isRequiresActive() {
 		return requiresActive;
 	}
+	
+	public boolean isFinishing() {
+		return finishing;
+	}
 
 	public void setRequiresActive(boolean requiresActive) {
 		this.requiresActive = requiresActive;
@@ -203,7 +209,7 @@ public class Transition implements Serializable {
 	
 	public String getReservation(Activity act, AgentPath agent) {
 		if (reservation == null || reservation.length() == 0)
-			reservation = terminalState.proceeds?"clear":"set";
+			reservation = terminalState.finished?"clear":"set";
 		
 		String reservedAgent = act.getCurrentAgentName();
 		if (reservation.equals("set"))
@@ -242,4 +248,8 @@ public class Transition implements Serializable {
 		else
 			return null;
 	}
+	
+	public boolean hasScript() {
+		return script!=null && script.getScriptName() != null;
+	}
 }
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 80a122a..9585102 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
@@ -5,6 +5,9 @@ public class TransitionScript extends TransitionResource {
 	// script properties
 	String scriptName, scriptVersion; // Name & version of the script to be run by the agent during this transition
 	
+	public TransitionScript() {
+	}
+	
 	public String getScriptName() {
 		return scriptName;
 	}
@@ -21,7 +24,4 @@ public class TransitionScript extends TransitionResource {
 		this.scriptVersion = scriptVersion;
 	}
 
-	public TransitionScript() {
-	}
-
 }
-- 
cgit v1.2.3