Changes and refactoring to gui requirements

Used descriptions must use an integer version.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
index 49541ad..182882c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
@@ -78,7 +78,7 @@ public class Activity extends WfVertex
 			String name = (String)getProperties().get("StateMachineName");

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

 			try {

-				machine = LocalObjectLoader.getStateMachine(name, version);

+				machine = LocalObjectLoader.getStateMachine(name, Integer.parseInt(version));

 			} catch (ObjectNotFoundException ex) {

 				Logger.error(ex);

 				throw new InvalidDataException("Error loading state machine '"+name+"' v"+version);

@@ -148,9 +148,11 @@ public class Activity extends WfVertex
 		try {

 			History hist = (History) Gateway.getStorage().get(itemSysKey, ClusterStorage.HISTORY, this);

 			if (storeOutcome)

-				newEvent = hist.addEvent(agent.getAgentName(), usedRole, transitionID, getName(), getPath(), getType(), schema.docType, schema.docVersion, viewName, state);

+				newEvent = hist.addEvent(agent.getAgentName(), usedRole, getName(), getPath(), getType(), schema.docType, schema.docVersion, 

+						getStateMachine().getName(), getStateMachine().getVersion(), transition, viewName);

 			else 

-				newEvent = hist.addEvent(agent.getAgentName(), usedRole, transitionID, getName(), getPath(), getType(), state);

+				newEvent = hist.addEvent(agent.getAgentName(), usedRole, getName(), getPath(), getType(), 

+						getStateMachine().getName(), getStateMachine().getVersion(), transition);

 			

 			Logger.msg(7, "Activity::auditEvent() - Event:" + newEvent.getName() + " was added to the AuditTrail");