Index: ECON/PM/Maatwerk/dto/RvgKenmerken.cls.xml
===================================================================
diff -u -r69461 -r69476
--- ECON/PM/Maatwerk/dto/RvgKenmerken.cls.xml	(.../RvgKenmerken.cls.xml)	(revision 69461)
+++ ECON/PM/Maatwerk/dto/RvgKenmerken.cls.xml	(.../RvgKenmerken.cls.xml)	(revision 69476)
@@ -263,13 +263,30 @@
 <CodeMode>objectgenerator</CodeMode>
 <FormalSpec>KenmerkenArray:%ArrayOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
-	#dim Code,Key,Keys,Properties,Property,PropertyType
+	#dim Code,Key,Keys,Properties,Property,PropertyType,XmlName,Found,Counter
 
 	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")	
 	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
 	
 	set (Property,Key)=""
-	for { set Property = $order(Properties(Property)) set Key = $order(Keys(Key)) quit:Property=""
+	set objCompiledClass = ##class(%Library.CompiledClass).%OpenId("ECON.PM.Maatwerk.dto.RvgKenmerken")	
+	
+	for { set Key = $order(Keys(Key)) quit:Key=""
+		Set Found = 0
+		Set Counter = 1
+		while ('Found) {
+			set Property = objCompiledClass.Properties.GetAt(Counter).Name
+			set XmlName = objCompiledClass.Properties.GetAt(Counter).Parameters.GetAt("XMLNAME")
+			
+			Set:'$length(XmlName) XmlName = Property
+			
+			If (XmlName = $Piece(Key,".",3)) {		//Data.Kenmerken. ....
+				Set Found = 1	
+			}
+			
+			Set Counter = Counter +1
+		}
+				
 		set PropertyType = $LG( $G(Properties(Property)), 1)
 		set Code = $$subFromArrayGenerateKenmerkCode(Property, Key, PropertyType)
 		do %code.WriteLine($$$TAB_Code)
@@ -341,15 +358,32 @@
 <CodeMode>objectgenerator</CodeMode>
 <ReturnType>%ArrayOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	#dim Code,Key,Keys,Properties,Property
+	#dim Code,Key,Keys,Properties,Property,XmlName,Found,Counter
 
 	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")
 	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
 	
 	do %code.WriteLine($$$TAB_"set KenmerkenArray = ##class(%ArrayOfDataTypes).%New()")
 	
 	set (Property,Key)=""
-	for { set Property = $order(Properties(Property)) set Key = $order(Keys(Key)) quit:Property=""
+	set objCompiledClass = ##class(%Library.CompiledClass).%OpenId("ECON.PM.Maatwerk.dto.RvgKenmerken")
+	
+	for { set Key = $order(Keys(Key)) quit:Key=""
+		Set Found = 0
+		Set Counter = 1
+		while ('Found) {
+			set Property = objCompiledClass.Properties.GetAt(Counter).Name
+			set XmlName = objCompiledClass.Properties.GetAt(Counter).Parameters.GetAt("XMLNAME")
+			
+			Set:'$length(XmlName) XmlName = Property
+			
+			If (XmlName = $Piece(Key,".",3)) {		//Data.Kenmerken. ....
+				Set Found = 1	
+			}
+			
+			Set Counter = Counter +1
+		}
+				
 		set Code = "do:$length(.."_Property_") KenmerkenArray.SetAt(.."_Property_","""_Key_""")"
 		do %code.WriteLine($$$TAB_Code)
 	}
@@ -445,82 +479,82 @@
 <Value>InstelZijde</Value>
 </Value>
 <Value name="28">
-<Value>InkortingLijst</Value>
+<Value>Krasbescherming</Value>
 </Value>
 <Value name="29">
-<Value>Krasbescherming</Value>
+<Value>MateriaalOpties</Value>
 </Value>
 <Value name="30">
-<Value>MateriaalOpties</Value>
+<Value>LeverancierA</Value>
 </Value>
 <Value name="31">
-<Value>LeverancierA</Value>
+<Value>LeverancierB</Value>
 </Value>
 <Value name="32">
-<Value>LeverancierB</Value>
+<Value>NominaleLengte</Value>
 </Value>
 <Value name="33">
-<Value>NominaleLengte</Value>
+<Value>NominaleLengteExact</Value>
 </Value>
 <Value name="34">
-<Value>NominaleLengteExact</Value>
+<Value>NominaleLengteLinks</Value>
 </Value>
 <Value name="35">
-<Value>NominaleLengteLinks</Value>
+<Value>NominaleLengteLinksExact</Value>
 </Value>
 <Value name="36">
-<Value>NominaleLengteLinksExact</Value>
+<Value>NominaleLengteRechts</Value>
 </Value>
 <Value name="37">
-<Value>NominaleLengteRechts</Value>
+<Value>NominaleLengteRechtsExact</Value>
 </Value>
 <Value name="38">
-<Value>NominaleLengteRechtsExact</Value>
+<Value>PlanmatigeAanpak</Value>
 </Value>
 <Value name="39">
-<Value>PlanmatigeAanpak</Value>
+<Value>PocketAchterwandDikte</Value>
 </Value>
 <Value name="40">
-<Value>PocketAchterwandDikte</Value>
+<Value>PocketDiepte</Value>
 </Value>
 <Value name="41">
-<Value>PocketDiepte</Value>
+<Value>PocketHoogte</Value>
 </Value>
 <Value name="42">
-<Value>PocketHoogte</Value>
+<Value>PocketZijkantDikte</Value>
 </Value>
 <Value name="43">
-<Value>PocketZijkantDikte</Value>
+<Value>ProductieWijze</Value>
 </Value>
 <Value name="44">
-<Value>ProductieWijze</Value>
+<Value>StukLijst</Value>
 </Value>
 <Value name="45">
-<Value>StukLijst</Value>
+<Value>TOKleur</Value>
 </Value>
 <Value name="46">
-<Value>TOKleur</Value>
+<Value>Toepassing</Value>
 </Value>
 <Value name="47">
-<Value>Toepassing</Value>
+<Value>TypeMateriaalOppervlakteA</Value>
 </Value>
 <Value name="48">
-<Value>TypeMateriaalOppervlakteA</Value>
+<Value>TypeMateriaalOppervlakteB</Value>
 </Value>
 <Value name="49">
-<Value>TypeMateriaalOppervlakteB</Value>
+<Value>VerpakkingType</Value>
 </Value>
 <Value name="50">
-<Value>VerpakkingType</Value>
+<Value>VoegBoven</Value>
 </Value>
 <Value name="51">
-<Value>VoegBoven</Value>
+<Value>VoegOnder</Value>
 </Value>
 <Value name="52">
-<Value>VoegOnder</Value>
+<Value>VoegZijkant</Value>
 </Value>
 <Value name="53">
-<Value>VoegZijkant</Value>
+<Value>InkortingLijst</Value>
 </Value>
 </Data>
 </Storage>