From d43164830403245353080f5d6f838ed9f56d9a35 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:48:03 +0100
Subject: 3.0-SNAPSHOT (Will be first open source version) New StateMachine
 desc IssueID #28

---
 .../instance/predefined/WriteProperty.java         | 50 ++++++++--------------
 1 file changed, 18 insertions(+), 32 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
index 77a0b43..1eef4f5 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
@@ -11,11 +11,8 @@
 
 package com.c2kernel.lifecycle.instance.predefined;
 
-import com.c2kernel.common.AccessRightsException;
 import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.EntityPath;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.property.Property;
 import com.c2kernel.utils.Logger;
@@ -37,41 +34,30 @@ public class WriteProperty extends PredefinedStep
 
 	//requestdata is xmlstring
     @Override
-	public void request(  AgentPath agent, int transitionID, String requestData)
-        throws AccessRightsException,
-               InvalidTransitionException,
-               InvalidDataException
-    {
+	protected String runActivityLogic(AgentPath agent, int itemSysKey,
+			int transitionID, String requestData) throws InvalidDataException {
 
         Logger.msg(1, "WriteProperty::request() - Starting.");
 
-        checkAccessRights(agent);
-        EntityPath entityPath = getItemEntityPath();
-
-        if (entityPath!=null)
+        String[] params = getDataList(requestData);
+        if (params.length != 2)
+            throw new InvalidDataException("WriteProperty::request() - need 2 params - name and value", "");
+        try
         {
-            String[] params = getDataList(requestData);
-            if (params.length != 2)
-                throw new InvalidDataException("WriteProperty::request() - need 2 params - name and value", "");
-            try
-            {
-
-                Logger.msg(5, "WriteProperty::request() - name:" + params[0] +" val:"+params[1]);
 
-                Property newProp = new Property(params[0], params[1]);
-				Gateway.getStorage().put(entityPath.getSysKey(), newProp, null );
-				sendEventStoreOutcome(transitionID, requestData, agent);
-            }
-            catch( Exception ex )
-            {
-                Logger.error("WriteProperty::request() - during unmarshall.");
-                Logger.error(ex);
-                throw new InvalidDataException(ex.toString(), "");
-            }
+            Logger.msg(5, "WriteProperty::request() - name:" + params[0] +" val:"+params[1]);
 
-            Logger.msg(1, "WriteProperty::request() - DONE.");
+            Property newProp = new Property(params[0], params[1]);
+			Gateway.getStorage().put(itemSysKey, newProp, null );
         }
-        else
-            throw new InvalidDataException("EntityPath is null.", "");
+        catch( Exception ex )
+        {
+            Logger.error("WriteProperty::request() - during unmarshall.");
+            Logger.error(ex);
+            throw new InvalidDataException(ex.toString(), "");
+        }
+
+        Logger.msg(1, "WriteProperty::request() - DONE.");
+        return requestData;
     }
 }
-- 
cgit v1.2.3