From d43164830403245353080f5d6f838ed9f56d9a35 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:48:03 +0100
Subject: 3.0-SNAPSHOT (Will be first open source version) New StateMachine
 desc IssueID #28

---
 .../lifecycle/instance/AdvancementCalculator.java       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
index 982d951..6302dc7 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
@@ -3,8 +3,8 @@ package com.c2kernel.lifecycle.instance;
 import java.io.Serializable;
 import java.util.Hashtable;
 
+import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.lifecycle.instance.stateMachine.States;
 //import com.c2kernel.utils.Logger;
 /** @author XSeb74 */
 public class AdvancementCalculator implements Serializable
@@ -28,7 +28,7 @@ public class AdvancementCalculator implements Serializable
 		HasNextMarked = new Hashtable<Vertex, Vertex>();
 		hasprevActive = new Hashtable<String, Vertex>();
 	}
-	public void calculate(CompositeActivity act)
+	public void calculate(CompositeActivity act) throws InvalidDataException
 	{
 //		Logger.debug(0, act.getName()+" >>>>>>>>>");
 		if (act instanceof Workflow)
@@ -58,7 +58,7 @@ public class AdvancementCalculator implements Serializable
 				j++;
         if (j != 0 && j==nexts.length) current.HasNextMarked.put(v, nexts[0]);
 	}
-	private void calc(Vertex v, AdvancementCalculator current)
+	private void calc(Vertex v, AdvancementCalculator current) throws InvalidDataException
 	{
 		if (current.isMarked.get(v) != null && !(v instanceof Join))
 			return;
@@ -87,20 +87,11 @@ public class AdvancementCalculator implements Serializable
 			{
 				current.mCurrentNbActExp += 1;
 				current.mMaximuNbActexp += 1;
-				if (act.getCurrentState() == States.FINISHED)
+				if (act.isFinished())
 				{
 					current.mNbActpassed += 1;
 					current.mNbActpassedWithCurrent += 1;
 				}
-				else if (act.getActive()&&act.getState()<States.REPEATSTATESTART)
-				{
-					current.mIsbranchActive = true;
-					current.mIsbranchFinished = false;
-					current.mHasPrevActive = true;
-//					Logger.debug(0, "set HasprevActive to true " + act.getName());
-					current.mNbActpassedWithCurrent += 1;
-					current.mNbActLeftWithCurrent += 1;
-				}
 				else
 				{
 					current.mIsbranchFinished = false;
-- 
cgit v1.2.3