From 0f892332b19ba8741a7db66a5c4daa386b2b5c1e Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 25 Oct 2013 17:27:29 +0200
Subject: Changes and refactoring to gui requirements Used descriptions must
 use an integer version.

---
 src/main/java/com/c2kernel/events/History.java | 44 ++++++++++++++++----------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'src/main/java/com/c2kernel/events/History.java')

diff --git a/src/main/java/com/c2kernel/events/History.java b/src/main/java/com/c2kernel/events/History.java
index 2eef8de..8ccd97a 100644
--- a/src/main/java/com/c2kernel/events/History.java
+++ b/src/main/java/com/c2kernel/events/History.java
@@ -2,6 +2,7 @@ package com.c2kernel.events;
 
 
 import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.lifecycle.instance.stateMachine.Transition;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.RemoteMap;
 import com.c2kernel.utils.Logger;
@@ -24,36 +25,41 @@ public class History extends RemoteMap<Event> {
         super(sysKey, ClusterStorage.HISTORY, locker);
     }
     public Event addEvent(String agentName, String agentRole,
-            int stepTransitionId,
             String stepName,
             String stepPath,
             String stepType,
-            int stepCurrentState) {
-    	return addEvent(agentName, agentRole, stepTransitionId, stepName, stepPath, stepType, null, null, null, stepCurrentState);
+            String stateMachineName,
+            Integer stateMachineVersion,
+            Transition transition) {
+    	return addEvent(agentName, agentRole, stepName, stepPath, stepType, null, null, stateMachineName, stateMachineVersion, transition, null);
     }
 
     public Event addEvent(String agentName, String agentRole,
-                    int stepTransitionId,
                     String stepName,
                     String stepPath,
                     String stepType,
                     String schemaName,
                     Integer schemaVersion,
-                    String viewName,
-                    int stepCurrentState) {
-        Logger.msg(7, "History.addEvent() - creating new event for "+stepTransitionId+" on "+stepName+" in "+mSysKey);
+                    String stateMachineName,
+                    Integer stateMachineVersion,
+                    Transition transition,
+                    String viewName) {
+        Logger.msg(7, "History.addEvent() - creating new event for "+transition.getName()+" on "+stepName+" in "+mSysKey);
         Event newEvent = new Event();
         newEvent.setEntitySystemKey(mSysKey);
         newEvent.setAgentName(agentName);
         newEvent.setAgentRole(agentRole);
-        newEvent.setTransition(stepTransitionId);
         newEvent.setStepName(stepName);
         newEvent.setStepPath(stepPath);
         newEvent.setStepType(stepType);
         newEvent.setSchemaName(schemaName);
         newEvent.setSchemaVersion(schemaVersion);
         newEvent.setViewName(viewName);
-        newEvent.setCurrentState(stepCurrentState);
+        newEvent.setOriginState(transition.getOriginStateId());
+        newEvent.setTargetState(transition.getTargetStateId());
+        newEvent.setTransition(transition.getId());
+        newEvent.setStateMachineName(stateMachineName);
+        newEvent.setStateMachineVersion(stateMachineVersion);
         newEvent.setTimeStamp(Event.getGMT());
         return storeNewEvent(newEvent);
     }
@@ -63,34 +69,40 @@ public class History extends RemoteMap<Event> {
             String stepName,
             String stepPath,
             String stepType,
-            int stepCurrentState,
+            String stateMachineName,
+            Integer stateMachineVersion,
+            Transition transition,
             String timeString) throws InvalidDataException {
-    	return addEvent(agentName, agentRole, stepTransitionId, stepName, stepPath, stepType, null, null, null, stepCurrentState, timeString);
+    	return addEvent(agentName, agentRole, stepName, stepPath, stepType, null, null, stateMachineName, stateMachineVersion, transition, null, timeString);
     }
     	
     public Event addEvent(String agentName, String agentRole,
-                    int stepTransitionId,
                     String stepName,
                     String stepPath,
                     String stepType,
                     String schemaName,
                     Integer schemaVersion,
+                    String stateMachineName,
+                    Integer stateMachineVersion,
+                    Transition transition,
                     String viewName,
-                    int stepCurrentState,
                     String timeString) throws InvalidDataException {
-        Logger.msg(7, "History.addEvent() - creating new event for "+stepTransitionId+" on "+stepName+" in "+mSysKey);
+        Logger.msg(7, "History.addEvent() - creating new event for "+transition.getName()+" on "+stepName+" in "+mSysKey);
         Event newEvent = new Event();
         newEvent.setEntitySystemKey(mSysKey);
         newEvent.setAgentName(agentName);
         newEvent.setAgentRole(agentRole);
-        newEvent.setTransition(stepTransitionId);
         newEvent.setStepName(stepName);
         newEvent.setStepPath(stepPath);
         newEvent.setStepType(stepType);
         newEvent.setSchemaName(schemaName);
         newEvent.setSchemaVersion(schemaVersion);
         newEvent.setViewName(viewName);
-        newEvent.setCurrentState(stepCurrentState);
+        newEvent.setOriginState(transition.getOriginStateId());
+        newEvent.setTargetState(transition.getTargetStateId());
+        newEvent.setTransition(transition.getId());
+        newEvent.setStateMachineName(stateMachineName);
+        newEvent.setStateMachineVersion(stateMachineVersion);
         newEvent.setTimeString(timeString);
         return storeNewEvent(newEvent);
     }
-- 
cgit v1.2.3