From 0baa46d5ee4f62adb58f436af4978d9468454870 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 22 Jun 2012 10:11:17 +0200
Subject: Modules and entitycreation support Aggregations, collection
 properties and class identifiers

---
 src/main/java/com/c2kernel/collection/Aggregation.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/c2kernel/collection/Aggregation.java')

diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/com/c2kernel/collection/Aggregation.java
index e869621..f840d41 100644
--- a/src/main/java/com/c2kernel/collection/Aggregation.java
+++ b/src/main/java/com/c2kernel/collection/Aggregation.java
@@ -73,8 +73,10 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
         AggregationMember aggMem = new AggregationMember();
         aggMem.setProperties(props);
         aggMem.setClassProps(classProps);
-        aggMem.assignEntity(entityKey);
-
+        if (entityKey > -1) {
+        	aggMem.assignEntity(entityKey);
+        	aggMem.setIsComposite( RelationshipUtils.getIsComposite(entityKey)  );
+        }
         // create vertex
         com.c2kernel.graph.model.Vertex vertex = new com.c2kernel.graph.model.Vertex();
         vertex.setHeight(h); vertex.setWidth(w);
@@ -82,7 +84,7 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb
         aggMem.setCollection(this);
         aggMem.setID(vertex.getID());
         aggMem.setIsLayoutable(true);
-        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;
-- 
cgit v1.2.3