From 9dbce79cb5798feb92c4862e694ceeb8799ba284 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 31 Jan 2013 21:02:47 +0100
Subject: Added ViewName field to Event. Filled in with the Viewpoint name if
 specified in the Activity properties, making it possible to derive previous
 states of the Viewpoint. Closes #96 Cleanup outcome storing code. Throw an
 exception if SchemaType filled in and outcome is empty.

---
 src/main/java/com/c2kernel/events/Event.java   | 18 ++++++++++++++++--
 src/main/java/com/c2kernel/events/History.java |  4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/events/Event.java b/src/main/java/com/c2kernel/events/Event.java
index b52ac7a..9936f49 100644
--- a/src/main/java/com/c2kernel/events/Event.java
+++ b/src/main/java/com/c2kernel/events/Event.java
@@ -27,8 +27,8 @@ import com.c2kernel.persistency.ClusterStorage;
 public class Event implements C2KLocalObject
 {
 
-    int mID, mEntitySystemKey, mCurrentState, mTransition;
-    String mName, mStepName, mStepPath, mStepType, mAgentName, mAgentRole;
+	int mID, mEntitySystemKey, mCurrentState, mTransition;
+    String mName, mStepName, mStepPath, mStepType, mViewName, mAgentName, mAgentRole;
     GTimeStamp mTimeStamp;
 
     public void setID( int id ) {
@@ -80,6 +80,13 @@ public class Event implements C2KLocalObject
 	{
 		mStepType = type;
 	}
+	
+	/**
+	 * @param viewName the viewName to set
+	 */
+	public void setViewName(String viewName) {
+		this.mViewName = viewName;
+	}
 
     public void setCurrentState(int state)
     {
@@ -155,6 +162,13 @@ public class Event implements C2KLocalObject
 	{
 		return mStepType;
 	}
+	
+    /**
+	 * @return the mViewName
+	 */
+	public String getViewName() {
+		return mViewName;
+	}
 
     public int getCurrentState()
     {
diff --git a/src/main/java/com/c2kernel/events/History.java b/src/main/java/com/c2kernel/events/History.java
index 868eaea..88f5460 100644
--- a/src/main/java/com/c2kernel/events/History.java
+++ b/src/main/java/com/c2kernel/events/History.java
@@ -28,6 +28,7 @@ public class History extends RemoteMap<Event> {
                     String stepName,
                     String stepPath,
                     String stepType,
+                    String viewName,
                     int stepCurrentState) {
         Logger.msg(7, "History.addEvent() - creating new event for "+stepTransitionId+" on "+stepName+" in "+mSysKey);
         Event newEvent = new Event();
@@ -38,6 +39,7 @@ public class History extends RemoteMap<Event> {
         newEvent.setStepName(stepName);
         newEvent.setStepPath(stepPath);
         newEvent.setStepType(stepType);
+        newEvent.setViewName(viewName);
         newEvent.setCurrentState(stepCurrentState);
         newEvent.setTimeStamp(Event.getGMT());
         return storeNewEvent(newEvent);
@@ -48,6 +50,7 @@ public class History extends RemoteMap<Event> {
                     String stepName,
                     String stepPath,
                     String stepType,
+                    String viewName,
                     int stepCurrentState,
                     String timeString) throws Exception {
         Logger.msg(7, "History.addEvent() - creating new event for "+stepTransitionId+" on "+stepName+" in "+mSysKey);
@@ -59,6 +62,7 @@ public class History extends RemoteMap<Event> {
         newEvent.setStepName(stepName);
         newEvent.setStepPath(stepPath);
         newEvent.setStepType(stepType);
+        newEvent.setViewName(viewName);
         newEvent.setCurrentState(stepCurrentState);
         newEvent.setTimeString(timeString);
         return storeNewEvent(newEvent);
-- 
cgit v1.2.3