Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

9 files changed, 102 insertions, 102 deletions

diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/com/c2kernel/collection/Aggregation.java
index 063eb77..f2ef710 100644
--- a/src/main/java/com/c2kernel/collection/Aggregation.java
+++ b/src/main/java/com/c2kernel/collection/Aggregation.java
@@ -6,8 +6,8 @@ import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.graph.model.GraphModel;

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.lookup.EntityPath;

-import com.c2kernel.lookup.InvalidEntityPathException;

+import com.c2kernel.lookup.ItemPath;

+import com.c2kernel.lookup.InvalidItemPathException;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.CastorHashMap;

@@ -50,12 +50,12 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
         return mVertexTypeNameAndConstructionInfo;

     }

 

-    public boolean exists(int entityKey)

+    public boolean exists(int sysKey)

     {

     	for (int i=0; i<size(); i++)

     	{

     		AggregationMember element = mMembers.list.get(i);

-            if (element.getEntityKey() == entityKey)

+            if (element.getSystemKey() == sysKey)

                 return true;

     	}

     	return false;

@@ -96,15 +96,15 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
             Logger.msg(8, "AggregationDescription::addSlot new slot linked to vertexid " + vertex.getID());

             return aggMem;

         }	

-    public AggregationMember addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)

+    public AggregationMember addMember(int sysKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)

         throws MembershipException

     {

     	AggregationMember aggMem = addSlot(props, classProps, location, w, h);

-        if (entityKey > -1) { // some clients use this method when not setting a member

-        	aggMem.assignEntity(entityKey);

-        	aggMem.setIsComposite( getIsComposite(entityKey, getName())  );

+        if (sysKey > -1) { // some clients use this method when not setting a member

+        	aggMem.assignItem(sysKey);

+        	aggMem.setIsComposite( getIsComposite(sysKey, getName())  );

         }

-        Logger.msg(8, "AggregationDescription::addMember(" + entityKey + ") assigned to new slot " + aggMem.getID());

+        Logger.msg(8, "AggregationDescription::addMember(" + sysKey + ") assigned to new slot " + aggMem.getID());

         return aggMem;

     }

 

@@ -130,7 +130,7 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
 	public void removeMember(int memberId) throws MembershipException {

         for (AggregationMember element : mMembers.list) {

             if (element.getID() == memberId) {

-                element.clearEntity();

+                element.clearItem();

                 mLayout.removeVertex(getLayout().getVertexById(memberId));

                 return;

             }

@@ -142,11 +142,11 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
 	{

         if (entityKey == -1) return false;

        	try {

-			for(String collName: Gateway.getProxyManager().getProxy(new EntityPath(entityKey)).getContents(ClusterStorage.COLLECTION) )

+			for(String collName: Gateway.getProxyManager().getProxy(new ItemPath(entityKey)).getContents(ClusterStorage.COLLECTION) )

 					if (name == null || name.equals(collName)) return true;

 		} catch (ObjectNotFoundException e) {

 			return false;

-		} catch (InvalidEntityPathException e) {

+		} catch (InvalidItemPathException e) {

 			return false;

 		}

 		return false;

diff --git a/src/main/java/com/c2kernel/collection/AggregationDescription.java b/src/main/java/com/c2kernel/collection/AggregationDescription.java
index 6021ed6..0587491 100644
--- a/src/main/java/com/c2kernel/collection/AggregationDescription.java
+++ b/src/main/java/com/c2kernel/collection/AggregationDescription.java
@@ -35,7 +35,7 @@ public class AggregationDescription extends Aggregation implements CollectionDes
     	{

     		AggregationMember mem = mMembers.list.get(i);

 			//get the propdesc of the member item

-			PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(mem.getEntityKey());

+			PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(mem.getSystemKey());

 			if (pdList!=null)

 			{

 				//create the new props of the member object

@@ -48,7 +48,7 @@ public class AggregationDescription extends Aggregation implements CollectionDes
 			}

 			else

 			{

-				Logger.error("AggregationDescription::newInstance() There is no PropertyDescription. Cannot instantiate. " + mem.getEntityKey());

+				Logger.error("AggregationDescription::newInstance() There is no PropertyDescription. Cannot instantiate. " + mem.getSystemKey());

 				return null;

 			}

 

diff --git a/src/main/java/com/c2kernel/collection/AggregationMember.java b/src/main/java/com/c2kernel/collection/AggregationMember.java
index 49b9ab7..67e92ad 100644
--- a/src/main/java/com/c2kernel/collection/AggregationMember.java
+++ b/src/main/java/com/c2kernel/collection/AggregationMember.java
@@ -3,10 +3,10 @@ package com.c2kernel.collection;
 import java.util.StringTokenizer;

 

 import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.EntityProxy;

+import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.graph.model.GraphableVertex;

-import com.c2kernel.lookup.EntityPath;

-import com.c2kernel.lookup.InvalidEntityPathException;

+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;

@@ -24,11 +24,11 @@ import com.c2kernel.utils.Logger;
 public class AggregationMember extends GraphableVertex implements CollectionMember

 {

 

-    private int                  mEntityKey    = -1;

-    private EntityProxy          mEntity       = null;

+    private int                  mSystemKey    = -1;

+    private ItemProxy          mItem       = null;

     private Aggregation          mCollection  = null;

 	private String 			     mClassProps = null;

-	String entityName;

+	String ItemName;

 

 

    /**************************************************************************

@@ -37,14 +37,14 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
     public AggregationMember()

     {

         super();

-        mEntityKey = -1;

+        mSystemKey = -1;

         mCollection = null;

     }

 

     @Override

-	public void setEntityKey(int entityKey) {

-        mEntityKey = entityKey;

-        entityName = null;

+	public void setSystemKey(int sysKey) {

+        mSystemKey = sysKey;

+        ItemName = null;

     }

 

     public void setCollection(Aggregation aggregation)

@@ -59,9 +59,9 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
     }

 

     @Override

-	public int getEntityKey()

+	public int getSystemKey()

     {

-        return mEntityKey;

+        return mSystemKey;

     }

 

     public Aggregation getCollection()

@@ -76,9 +76,9 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
     }

 

     @Override

-	public void assignEntity(int entityKey) throws MembershipException

+	public void assignItem(int sysKey) throws MembershipException

     {

-        if (entityKey > -1) {

+        if (sysKey > -1) {

             if (mClassProps == null || getProperties() == null)

                 throw new MembershipException("ClassProps not yet set. Cannot check membership validity.");

 

@@ -89,11 +89,11 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
                 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() == null || !entityProperty.getValue().equalsIgnoreCase(memberValue))

-                        throw new MembershipException("Value of mandatory prop "+aClassProp+" does not match: " + entityProperty.getValue()+"!="+memberValue);

+                    Property ItemProperty = (Property)Gateway.getStorage().get(sysKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);

+                    if (ItemProperty == null)

+                        throw new MembershipException("Property "+aClassProp+ " does not exist for sysKey=" + sysKey );

+                    if (ItemProperty.getValue() == null || !ItemProperty.getValue().equalsIgnoreCase(memberValue))

+                        throw new MembershipException("Value of mandatory prop "+aClassProp+" does not match: " + ItemProperty.getValue()+"!="+memberValue);

                  }

                 catch (MembershipException ex) {

                     throw ex;

@@ -106,46 +106,46 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
             }

         }

 

-        mEntityKey = entityKey;

-        mEntity       = null;

-        entityName    = null;

+        mSystemKey = sysKey;

+        mItem       = null;

+        ItemName    = 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;

 

     }

 

-    public String getEntityName() {

-    	if (entityName == null) {

-    		if (mEntityKey > -1) {

+    public String getItemName() {

+    	if (ItemName == null) {

+    		if (mSystemKey > -1) {

         		try {

-        			entityName = resolveEntity().getName();

+        			ItemName = resolveItem().getName();

         		} catch (ObjectNotFoundException ex) {

         			Logger.error(ex);

-        			entityName = "Error ("+mEntityKey+")";

+        			ItemName = "Error ("+mSystemKey+")";

         		}

     		}

     		else

-    			entityName = "Empty";

+    			ItemName = "Empty";

     	}

 

-    	return entityName;

+    	return ItemName;

     }

 

 }

diff --git a/src/main/java/com/c2kernel/collection/CollectionArrayList.java b/src/main/java/com/c2kernel/collection/CollectionArrayList.java
index 586f99f..d91ec20 100644
--- a/src/main/java/com/c2kernel/collection/CollectionArrayList.java
+++ b/src/main/java/com/c2kernel/collection/CollectionArrayList.java
@@ -4,23 +4,23 @@ import java.util.ArrayList;
 

 import com.c2kernel.utils.CastorArrayList;

 

-public class CollectionArrayList extends CastorArrayList<Collection<CollectionMember>> {

+public class CollectionArrayList extends CastorArrayList<Collection<? extends CollectionMember>> {

     public CollectionArrayList()

     {

         super();

     }

 

-    public CollectionArrayList(ArrayList<Collection<CollectionMember>> aList)

+    public CollectionArrayList(ArrayList<Collection<? extends CollectionMember>> aList)

     {

         super();

-        for (Collection<CollectionMember> coll : aList) {

+        for (Collection<? extends CollectionMember> coll : aList) {

 			put(coll);

 		}

     }

 

     /** Overwrite */

-    public void put(Collection<CollectionMember> c) {

-    	for (Collection<CollectionMember> thisColl : list) {

+    public void put(Collection<? extends CollectionMember> c) {

+    	for (Collection<? extends CollectionMember> thisColl : list) {

 			if (thisColl.getName().equals(c.getName())) {

 				list.remove(thisColl);

 				break;

diff --git a/src/main/java/com/c2kernel/collection/CollectionMember.java b/src/main/java/com/c2kernel/collection/CollectionMember.java
index 0b21e30..ff5d1cd 100644
--- a/src/main/java/com/c2kernel/collection/CollectionMember.java
+++ b/src/main/java/com/c2kernel/collection/CollectionMember.java
@@ -3,7 +3,7 @@ package com.c2kernel.collection;
 import java.io.Serializable;

 

 import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.EntityProxy;

+import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.utils.CastorHashMap;

 

 /**************************************************************************

@@ -20,12 +20,12 @@ import com.c2kernel.utils.CastorHashMap;
 

 public interface CollectionMember extends Serializable {

 

-	public void setEntityKey(int entityKey) throws MembershipException;

-	public int getEntityKey();

+	public void setSystemKey(int sysKey) throws MembershipException;

+	public int getSystemKey();

 

-    public void assignEntity(int entityKey) throws MembershipException;

-    public void clearEntity();

-    public EntityProxy resolveEntity() throws ObjectNotFoundException;

+    public void assignItem(int ItemKey) throws MembershipException;

+    public void clearItem();

+    public ItemProxy resolveItem() throws ObjectNotFoundException;

 

 	public void setID(int Id);

 	public int getID();

diff --git a/src/main/java/com/c2kernel/collection/Dependency.java b/src/main/java/com/c2kernel/collection/Dependency.java
index cbbf28c..c90fa9d 100644
--- a/src/main/java/com/c2kernel/collection/Dependency.java
+++ b/src/main/java/com/c2kernel/collection/Dependency.java
@@ -57,7 +57,7 @@ public class Dependency extends Parent2ChildCollection<DependencyMember>
     }

 

     @Override

-	public DependencyMember addMember(int entityKey) throws MembershipException {

+	public DependencyMember addMember(int sysKey) throws MembershipException {

         // create member object

         DependencyMember depMember = new DependencyMember();

         depMember.setID(getCounter());

@@ -65,14 +65,14 @@ public class Dependency extends Parent2ChildCollection<DependencyMember>
         depMember.setClassProps(mClassProps);

 

         // assign entity

-        depMember.assignEntity(entityKey);

+        depMember.assignItem(sysKey);

         mMembers.list.add(depMember);

-        Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");

+        Logger.msg(8, "Dependency::addMember(" + sysKey + ") added to children.");

         return depMember;

     }

 

     @Override

-	public DependencyMember addMember(int entityKey, CastorHashMap props, String classProps)

+	public DependencyMember addMember(int sysKey, CastorHashMap props, String classProps)

         throws MembershipException

     {

         if (classProps != null && !classProps.equals(mClassProps))

@@ -97,9 +97,9 @@ public class Dependency extends Parent2ChildCollection<DependencyMember>
         depMember.setClassProps(mClassProps);

 

         // assign entity

-        depMember.assignEntity(entityKey);

+        depMember.assignItem(sysKey);

         mMembers.list.add(depMember);

-        Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");

+        Logger.msg(8, "Dependency::addMember(" + sysKey + ") added to children.");

         return depMember;

     }

 

diff --git a/src/main/java/com/c2kernel/collection/DependencyDescription.java b/src/main/java/com/c2kernel/collection/DependencyDescription.java
index 681e98b..79b4880 100644
--- a/src/main/java/com/c2kernel/collection/DependencyDescription.java
+++ b/src/main/java/com/c2kernel/collection/DependencyDescription.java
@@ -23,7 +23,7 @@ public class DependencyDescription extends Dependency implements CollectionDescr
 		Dependency newDep = new Dependency(depName);

 		if (mMembers.list.size() == 1) { // constrain the members based on the property description

 			DependencyMember mem = mMembers.list.get(0);

-			PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(mem.getEntityKey());

+			PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(mem.getSystemKey());

 			if (pdList!=null) {

 				newDep.setProperties(PropertyUtility.createProperty(pdList));

 				newDep.setClassProps(pdList.getClassProps());

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;

 

     }

 

diff --git a/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java b/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java
index d59b613..814cca8 100644
--- a/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java
+++ b/src/main/java/com/c2kernel/collection/Parent2ChildCollection.java
@@ -88,10 +88,10 @@ abstract public class Parent2ChildCollection<E extends CollectionMember> impleme
     	mMembers = newMembers;

     }

 

-    public boolean contains(int entityKey) {

+    public boolean contains(int sysKey) {

         for (Object name : mMembers.list) {

             CollectionMember element = (CollectionMember)name;

-            if (element.getEntityKey() == entityKey)

+            if (element.getSystemKey() == sysKey)

                 return true;

         }

         return false;

@@ -102,7 +102,7 @@ abstract public class Parent2ChildCollection<E extends CollectionMember> impleme
     	for (int i=0; i<size(); i++)

     	{

     		CollectionMember element = mMembers.list.get(i);

-            if (element.getEntityKey() == -1)

+            if (element.getSystemKey() == -1)

                 return false;

     	}

     	return true;