From 5d9717de4469714855df01c879a5bf1f0a0bb9cf Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 24 Oct 2013 17:07:46 +0200
Subject: Remove second last mod date.

---
 .../com/c2kernel/lifecycle/instance/Activity.java  | 75 ++++++++++------------
 1 file changed, 33 insertions(+), 42 deletions(-)

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

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
-- 
cgit v1.2.3