Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60333 -r60342
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60333)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60342)
@@ -17,31 +17,36 @@
 
 <Method name="MaakDoorBoring">
 <FormalSpec>PosX:%Integer,PosY:%Integer,Straal:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakDoorBoring",PosX,PosY,Straal,Kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakDoorBoring",PosX,PosY,Straal,Kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakPuntBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakPuntBoring",MidX,MidY,Width,Height,Kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakPuntBoring",MidX,MidY,Width,Height,Kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakRugBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakRugBoring",MidX,MidY,Width,Height,Kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakRugBoring",MidX,MidY,Width,Height,Kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakSpecialeBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakSpecialeBoring",MidX,MidY,Width,Height,kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakSpecialeBoring",MidX,MidY,Width,Height,kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakZijBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Rotation:%Integer=0,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakZijBoring",MidX,MidY,Width,Height,Rotation,kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakZijBoring",MidX,MidY,Width,Height,Rotation,kleur)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml
===================================================================
diff -u -r60297 -r60342
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 60297)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 60342)
@@ -23,6 +23,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test methoden aanroepen in DoorBoring">
+<Implementation><![CDATA[
+		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+		#dim Cirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
+		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-5,-5,10,10)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel", 5,5,5).DanReturn(Cirkel)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", -5,-5,10,10).DanReturn(SvgBox)
+		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock)
+		
+		Do BoringElementFactory.MaakDoorBoring(0,0,5)
+		
+		Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test bestaan Puntboring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
@@ -41,6 +57,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test methoden aanroepen in Puntboring">
+<Implementation><![CDATA[
+		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(CrossDiag)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
+		
+		Do BoringElementFactory.MaakPuntBoring(5,5,10,10)
+		
+		Do CrossFactoryMock.Verifieer()
+		Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test bestaan Rugboring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
@@ -60,6 +95,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test methoden aanroepen in Rugboring">
+<Implementation><![CDATA[
+		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim Cirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
+		#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(CrossDiag)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",5,5,4.545454545454545455).DanReturn(Cirkel)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
+		
+		Do BoringElementFactory.MaakRugBoring(5,5,10,10)
+		
+		Do CrossFactoryMock.Verifieer()
+		Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test bestaan Zijboring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
@@ -78,6 +134,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test methoden aanroepen in Zijboring">
+<Implementation><![CDATA[
+		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = CrossFactory.MaakTCross(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakTCross",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(TCross)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
+		
+		Do BoringElementFactory.MaakZijBoring(5,5,10,10)
+		
+		Do CrossFactoryMock.Verifieer()
+		Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test bestaan Speciale Boring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
@@ -96,6 +171,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test methoden aanroepen in Speciale Boring">
+<Implementation><![CDATA[
+		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = CrossFactory.MaakCrossVH(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
+		#dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossVH",10,10,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(CrossVH)
+		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 0,0,10,10).DanReturn(SvgBox)
+		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
+		
+		Do BoringElementFactory.MaakSpecialeBoring(5,5,10,10)
+		
+		Do CrossFactoryMock.Verifieer()
+		Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="AssertSvg">
 <FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
 <Private>1</Private>
Index: vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60292 -r60342
--- vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60292)
+++ vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60342)
@@ -8,22 +8,27 @@
 <Super>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory</Super>
 
 <Method name="MaakDoorBoring">
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakPuntBoring">
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakRugBoring">
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakSpecialeBoring">
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakZijBoring">
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60333 -r60342
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60333)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60342)
@@ -31,6 +31,7 @@
 
 <Method name="MaakDoorBoring">
 <FormalSpec>PosX:%Integer,PosY:%Integer,Straal:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Doorboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New()
 	#dim Circle As TECH.Svg.Basis.Circle = ..BasisElementFactory.MaakCirkel(Straal,Straal,Straal)
@@ -44,9 +45,12 @@
 
 <Method name="MaakPuntBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New()
+	Do ##class(Tools.Wlip).%New(238).ObjToText(..CrossFactory)
 	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height,Kleur)
+	Do ##class(Tools.Wlip).%New(238).String("deze niet")
 	Set Puntboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do ..ElementToevoeger.VoegToeElement(Puntboring.SvgBox,CrossDiag)
 	Do Puntboring.SvgBox.VoegToeID("puntboring")
@@ -56,6 +60,7 @@
 
 <Method name="MaakRugBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New()
 	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height, Kleur)
@@ -71,6 +76,7 @@
 
 <Method name="MaakZijBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Rotation:%Integer=0,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New()
 	Set Group = ##class(TECH.Svg.Basis.Group).%New()
@@ -86,6 +92,7 @@
 
 <Method name="MaakSpecialeBoring">
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring</ReturnType>
 <Implementation><![CDATA[
 	Set Specialeboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New()
 	#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = ..CrossFactory.MaakCrossVH(Width,Height, kleur)