From a1f0ecbb6a2bea6aa214322c412af2f3c5ce124b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 7 May 2014 17:33:13 +0200
Subject: 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

---
 .../com/c2kernel/collection/DependencyMember.java  | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/main/java/com/c2kernel/collection/DependencyMember.java')

diff --git a/src/main/java/com/c2kernel/collection/DependencyMember.java b/src/main/java/com/c2kernel/collection/DependencyMember.java
index 4ca2090..169f9ea 100644
--- a/src/main/java/com/c2kernel/collection/DependencyMember.java
+++ b/src/main/java/com/c2kernel/collection/DependencyMember.java
@@ -3,9 +3,9 @@ package com.c2kernel.collection;
 import java.util.StringTokenizer;
 
 import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.EntityProxy;
-import com.c2kernel.lookup.EntityPath;
-import com.c2kernel.lookup.InvalidEntityPathException;
+import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.lookup.ItemPath;
+import com.c2kernel.lookup.InvalidItemPathException;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.property.Property;
@@ -23,8 +23,8 @@ import com.c2kernel.utils.Logger;
 public class DependencyMember implements CollectionMember
 {
 
-    private int mEntityKey    = -1;
-    private EntityProxy mEntity = null;
+    private int mSystemKey    = -1;
+    private ItemProxy mItem = null;
     private int mId			= -1;
 	private CastorHashMap mProperties = null;
 	private String mClassProps;
@@ -35,22 +35,22 @@ public class DependencyMember implements CollectionMember
     **************************************************************************/
     public DependencyMember()
     {
-        mEntityKey = -1;
+        mSystemKey = -1;
         mProperties = new CastorHashMap();
     }
 
 
     @Override
-	public void setEntityKey(int entityKey)
+	public void setSystemKey(int sysKey)
     {
-        mEntityKey = entityKey;
-        mEntity = null;
+        mSystemKey = sysKey;
+        mItem = null;
     }
 
     @Override
-	public int getEntityKey()
+	public int getSystemKey()
     {
-        return mEntityKey;
+        return mSystemKey;
     }
 
 	@Override
@@ -97,9 +97,9 @@ public class DependencyMember implements CollectionMember
     }
 
     @Override
-	public void assignEntity(int entityKey) throws MembershipException
+	public void assignItem(int ItemKey) throws MembershipException
     {
-        if (entityKey > -1) {
+        if (ItemKey > -1) {
             if (mClassProps == null || getProperties() == null)
                 throw new MembershipException("ClassProps not yet set. Cannot check membership validity.");
 
@@ -110,11 +110,11 @@ public class DependencyMember implements CollectionMember
                 String aClassProp = sub.nextToken();
                 try {
                     String memberValue = (String)getProperties().get(aClassProp);
-                    Property entityProperty = (Property)Gateway.getStorage().get(entityKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);
-                    if (entityProperty == null)
-                        throw new MembershipException("Property "+aClassProp+ " does not exist for entityKey=" + entityKey );
-                    if (!entityProperty.getValue().equalsIgnoreCase(memberValue))
-                        throw new MembershipException("DependencyMember::checkProperty() Values of mandatory prop "+aClassProp+" do not match " + entityProperty.getValue()+"!="+memberValue);
+                    Property ItemProperty = (Property)Gateway.getStorage().get(ItemKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);
+                    if (ItemProperty == null)
+                        throw new MembershipException("Property "+aClassProp+ " does not exist for ItemKey=" + ItemKey );
+                    if (!ItemProperty.getValue().equalsIgnoreCase(memberValue))
+                        throw new MembershipException("DependencyMember::checkProperty() Values of mandatory prop "+aClassProp+" do not match " + ItemProperty.getValue()+"!="+memberValue);
                  }
                 catch (Exception ex)
                 {
@@ -124,27 +124,27 @@ public class DependencyMember implements CollectionMember
             }
         }
 
-        mEntityKey = entityKey;
-        mEntity = null;
+        mSystemKey = ItemKey;
+        mItem = null;
     }
 
     @Override
-	public void clearEntity() {
-        mEntityKey = -1;
-        mEntity = null;
+	public void clearItem() {
+        mSystemKey = -1;
+        mItem = null;
     }
 
     @Override
-	public EntityProxy resolveEntity() throws ObjectNotFoundException {
-        if (mEntity == null) {
+	public ItemProxy resolveItem() throws ObjectNotFoundException {
+        if (mItem == null) {
             try {
-                EntityPath path = new EntityPath(mEntityKey);
-                mEntity = Gateway.getProxyManager().getProxy(path);
-            } catch (InvalidEntityPathException ex) {
+                ItemPath path = new ItemPath(mSystemKey);
+                mItem = Gateway.getProxyManager().getProxy(path);
+            } catch (InvalidItemPathException ex) {
                 throw new ObjectNotFoundException("No member defined", "");
             }
         }
-        return mEntity;
+        return mItem;
 
     }
 
-- 
cgit v1.2.3