1 files changed, 18 insertions, 7 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 b99e898..88d9249 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,9 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 
 import java.util.ArrayList;
 
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import com.c2kernel.collection.MembershipException;
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.graph.model.GraphPoint;
@@ -9,17 +12,15 @@ 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;
-    public ArrayList<AggregationMember> aggregationMemberList;
+    public ArrayList<AggregationMember> aggregationMemberList = new ArrayList<AggregationMember>();
     public String name;
 
     public Aggregation() {
         super();
-        aggregationMemberList = new ArrayList<AggregationMember>();
     }
 
     public Aggregation(String name, boolean isDescription) {
@@ -28,16 +29,26 @@ public class Aggregation implements java.io.Serializable {
         this.isDescription = isDescription;
     }
 
-    public com.c2kernel.collection.Aggregation create() throws MembershipException, ObjectNotFoundException {
+    public Aggregation(Element agg) {
+		name = agg.getAttribute("name");
+		isDescription = agg.getAttribute("isDescription").equals("true");
+		NodeList depmemnl = agg.getElementsByTagName("AggregationMember");
+		for (int k=0; k<depmemnl.getLength(); k++) {
+			Element memElem = (Element)depmemnl.item(k);
+			AggregationMember newAggMem = new AggregationMember(memElem);
+			aggregationMemberList.add(newAggMem);
+		}
+	}
+
+	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());
+					thisMem.props.put(pd.getName(), pd.getDefaultValue());
 					if (pd.getIsClassIdentifier())
 						classProps.append((classProps.length()>0?",":"")).append(pd.getName());
 				}
@@ -46,7 +57,7 @@ public class Aggregation implements java.io.Serializable {
         		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);
+       			newAgg.addMember(syskey, thisMem.props, classProps.toString(), new GraphPoint(thisMem.geometry.x, thisMem.geometry.y), thisMem.geometry.width, thisMem.geometry.height);
         	}
         }
         return newAgg;