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

1 files changed, 6 insertions, 6 deletions

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();