Changes and refactoring to gui requirements

Used descriptions must use an integer version.

3 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
index 5c600e2..2e3d652 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
@@ -60,7 +60,7 @@ public class CreateItemFromDescription extends PredefinedStep
 		String domPath = input[1];

         CompositeActivityDef wfDef;

         String wfDefName = null;

-        String wfDefVer = null;

+        int wfDefVer = -1;

         if (input.length > 2)  // override wf

             wfDefName = input[2];

 

@@ -93,14 +93,14 @@ public class CreateItemFromDescription extends PredefinedStep
             		// get the first member from the wf collection

             		CollectionMember wfMember = members.get(0);

             		wfDefName = wfMember.resolveEntity().getName();

-            		wfDefVer = (String)wfMember.getProperties().get("Version");

+            		wfDefVer = (Integer)wfMember.getProperties().get("Version");

             	}

             }

 

             // load workflow def

             if (wfDefName == null)

                 throw new InvalidDataException("No workflow given or defined", "");

-            if (wfDefVer == null)

+            if (wfDefVer == -1)

             	throw new InvalidDataException("No workflow def version given","");

 

             try {

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
index 44ab041..5c7dc0e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
@@ -73,7 +73,7 @@ public class Import extends PredefinedStep
         TransactionManager storage = Gateway.getStorage();

         

         History hist = new History(itemSysKey, this);

-		Event event = hist.addEvent(agent.getAgentName(), getCurrentAgentRole(), transitionID, getName(), getPath(), getType(), schemaName, schemaVersion, viewpoint, getState(), timestamp);

+		Event event = hist.addEvent(agent.getAgentName(), getCurrentAgentRole(), getName(), getPath(), getType(), schemaName, schemaVersion, getStateMachine().getName(), getStateMachine().getVersion(), getStateMachine().getTransition(transitionID), viewpoint, timestamp);

 

 		try {

 			storage.put(itemSysKey, new Outcome(event.getID(), requestData, schemaName, schemaVersion), this);

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index f089a83..dacb1a3 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -16,7 +16,7 @@ import com.c2kernel.entity.TraceableEntity;
 import com.c2kernel.events.Event;

 import com.c2kernel.events.History;

 import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lifecycle.instance.stateMachine.Transition;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.EntityPath;

 import com.c2kernel.persistency.ClusterStorage;

@@ -86,7 +86,7 @@ public class NewItem extends ModuleImport {
         try {

 

         	// find workflow def

-        	CompositeActivityDef compact = (CompositeActivityDef)LocalObjectLoader.getActDef(workflow, "0");

+        	CompositeActivityDef compact = (CompositeActivityDef)LocalObjectLoader.getActDef(workflow, 0);

             newItem.initialise(

                     agentId,

                     Gateway.getMarshaller().marshall(new PropertyArrayList(properties)),

@@ -129,7 +129,8 @@ public class NewItem extends ModuleImport {
 			}

         	

         	// write new view/outcome/event

-            Event newEvent = hist.addEvent("system", "Admin", PredefinedStep.DONE, "Import", "Import", "Import", thisOutcome.schema, thisOutcome.version, thisOutcome.viewname, PredefinedStep.AVAILABLE);

+        	Transition predefDone = new Transition(0, "Done", 0, 0);

+            Event newEvent = hist.addEvent("system", "Admin", "Import", "Import", "Import", thisOutcome.schema, thisOutcome.version, "PredefinedStep", 0, predefDone, thisOutcome.viewname);

             newOutcome.setID(newEvent.getID());

             impView.setEventId(newEvent.getID());

             try {