Remove second last mod date.

2 files changed, 36 insertions, 42 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
index bb0ce0d..49541ad 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
@@ -47,8 +47,7 @@ public class Activity extends WfVertex
 	public boolean active = false;

 	/** used in verify() */

 	private boolean loopTested;

-	private GTimeStamp mStartDate;

-	private GTimeStamp mActiveDate;

+	private GTimeStamp mStateDate;

 	private String mType;

 	

 	public Activity()

@@ -56,10 +55,8 @@ public class Activity extends WfVertex
 		super();

 		setProperties(new WfCastorHashMap());

 		mErrors = new Vector<String>(0, 1);

-		mStartDate = new GTimeStamp();

-		mActiveDate = new GTimeStamp();

-		DateUtility.setToNow(mActiveDate);

-		DateUtility.setToNow(mStartDate);

+		mStateDate = new GTimeStamp();

+		DateUtility.setToNow(mStateDate);

 	}

 

 	/** add the activity which id is idNext as next of the current one */

@@ -76,7 +73,7 @@ public class Activity extends WfVertex
 		return new Next(this, vertex);

 	}

 	

-	protected StateMachine getStateMachine() throws InvalidDataException {

+	public StateMachine getStateMachine() throws InvalidDataException {

 		if (machine == null) {

 			String name = (String)getProperties().get("StateMachineName");

 			String version = (String)getProperties().get("StateMachineVersion");

@@ -95,6 +92,11 @@ public class Activity extends WfVertex
 	{

 		return state;

 	}

+	public String getStateName() throws InvalidDataException

+	{

+		return getStateMachine().getState(state).getName();

+	}

+	

 	/** Sets a new State */

 	public void setState(int state)

 	{

@@ -171,11 +173,12 @@ public class Activity extends WfVertex
 			throw new PersistencyException("Exception storing event data");

 		}

 

-		if (newState.isFinished())

+		if (newState.isFinished()) {

 			if (!getProperties().get("Breakpoint").equals(Boolean.TRUE))

 				runNext(agent, itemSysKey);

-			else

-				DateUtility.setToNow(mStartDate);

+		}

+		

+		DateUtility.setToNow(mStateDate);

 		

 		//refresh all the job lists

 		pushJobsToAgents(itemSysKey);

@@ -352,7 +355,7 @@ public class Activity extends WfVertex
 		}

 		else

 		{

-			DateUtility.setToNow(mActiveDate);

+			DateUtility.setToNow(mStateDate);

 			pushJobsToAgents(itemSysKey);

 		}

 	}

@@ -441,43 +444,31 @@ public class Activity extends WfVertex
         if (myRole.hasJobList())

         	new JobPusher(this, itemSysKey, myRole).start();

     }

-

-

-	  /**

-	   * Returns the activeDate.

-	   *

-	   * @return GTimeStamp

-	   */

-	public GTimeStamp getActiveDate()

-	{

-		return mActiveDate;

-	} /**

+	

+	/**

 	   * Returns the startDate.

 	   *

 	   * @return GTimeStamp

 	   */

-	public GTimeStamp getStartDate()

+	public GTimeStamp getStateDate()

 	{

-		return mStartDate;

-	} /**

-	   * Sets the activeDate.

-	   *

-	   * @param activeDate

-	   *            The activeDate to set

-	   */

-	public void setActiveDate(GTimeStamp activeDate)

+		return mStateDate;

+	} 

+	public void setStateDate(GTimeStamp startDate)

 	{

-		mActiveDate = activeDate;

-	} /**

-	   * Sets the startDate.

-	   *

-	   * @param startDate

-	   *            The startDate to set

-	   */

-	public void setStartDate(GTimeStamp startDate)

-	{

-		mStartDate = startDate;

-	} /**

+		mStateDate = startDate;

+	}

+	

+	@Deprecated

+	public void setActiveDate(GTimeStamp date)

+	{ } 

+	@Deprecated

+	public void setStartDate(GTimeStamp date)

+	{ 

+		setStateDate(date);

+	} 

+	

+ /**

 	   * Returns the type.

 	   *

 	   * @return String

diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml
index f003a32..d0f2e2c 100644
--- a/src/main/resources/mapFiles/LifeCycleMap.xml
+++ b/src/main/resources/mapFiles/LifeCycleMap.xml
@@ -57,6 +57,9 @@
 		<field name="eventIds" type="string" transient="true">

 			<bind-xml name="eventIds" node="element"/>

 		</field>

+		<field name="stateDate" type="com.c2kernel.common.GTimeStamp" direct="false">

+			<bind-xml name="stateDate" node="element"/>

+		</field>

 		<field name="startDate" type="com.c2kernel.common.GTimeStamp" direct="false">

 			<bind-xml name="startDate" node="element"/>

 		</field>