Agent now extends Item, so they can have workflows. All traces of the

old 'Entity' superclasses should be removed, including proxies and
paths. Very large change, breaks API compatibility with CRISTAL 2.x.
Fixes #135

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
index 3cc9f7c..38638cd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java
@@ -51,7 +51,7 @@ public class RemoveSlotFromCollection extends PredefinedStep
 

         String collName;

         int slotNo;

-        int entityKey = -1;

+        int sysKey = -1;

         Collection<? extends CollectionMember> coll;

 

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

@@ -61,12 +61,12 @@ public class RemoveSlotFromCollection extends PredefinedStep
             String[] params = getDataList(requestData);

             collName = params[0];

             slotNo = params[1].length()>0?Integer.parseInt(params[1]):-1;

-            if (params.length>2) entityKey = params[2].length()>0?Integer.parseInt(params[2]):-1;

+            if (params.length>2) sysKey = params[2].length()>0?Integer.parseInt(params[2]):-1;

         } catch (Exception e) {

             throw new InvalidDataException("Invalid parameters", "");

         }

         

-        if (slotNo == -1 && entityKey == -1)

+        if (slotNo == -1 && sysKey == -1)

         	throw new InvalidDataException("Must give either slot number or entity key", "");

 

         // load collection

@@ -81,7 +81,7 @@ public class RemoveSlotFromCollection extends PredefinedStep
 

         if (slotNo == -1) { // find slot from entity key

         	for (CollectionMember member : coll.getMembers().list) {

-        		if (member.getEntityKey() == entityKey) {

+        		if (member.getSystemKey() == sysKey) {

         			slotNo = member.getID();

         			break;

         		}