3.0-SNAPSHOT (Will be first open source version)

New StateMachine desc
IssueID #28

1 files changed, 8 insertions, 12 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
index 5a23424..30d014c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
@@ -1,9 +1,7 @@
 package com.c2kernel.lifecycle.instance.predefined;

 

 //Java

-import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.InvalidTransitionException;

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.lifecycle.CompositeActivityDef;

 import com.c2kernel.lifecycle.instance.CompositeActivity;

@@ -20,18 +18,16 @@ public class AddStepsFromDescription extends PredefinedStep
 	}

 

 	@Override

-	public void request( AgentPath agent, int transitionID, String requestData)

-		throws AccessRightsException, InvalidTransitionException, InvalidDataException

-	{

-		Workflow lifeCycle = getWf();

-

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+		

+		

 		Logger.msg(1, "AddStepsFromDescription::request() - Starting ");

 

-		checkAccessRights(agent);

+		Workflow lifeCycle = getWf();

 

 		try

 		{

-

 			Logger.msg(8, "AddStepsFromDescription::request() - data:" + getDataList(requestData)[0]);

 			lifeCycle.getChildGraphModel().removeVertex(lifeCycle.search("workflow/domain"));

 			CompositeActivityDef actDef = (CompositeActivityDef) Gateway.getMarshaller().unmarshall(getDataList(requestData)[0]);

@@ -39,10 +35,10 @@ public class AddStepsFromDescription extends PredefinedStep
 			lifeCycle.initChild(domain, true, new GraphPoint(150, 100));

 			domain.setName("domain");

 			domain.setType(actDef.getName());

-			lifeCycle.run(agent);

-			Gateway.getStorage().put(getItemEntityPath().getSysKey(), lifeCycle, null);

+			lifeCycle.run(agent, itemSysKey);

+			Gateway.getStorage().put(itemSysKey, lifeCycle, null);

 			Logger.msg(1, "AddStepsFromDescription::request() - DONE.");

-			sendEventStoreOutcome(transitionID, requestData, agent);

+			return requestData;

 		}

 		catch (Exception ex)

 		{