Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen/VoegToeBoringen/Test.cls.xml
===================================================================
diff -u -r60227 -r60333
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen/VoegToeBoringen/Test.cls.xml	(.../Test.cls.xml)	(revision 60227)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen/VoegToeBoringen/Test.cls.xml	(.../Test.cls.xml)	(revision 60333)
@@ -5,6 +5,7 @@
 
 <Method name="Test: standaardgedrag met rugboring">
 <Implementation><![CDATA[
+	
 	#dim Kaderdeur As APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur = ##class(vhTest.Utils.APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).StandaardKaderdeurMetKaderdeurBoring()
 	Set Boringen = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.Boringen).%New()
 	Do Boringen.VoegToeBoringen(Kaderdeur)
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(revision 0)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(revision 60333)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory">
+<Super>TECH.Mockable</Super>
+
+<Property name="BasisElementFactory">
+<Type>TECH.Svg.BasisElementFactory</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MaakCrossDiag">
+<FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[
+	Set CrossDiag =  ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New()
+	Set CrossDiag.TopLine = ..BasisElementFactory.MaakLijn(0,0,Width,Height)
+	Set CrossDiag.BottomLine = ..BasisElementFactory.MaakLijn(0,Height,Width,0)
+	Do CrossDiag.TopLine.SetStroke(kleur)
+	Do CrossDiag.BottomLine.SetStroke(kleur)
+	Quit CrossDiag
+]]></Implementation>
+</Method>
+
+<Method name="MaakCrossVH">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[
+	Set CrossVH = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH).%New()
+	Set CrossVH.HorizontalLine = ..BasisElementFactory.MaakLijn(0,Height/2,Width,Height/2)
+	Set CrossVH.VerticalLine = ..BasisElementFactory.MaakLijn(Width/2,0,Width/2,Height)
+	Do CrossVH.HorizontalLine.SetStroke(kleur)
+	Do CrossVH.VerticalLine.SetStroke(kleur)
+	Quit CrossVH
+]]></Implementation>
+</Method>
+
+<Method name="MaakTCross">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[
+	Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New()
+	Set TCross.HorizontalLine = ..BasisElementFactory.MaakLijn(0,0, Width, 0)
+	Do TCross.HorizontalLine.SetStroke(kleur)
+	Set TCross.VerticalLine = ..BasisElementFactory.MaakLijn(Width/2, 0, Width/2, Height)
+	Do TCross.VerticalLine.SetStroke(kleur)
+	Quit TCross
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(revision 60333)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</Super>
+
+<Method name="MaakCrossDiag">
+<FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="MaakCrossVH">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="MaakTCross">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory/Test.cls.xml	(revision 60333)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test bestaan CrossDiag">
+<Implementation><![CDATA[
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag
+		Set CrossDiag = CrossFactory.MaakCrossDiag(30,30)
+		Do ..AssertSvg(CrossDiag, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""30"" y2=""30""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""30"" x2=""30"" y2=""0""></line>")
+]]></Implementation>
+</Method>
+
+<Method name="Test invulling objecten CrossDiag">
+<Implementation><![CDATA[
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag
+		Set CrossDiag = CrossFactory.MaakCrossDiag(25,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossDiag.TopLine.%ClassName(1))
+		Do $$$AssertEquals(CrossDiag.TopLine.X2,25)
+		Do $$$AssertEquals(CrossDiag.TopLine.Y2,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossDiag.BottomLine.%ClassName(1))
+		Do $$$AssertEquals(CrossDiag.BottomLine.X2,25)
+		Do $$$AssertEquals(CrossDiag.BottomLine.Y1,30)
+]]></Implementation>
+</Method>
+
+<Method name="Test oproepen methoden CrossDiag">
+<Implementation><![CDATA[
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	#dim Line As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,30,30)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,0,30,30).DanReturn(Line)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,30,30,0).DanReturn(Line)
+	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New(BasisElementFactoryMock)
+	
+	Do CrossFactory.MaakCrossDiag(30,30)
+	
+	Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test bestaan CrossVH">
+<Implementation><![CDATA[
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim CrossVH As PPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH
+		Set CrossVH = CrossFactory.MaakCrossVH(30,30)
+		Do ..AssertSvg(CrossVH, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""15"" x2=""30"" y2=""15""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""15"" y1=""0"" x2=""15"" y2=""30""></line>")
+]]></Implementation>
+</Method>
+
+<Method name="Test invulling objecten CrossVH">
+<Implementation><![CDATA[
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim CrossVH As PPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH
+		Set CrossVH = CrossFactory.MaakCrossVH(25,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossVH.HorizontalLine.%ClassName(1))
+		Do $$$AssertEquals(CrossVH.HorizontalLine.X2,25)
+		Do $$$AssertEquals(CrossVH.HorizontalLine.Y2,15)
+		Do $$$AssertEquals(CrossVH.HorizontalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossVH.VerticalLine.%ClassName(1))
+		Do $$$AssertEquals(CrossVH.VerticalLine.X2,12.5)
+		Do $$$AssertEquals(CrossVH.VerticalLine.Y2,30)
+		Do $$$AssertEquals(CrossVH.VerticalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+]]></Implementation>
+</Method>
+
+<Method name="Test oproepen methoden CrossVH">
+<Implementation><![CDATA[
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	#dim Line As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,30,30)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,15,30,15).DanReturn(Line)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",15,0,15,30).DanReturn(Line)
+	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New(BasisElementFactoryMock)
+	
+	Do CrossFactory.MaakCrossVH(30,30)
+	
+	Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test bestaan TCross">
+<Implementation><![CDATA[
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross
+		Set TCross = CrossFactory.MaakTCross(30,30)
+		Do ..AssertSvg(TCross, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""30"" y2=""0""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""15"" y1=""0"" x2=""15"" y2=""30""></line>")
+]]></Implementation>
+</Method>
+
+<Method name="Test invulling objecten Tcross">
+<Implementation><![CDATA[
+		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross
+		Set TCross = CrossFactory.MaakTCross(25,30)
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",TCross.HorizontalLine.%ClassName(1))
+		Do $$$AssertEquals(TCross.HorizontalLine.X2,25)
+		Do $$$AssertEquals(TCross.HorizontalLine.Y2,0)
+		Do $$$AssertEquals(TCross.HorizontalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+		Do $$$AssertEquals("TECH.Svg.Basis.Line",TCross.VerticalLine.%ClassName(1))
+		Do $$$AssertEquals(TCross.VerticalLine.X2,12.5)
+		Do $$$AssertEquals(TCross.VerticalLine.Y2,30)
+		Do $$$AssertEquals(TCross.VerticalLine.Stroke,##class(TECH.Svg.enu.Kleur).Zwart())
+]]></Implementation>
+</Method>
+
+<Method name="Test oproepen methoden Tcross">
+<Implementation><![CDATA[
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	#dim Line As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,30,30)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,0,30,0).DanReturn(Line)
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",15,0,15,30).DanReturn(Line)
+	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New(BasisElementFactoryMock)
+	
+	Do CrossFactory.MaakTCross(30,30)
+	
+	Do BasisElementFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="AssertSvg">
+<FormalSpec>SvgObject:TECH.Svg.Basis.DomElement,VerwachteXml:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do $$$AssertEquals(##class(TECH.StringUtils).Replace($$ObjToXML^vhLib(SvgObject), $$$CRLF,""), VerwachteXml)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml
===================================================================
diff -u -r60209 -r60333
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60209)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60333)
@@ -18,18 +18,11 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	Set ..HorizontalLine = BasisElementFactory.MaakLijn(0,0, Width, 0)
-	Do ..HorizontalLine.SetStroke(kleur)
-	Set ..VerticalLine = BasisElementFactory.MaakLijn(Width/2, 0, Width/2, Height)
-	Do ..VerticalLine.SetStroke(kleur)
-	Quit $$$OK
+<Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml
===================================================================
diff -u -r60209 -r60333
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml	(.../CrossVH.cls.xml)	(revision 60209)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml	(.../CrossVH.cls.xml)	(revision 60333)
@@ -18,19 +18,11 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	Set ..HorizontalLine = BasisElementFactory.MaakLijn(0,Height/2,Width,Height/2)
-	Set ..VerticalLine = BasisElementFactory.MaakLijn(Width/2,0,Width/2,Height)
-	Do ..HorizontalLine.SetStroke(kleur)
-	Do ..VerticalLine.SetStroke(kleur)
-	Quit $$$OK
+<Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60292 -r60333
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60292)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60333)
@@ -11,15 +11,20 @@
 <Type>TECH.Svg.Basis.SvgBox.ElementToevoeger</Type>
 </Property>
 
+<Property name="CrossFactory">
+<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</Type>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory</FormalSpec>
+<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory,CrossFactory:APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
 	Set ..ElementToevoeger = $$$Inject(ElementToevoeger, ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New())
+	Set ..CrossFactory = $$$Inject(CrossFactory, ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -41,7 +46,7 @@
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Implementation><![CDATA[
 	Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New()
-	Set CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height,Kleur)
+	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height,Kleur)
 	Set Puntboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do ..ElementToevoeger.VoegToeElement(Puntboring.SvgBox,CrossDiag)
 	Do Puntboring.SvgBox.VoegToeID("puntboring")
@@ -53,7 +58,7 @@
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Implementation><![CDATA[
 	Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New()
-	Set CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height, Kleur)
+	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height, Kleur)
 	#dim Circle As TECH.Svg.Basis.Circle = ..BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
 	Do Circle.SetFill(Kleur)
 	Set Rugboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
@@ -69,7 +74,7 @@
 <Implementation><![CDATA[
 	Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New()
 	Set Group = ##class(TECH.Svg.Basis.Group).%New()
-	Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New(Width, Height, kleur)
+	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = ..CrossFactory.MaakTCross(Width, Height, kleur)
 	Set Zijboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do Group.VoegToeTransform("rotate("_Rotation_" "_(Width/2)_" "_(Height/2)_")")
 	Do Group.VoegToeElement(TCross)
@@ -83,7 +88,7 @@
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Implementation><![CDATA[
 	Set Specialeboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New()
-	Set CrossVH = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH).%New(Width,Height, kleur)
+	#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = ..CrossFactory.MaakCrossVH(Width,Height, kleur)
 	Set Specialeboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do ..ElementToevoeger.VoegToeElement(Specialeboring.SvgBox, CrossVH)
 	Do Specialeboring.SvgBox.VoegToeID("specialeBoring")
Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60292 -r60333
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60292)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60333)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory</FormalSpec>
+<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory,CrossFactory:APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(revision 60333)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="%OnNew">
+<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MaakCrossDiag">
+<FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakCrossDiag",Width,Height,kleur)
+]]></Implementation>
+</Method>
+
+<Method name="MaakCrossVH">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakCrossVH",Width,Height,kleur)
+]]></Implementation>
+</Method>
+
+<Method name="MaakTCross">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakTCross",Width,Height,kleur)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml
===================================================================
diff -u -r60209 -r60333
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml	(.../CrossDiag.cls.xml)	(revision 60209)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml	(.../CrossDiag.cls.xml)	(revision 60333)
@@ -18,18 +18,11 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	Set ..TopLine = BasisElementFactory.MaakLijn(0,0,Width,Height)
-	Set ..BottomLine = BasisElementFactory.MaakLijn(0,Height,Width,0)
-	Do ..TopLine.SetStroke(kleur)
-	Do ..BottomLine.SetStroke(kleur)
-	Quit $$$OK
+<Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
FishEye: Tag 60333 refers to a dead (removed) revision in file `vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 60333 refers to a dead (removed) revision in file `vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 60333 refers to a dead (removed) revision in file `vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?