Replaced int sysKey Item identifier with UUID, which is now portable.

ItemPath objects are now used to identify Items throughout the kernel,
replacing ints and Integers.

1 files changed, 9 insertions, 13 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
index 44d4c5d..fe4e1c8 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
@@ -13,8 +13,11 @@ package com.c2kernel.lifecycle.instance.predefined;
 

 

 

+import java.util.Arrays;

+

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -34,28 +37,21 @@ public class RemoveC2KObject extends PredefinedStep
 

 	//requestdata is xmlstring

     @Override

-	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+	protected String runActivityLogic(AgentPath agent, ItemPath item,

 			int transitionID, String requestData) throws InvalidDataException {

 

-        Logger.msg(1, "RemoveC2KObject::request() - Starting.");

+    	String[] params = getDataList(requestData);

+        if (Logger.doLog(3)) Logger.msg(3, "RemoveC2KObject: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));

 

-        String path = null;

         try

         {

-            path  = getDataList(requestData)[0];

-

-            Logger.msg(5, "RemoveC2KObject::request() - path:"+path);

-

-            Gateway.getStorage().remove( itemSysKey, path, null );

+            String path  = params[0];

+            Gateway.getStorage().remove( item, path, null );

         }

         catch( Exception ex )

         {

-            Logger.error("RemoveC2KObject::request() - invalid data - path:"+path);

-            Logger.error(ex);

-            throw new InvalidDataException(ex.toString(), "");

+            throw unknownException(ex);

         }

-

-        Logger.msg(1, "RemoveC2KObject::request() - DONE.");

         return requestData;

     }

 }