addMember methods return new CollectionmMember

5 files changed, 19 insertions, 17 deletions

diff --git a/source/com/c2kernel/collection/Aggregation.java b/source/com/c2kernel/collection/Aggregation.java
index 29cb067..e869621 100644
--- a/source/com/c2kernel/collection/Aggregation.java
+++ b/source/com/c2kernel/collection/Aggregation.java
@@ -66,7 +66,7 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
     	return null;

 	}

 

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

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

         throws MembershipException

     {

         // Create new member object

@@ -85,17 +85,18 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
         aggMem.setIsComposite( RelationshipUtils.getIsComposite(entityKey)  );

         mMembers.list.add(aggMem);

         Logger.msg(8, "AggregationDescription::addMember(" + entityKey + ") added to children linked to vertexid " + vertex.getID());

+        return aggMem;

     }

 

 

     @Override

-	public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException

+	public AggregationMember addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException

     {

-        addMember(entityKey, props, classProps, new GraphPoint(100,100*getCounter()), 20, 20);

+        return addMember(entityKey, props, classProps, new GraphPoint(100,100*getCounter()), 20, 20);

     }

 

     @Override

-	public void addMember(int entityKey) throws MembershipException {

+	public AggregationMember addMember(int entityKey) throws MembershipException {

         throw new MembershipException("Aggregations cannot accept arbitrary members without type info");

 

     }

diff --git a/source/com/c2kernel/collection/AggregationInstance.java b/source/com/c2kernel/collection/AggregationInstance.java
index 2eca928..47e7c41 100644
--- a/source/com/c2kernel/collection/AggregationInstance.java
+++ b/source/com/c2kernel/collection/AggregationInstance.java
@@ -23,23 +23,23 @@ public class AggregationInstance extends Aggregation
 

 

     @Override

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

+	public AggregationMember addMember(int entityKey, CastorHashMap props, String classProps)

         throws MembershipException

     {

         if( entityKey!=-1 && exists(entityKey))

             throw new MembershipException(entityKey+" already exists in this collection.");

         else

-            super.addMember(entityKey, props, classProps);

+            return super.addMember(entityKey, props, classProps);

     }

 

     @Override

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

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

         throws MembershipException

     {

         if( entityKey!=-1 && exists(entityKey))

 			throw new MembershipException(entityKey+" already exists in this collection.");

         else

-            super.addMember(entityKey, props, classProps, location, w, h);

+            return super.addMember(entityKey, props, classProps, location, w, h);

     }

 }

 

diff --git a/source/com/c2kernel/collection/Collection.java b/source/com/c2kernel/collection/Collection.java
index f052ce9..b507593 100644
--- a/source/com/c2kernel/collection/Collection.java
+++ b/source/com/c2kernel/collection/Collection.java
@@ -21,12 +21,12 @@ public interface Collection<E extends CollectionMember> extends C2KLocalObject
 

     public CollectionMemberList<E> getMembers();

 

-    public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;

+    public E addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;

 

-    public void addMember(int entityKey) throws MembershipException;

+    public E addMember(int entityKey) throws MembershipException;

 

     public void removeMember(int memberId) throws MembershipException;

 

-    public CollectionMember getMember(int memberId) throws ObjectNotFoundException;

+    public E getMember(int memberId) throws ObjectNotFoundException;

 

 }

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

 

     @Override

-	public void addMember(int entityKey) throws MembershipException {

+	public DependencyMember addMember(int entityKey) throws MembershipException {

         // create member object

         DependencyMember depMember = new DependencyMember();

         depMember.setID(getCounter());

@@ -68,10 +68,11 @@ public class Dependency extends Parent2ChildCollection<DependencyMember>
         depMember.assignEntity(entityKey);

         mMembers.list.add(depMember);

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

+        return depMember;

     }

 

     @Override

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

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

         throws MembershipException

     {

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

@@ -99,6 +100,7 @@ public class Dependency extends Parent2ChildCollection<DependencyMember>
         depMember.assignEntity(entityKey);

         mMembers.list.add(depMember);

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

+        return depMember;

     }

 

     @Override

diff --git a/source/com/c2kernel/collection/Parent2ChildCollection.java b/source/com/c2kernel/collection/Parent2ChildCollection.java
index 09e9f07..c59132e 100644
--- a/source/com/c2kernel/collection/Parent2ChildCollection.java
+++ b/source/com/c2kernel/collection/Parent2ChildCollection.java
@@ -107,9 +107,8 @@ abstract public class Parent2ChildCollection<E extends CollectionMember> impleme
     }

 

     @Override

-	public CollectionMember getMember(int memberId) throws ObjectNotFoundException {

-        for (Object name : mMembers.list) {

-            CollectionMember element = (CollectionMember)name;

+	public E getMember(int memberId) throws ObjectNotFoundException {

+        for (E element : mMembers.list) {

             if (element.getID() == memberId)

                 return element;

         }

@@ -123,6 +122,6 @@ abstract public class Parent2ChildCollection<E extends CollectionMember> impleme
     }

 

     @Override

-	public abstract void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;

+	public abstract E addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;

 

 }