Modules and entitycreation support Aggregations, collection properties

and class identifiers

1 files changed, 31 insertions, 2 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
index 2de12e0..b99e898 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
@@ -2,6 +2,15 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 import java.util.ArrayList;

 

+import com.c2kernel.collection.MembershipException;

+import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.graph.model.GraphPoint;

+import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.property.PropertyDescription;

+import com.c2kernel.property.PropertyDescriptionList;

+import com.c2kernel.property.PropertyUtility;

+import com.c2kernel.utils.CastorHashMap;

+

 public class Aggregation implements java.io.Serializable {

 

     public boolean isDescription;

@@ -19,7 +28,27 @@ public class Aggregation implements java.io.Serializable {
         this.isDescription = isDescription;

     }

 

-    public com.c2kernel.collection.Aggregation create() {

-        return new com.c2kernel.collection.AggregationInstance();

+    public com.c2kernel.collection.Aggregation create() throws MembershipException, ObjectNotFoundException {

+        com.c2kernel.collection.Aggregation newAgg = isDescription?new com.c2kernel.collection.AggregationDescription(name):new com.c2kernel.collection.AggregationInstance(name);

+        newAgg.setName(name);

+        for (AggregationMember thisMem : aggregationMemberList) {

+            CastorHashMap props = new CastorHashMap(); 

+            StringBuffer classProps = new StringBuffer();

+            if (thisMem.itemDescriptionPath != null && thisMem.itemDescriptionPath.length()>0) {

+                 PropertyDescriptionList propList = PropertyUtility.getPropertyDescriptionOutcome(new DomainPath(thisMem.itemDescriptionPath).getSysKey());

+                 for (PropertyDescription pd : propList.list) {

+					props.put(pd.getName(), pd.getDefaultValue());

+					if (pd.getIsClassIdentifier())

+						classProps.append((classProps.length()>0?",":"")).append(pd.getName());

+				}

+             }

+        	if (thisMem.itemPath != null && thisMem.itemPath.length()>0) {

+        		int syskey = new DomainPath(thisMem.itemPath).getSysKey();

+        		if (syskey == -1) 

+        			throw new MembershipException("Cannot find "+thisMem.itemPath+" specified for collection.");

+       			newAgg.addMember(syskey, props, classProps.toString(), new GraphPoint(thisMem.geometry.x, thisMem.geometry.y), thisMem.geometry.width, thisMem.geometry.height);

+        	}

+        }

+        return newAgg;

     }

 }