Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml
===================================================================
diff -u -r39509 -r39514
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39509)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39514)
@@ -46,6 +46,16 @@
 	Do $$$AssertEquals(Array.GetAt("Nietmeeleveren.Nietmeeleveren_antislipmat"),"1")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Embedded objects (type Lijn)">
+<Implementation><![CDATA[
+	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
+	Set Object.Lijn.Aantal = "42"
+
+	#dim Array As %ArrayOfDataTypes = Object.ToArray()
+	Do $$$AssertEquals(Array.GetAt("Lijn.Aantal"),"42")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml
===================================================================
diff -u -r39509 -r39514
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39509)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39514)
@@ -54,6 +54,18 @@
 	do $$$AssertTrue(Object.NietMeeleveren.Antislipmat)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Embedded objects (type Lijn)">
+<Implementation><![CDATA[
+	Set Array = ##class(%ArrayOfDataTypes).%New()
+	Do Array.SetAt("42","Lijn.Aantal")
+	
+	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
+	Do Object.FromArray(Array)
+	
+	do $$$AssertEquals(Object.Lijn.Aantal,"42")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml
===================================================================
diff -u -r39513 -r39514
--- ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39513)
+++ ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39514)
@@ -238,6 +238,12 @@
 			If $length(PropertyName) {
 				Set $property($this.NietMeeleveren,PropertyName) = Value
 			}
+		} ElseIf Kenmerk["Lijn."{
+			Set PropertyName = ..GetPropertyName($piece(Kenmerk,".",2), "ECON.PM.Maatwerk.dto.TbxKenmerken.Lijn")
+			
+			If $length(PropertyName) {
+				Set $property($this.Lijn,PropertyName) = Value
+			}
 		} Else {
 			Set PropertyName = ..GetPropertyName(Kenmerk, "ECON.PM.Maatwerk.dto.TbxKenmerken")
 		
@@ -271,45 +277,19 @@
 				Set CompiledProperty = ##class(%Dictionary.CompiledProperty).%OpenId(PropertyName_"||"_PropertyValue)
 				Do KenmerkenArray.SetAt(Value,"Nietmeeleveren."_CompiledProperty.Parameters.GetAt("XMLNAME"))
 			}
+		} ElseIf PropertyName[".Lijn" {
+			Set Value = $property($this.Lijn,PropertyValue)
+			If $length(Value) {
+				Set CompiledProperty = ##class(%Dictionary.CompiledProperty).%OpenId(PropertyName_"||"_PropertyValue)
+				Do KenmerkenArray.SetAt(Value,"Lijn."_CompiledProperty.Parameters.GetAt("XMLNAME"))
+			}
 		}
 		
 	}
 	Quit KenmerkenArray
 ]]></Implementation>
 </Method>
 
-<Method name="FromStream">
-<FormalSpec>Stream:%Stream.Object</FormalSpec>
-<Implementation><![CDATA[
-	while '(Stream.AtEnd) {
-		#dim Line As %String = Stream.ReadLine()
-		#dim PropertyName As %String = ..GetPropertyName($piece(Line,"=",1), "ECON.PM.Maatwerk.dto.TbxKenmerken")
-		if $length(PropertyName) {
-			set $property($this,PropertyName) = $piece(Line,"=",2)
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ToStream">
-<ReturnType>%Stream.Object</ReturnType>
-<Implementation><![CDATA[
-	set Stream = ##class(%GlobalCharacterStream).%New()
-	set PropertyIterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties("ECON.PM.Maatwerk.dto.TbxKenmerken"))
-	while PropertyIterator.HasNext() {
-		#dim PropertyName As %String = PropertyIterator.Next()
-		#dim Value As %String = $property($this,PropertyName)
-		continue:PropertyName="NietMeeleveren"
-		if $length(Value) {
-			set CompiledProperty = ##class(%Dictionary.CompiledProperty).%OpenId("ECON.PM.Maatwerk.dto.TbxKenmerken||"_PropertyName)
-			do:(Stream.Size>0) Stream.Write($char(13,10))
-			do Stream.Write(CompiledProperty.Parameters.GetAt("XMLNAME")_"="_Value)
-		}
-	}
-	quit Stream
-]]></Implementation>
-</Method>
-
 <Method name="GetPropertyName">
 <FormalSpec>PropertyName:%String,ClassName:%String</FormalSpec>
 <Private>1</Private>
@@ -456,6 +436,9 @@
 <Value name="43">
 <Value>NietMeeleveren</Value>
 </Value>
+<Value name="44">
+<Value>Lijn</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
FishEye: Tag 39514 refers to a dead (removed) revision in file `vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToStream/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 39514 refers to a dead (removed) revision in file `vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromStream/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?