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/AddMemberToCollection.java  | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java
index 106a9aa..7153c52 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java
@@ -14,13 +14,10 @@ package com.c2kernel.lifecycle.instance.predefined;
 
 import com.c2kernel.collection.Dependency;
 import com.c2kernel.collection.MembershipException;
-import com.c2kernel.common.AccessRightsException;
 import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.EntityPath;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.ClusterStorageException;
 import com.c2kernel.process.Gateway;
@@ -50,23 +47,17 @@ public class AddMemberToCollection extends PredefinedStep
      * 1 - target entity key
      */
     @Override
-	public void request(AgentPath agent, int transitionID, String requestData)
-        throws AccessRightsException,
-               InvalidTransitionException,
-               InvalidDataException
-    {
-        EntityPath entityPath = getItemEntityPath();
+	protected String runActivityLogic(AgentPath agent, int itemSysKey,
+			int transitionID, String requestData) throws InvalidDataException {
+    	
         String collName;
         int entityKey;
         Dependency dep;
 
         Logger.msg(1, "AddMemberToCollection::request() - Starting.");
 
-        checkAccessRights(agent);
-
         // extract parameters
         try {
-            entityPath = getItemEntityPath();
             String[] params = getDataList(requestData);
             collName = params[0];
             entityKey = Integer.parseInt(params[1]);
@@ -77,7 +68,7 @@ public class AddMemberToCollection extends PredefinedStep
         // load collection
     	C2KLocalObject collObj;
 		try {
-			collObj = Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);
+			collObj = Gateway.getStorage().get(itemSysKey, ClusterStorage.COLLECTION+"/"+collName, null);
 		} catch (ObjectNotFoundException ex) {
 			throw new InvalidDataException("Collection '"+collName+"' not found in this Item", "");
 		} catch (ClusterStorageException ex) {
@@ -95,13 +86,13 @@ public class AddMemberToCollection extends PredefinedStep
         }
 
 		try {
-            Gateway.getStorage().put(entityPath.getSysKey(), dep, null);
+            Gateway.getStorage().put(itemSysKey, dep, null);
         } catch (ClusterStorageException e) {
             Logger.error(e);
             throw new InvalidDataException("Error storing collection", "");
         }
-		sendEventStoreOutcome(transitionID, requestData, agent);
 
         Logger.msg(1, "AddMemberToCollection::request() - DONE.");
+        return requestData;
     }
 }
-- 
cgit v1.2.3