Index: TECH/Svg/Tooling/BasisElementSvgTooling.cls.xml
===================================================================
diff -u
--- TECH/Svg/Tooling/BasisElementSvgTooling.cls.xml	(revision 0)
+++ TECH/Svg/Tooling/BasisElementSvgTooling.cls.xml	(revision 3730)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Svg.Tooling.BasisElementSvgTooling">
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/TECH/Svg/Tooling/CrossFactory.cls.xml
===================================================================
diff -u
--- vhTest/Fake/TECH/Svg/Tooling/CrossFactory.cls.xml	(revision 0)
+++ vhTest/Fake/TECH/Svg/Tooling/CrossFactory.cls.xml	(revision 3730)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.TECH.Svg.Tooling.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>TECH.Svg.Tooling.CrossFactory</Super>
+
+<Method name="MaakCrossDiag">
+<FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>TECH.Svg.Tooling.CrossDiag</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="MaakCrossVH">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>TECH.Svg.Tooling.CrossVH</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="MaakTCross">
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>TECH.Svg.Tooling.TCross</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Svg/Tooling/CrossDiag.cls.xml
===================================================================
diff -u
--- TECH/Svg/Tooling/CrossDiag.cls.xml	(revision 0)
+++ TECH/Svg/Tooling/CrossDiag.cls.xml	(revision 3730)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Svg.Tooling.CrossDiag">
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling,TECH.RegisteredObject</Super>
+
+<Parameter name="XMLNAME">
+<Default>crossdiag</Default>
+</Parameter>
+
+<Property name="TopLine">
+<Type>TECH.Svg.Basis.Line</Type>
+<Parameter name="XMLNAME" value="line"/>
+</Property>
+
+<Property name="BottomLine">
+<Type>TECH.Svg.Basis.Line</Type>
+<Parameter name="XMLNAME" value="line"/>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+   	#dim sc As %Status
+
+	Set sc = ..TopLine.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Error bij XmlExport van TopLine bij object "_$this)
+	Set sc = ..BottomLine.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Error bij XmlExport van BottomLine bij object "_$this)
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Svg/Tooling/CrossVH.cls.xml
===================================================================
diff -u
--- TECH/Svg/Tooling/CrossVH.cls.xml	(revision 0)
+++ TECH/Svg/Tooling/CrossVH.cls.xml	(revision 3730)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Svg.Tooling.CrossVH">
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling,TECH.RegisteredObject</Super>
+
+<Parameter name="XMLNAME">
+<Default>crossvh</Default>
+</Parameter>
+
+<Property name="HorizontalLine">
+<Type>TECH.Svg.Basis.Line</Type>
+<Parameter name="XMLNAME" value="line"/>
+</Property>
+
+<Property name="VerticalLine">
+<Type>TECH.Svg.Basis.Line</Type>
+<Parameter name="XMLNAME" value="line"/>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#dim sc As %Status
+
+	Set sc = ..HorizontalLine.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Error bij XmlExport van TopLine bij object "_$this)
+	Set sc = ..VerticalLine.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Error bij XmlExport van BottomLine bij object "_$this)
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/TECH/Svg/Tooling/CrossFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/TECH/Svg/Tooling/CrossFactory.cls.xml	(revision 0)
+++ vhTest/Mock/TECH/Svg/Tooling/CrossFactory.cls.xml	(revision 3730)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.TECH.Svg.Tooling.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>TECH.Svg.Tooling.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>
+<ReturnType>TECH.Svg.Tooling.CrossDiag</ReturnType>
+<Implementation><![CDATA[	quit ..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>
+<ReturnType>TECH.Svg.Tooling.CrossVH</ReturnType>
+<Implementation><![CDATA[	quit ..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>
+<ReturnType>TECH.Svg.Tooling.TCross</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakTCross",Width,Height,kleur)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Svg/Basis/Group.cls.xml
===================================================================
diff -u -r3668 -r3730
--- TECH/Svg/Basis/Group.cls.xml	(.../Group.cls.xml)	(revision 3668)
+++ TECH/Svg/Basis/Group.cls.xml	(.../Group.cls.xml)	(revision 3730)
@@ -43,21 +43,21 @@
 </Property>
 
 <Property name="CrossDiags">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</Type>
+<Type>TECH.Svg.Tooling.CrossDiag</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="crossdiag"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
 <Property name="CrossVHs">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</Type>
+<Type>TECH.Svg.Tooling.CrossDiag</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="crossvh"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
 <Property name="TCrosss">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</Type>
+<Type>TECH.Svg.Tooling.CrossDiag</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="tcross"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
Index: TECH/Svg/Tooling/CrossFactory.cls.xml
===================================================================
diff -u
--- TECH/Svg/Tooling/CrossFactory.cls.xml	(revision 0)
+++ TECH/Svg/Tooling/CrossFactory.cls.xml	(revision 3730)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Svg.Tooling.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>
+<ReturnType>TECH.Svg.Tooling.CrossDiag</ReturnType>
+<Implementation><![CDATA[
+	Set CrossDiag =  ##class(TECH.Svg.Tooling.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>
+<ReturnType>TECH.Svg.Tooling.CrossVH</ReturnType>
+<Implementation><![CDATA[
+	Set CrossVH = ##class(TECH.Svg.Tooling.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>
+<ReturnType>TECH.Svg.Tooling.TCross</ReturnType>
+<Implementation><![CDATA[
+	Set TCross = ##class(TECH.Svg.Tooling.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: TECH/Svg/Basis/SvgBox/ElementToevoeger.cls.xml
===================================================================
diff -u -r3693 -r3730
--- TECH/Svg/Basis/SvgBox/ElementToevoeger.cls.xml	(.../ElementToevoeger.cls.xml)	(revision 3693)
+++ TECH/Svg/Basis/SvgBox/ElementToevoeger.cls.xml	(.../ElementToevoeger.cls.xml)	(revision 3730)
@@ -27,15 +27,17 @@
 	{
 		do SvgBox.Texts.Insert(Element)
 	}
-	if Element.%Extends("APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag")
+	if Element.%Extends("TECH.Svg.Tooling.CrossDiag")
 	{
 		do SvgBox.CrossDiags.Insert(Element)
 	}
-	if Element.%Extends("APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH")
+	if Element.%Extends("TECH.Svg.Tooling.CrossVH")
 	{
 		do SvgBox.CrossVHs.Insert(Element)
+		
+		
 	}
-	if Element.%Extends("APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross")
+	if Element.%Extends("TECH.Svg.Tooling.TCross")
 	{
 		do SvgBox.TCrosss.Insert(Element)
 	}
Index: TECH/Svg/Tooling/TCross.cls.xml
===================================================================
diff -u
--- TECH/Svg/Tooling/TCross.cls.xml	(revision 0)
+++ TECH/Svg/Tooling/TCross.cls.xml	(revision 3730)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Svg.Tooling.TCross">
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling,TECH.RegisteredObject</Super>
+
+<Parameter name="XMLNAME">
+<Default>tcross</Default>
+</Parameter>
+
+<Property name="HorizontalLine">
+<Type>TECH.Svg.Basis.Line</Type>
+<Parameter name="XMLNAME" value="line"/>
+</Property>
+
+<Property name="VerticalLine">
+<Type>TECH.Svg.Basis.Line</Type>
+<Parameter name="XMLNAME" value="line"/>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#dim sc As %Status
+
+	Set sc = ..HorizontalLine.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Error bij XmlExport van TopLine bij object "_$this)
+	Set sc = ..VerticalLine.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Error bij XmlExport van BottomLine bij object "_$this)
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Svg/Basis/SvgBox.cls.xml
===================================================================
diff -u -r3693 -r3730
--- TECH/Svg/Basis/SvgBox.cls.xml	(.../SvgBox.cls.xml)	(revision 3693)
+++ TECH/Svg/Basis/SvgBox.cls.xml	(.../SvgBox.cls.xml)	(revision 3730)
@@ -43,21 +43,21 @@
 </Property>
 
 <Property name="CrossDiags">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</Type>
+<Type>TECH.Svg.Tooling.CrossDiag</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="crossdiag"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
 <Property name="CrossVHs">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</Type>
+<Type>TECH.Svg.Tooling.CrossVH</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="crossvh"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
 <Property name="TCrosss">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</Type>
+<Type>TECH.Svg.Tooling.TCross</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="tcross"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
@@ -126,6 +126,7 @@
 <Method name="VoegToeElement">
 <FormalSpec>Element:TECH.Svg.Basis.DomElement</FormalSpec>
 <Implementation><![CDATA[
+	Do ##class(Tools.Wlip).%New(238).String(Element)
 	if Element.%IsA("TECH.Svg.Basis.Rect")
 	{
 	do ..Rects.Insert(Element)
@@ -146,15 +147,15 @@
 	{
 	do ..Texts.Insert(Element)
 	}
-	if Element.%IsA("APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag")
+	if Element.%IsA("TECH.Svg.Tooling.CrossDiag")
 	{
 	do ..CrossDiags.Insert(Element)
 	}
-	if Element.%IsA("APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH")
+	if Element.%IsA("TECH.Svg.Tooling.CrossVH")
 	{
 	do ..CrossVHs.Insert(Element)
 	}
-	if Element.%IsA("APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross")
+	if Element.%IsA("TECH.Svg.Tooling.TCross")
 	{
 	do ..TCrosss.Insert(Element)
 	}