From cc79e98c4763affba4fa2e17dfe5a412f9de66c3 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 2 Jul 2012 14:16:20 +0200
Subject: Removed persistency of VertexOutlineCreator - containing subclasses
 should set this. Fixed persistency of GTimeStamp Fixed CompActOutcome not
 showing when loaded

---
 src/main/resources/mapFiles/KeyValuePairMap.xml | 10 ++++++++++
 src/main/resources/mapFiles/graphModelMap.xml   |  3 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/main/resources/mapFiles')

diff --git a/src/main/resources/mapFiles/KeyValuePairMap.xml b/src/main/resources/mapFiles/KeyValuePairMap.xml
index dc67609..f709663 100644
--- a/src/main/resources/mapFiles/KeyValuePairMap.xml
+++ b/src/main/resources/mapFiles/KeyValuePairMap.xml
@@ -31,5 +31,15 @@
 		       <bind-xml name="Boolean" node="attribute"/>
 		</field>				
 	</class>
+	<class name="com.c2kernel.common.GTimeStamp">
+		<map-to xml="TimeStamp"/>
+		<field name="mYear" type="java.lang.Integer" direct="true"><bind-xml name="Y" node="attribute"/></field>
+		<field name="mMonth" type="java.lang.Integer" direct="true"><bind-xml name="Mo" node="attribute"/></field>
+		<field name="mDay" type="java.lang.Integer" direct="true"><bind-xml name="D" node="attribute"/></field>
+		<field name="mHour" type="java.lang.Integer" direct="true"><bind-xml name="H" node="attribute"/></field>
+		<field name="mMinute" type="java.lang.Integer" direct="true"><bind-xml name="Mi" node="attribute"/></field>
+		<field name="mSecond" type="java.lang.Integer" direct="true"><bind-xml name="S" node="attribute"/></field>
+		<field name="mTimeOffset" type="java.lang.Integer" direct="true"><bind-xml name="O" node="attribute"/></field>
+	</class>
 </mapping>
 
diff --git a/src/main/resources/mapFiles/graphModelMap.xml b/src/main/resources/mapFiles/graphModelMap.xml
index cebb589..58bf098 100644
--- a/src/main/resources/mapFiles/graphModelMap.xml
+++ b/src/main/resources/mapFiles/graphModelMap.xml
@@ -110,9 +110,6 @@
 		<field name="childrenGraphModel" type="com.c2kernel.graph.model.GraphModel" direct="false">
 			<bind-xml name="childrenGraphModel" node="element"/>
 		</field>
-		<field name="cNonLayoutableChildren" type="com.c2kernel.graph.model.GraphableVertex" direct="false" collection="array">
-			<bind-xml auto-naming="deriveByClass" node="element"/>
-		</field>
 		<field name="mProperties" 
 			   type="com.c2kernel.utils.KeyValuePair"
 			   collection="array"
-- 
cgit v1.2.3