Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Hoekverbinder.cls.xml
===================================================================
diff -u -r60134 -r60351
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Hoekverbinder.cls.xml	(.../Hoekverbinder.cls.xml)	(revision 60134)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Hoekverbinder.cls.xml	(.../Hoekverbinder.cls.xml)	(revision 60351)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Hoekverbinder">
+<IncludeCode>vhLib.Macro</IncludeCode>
 <Super>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.BasisElementSvgObject</Super>
 
 <Property name="Group">
@@ -9,45 +10,27 @@
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
+<Property name="BasisElementFactory">
+<Type>TECH.Svg.BasisElementFactory</Type>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<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())
 	Set ..Group = ##class(TECH.Svg.Basis.Group).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="MaakHoekverbinder">
-<FormalSpec>CoordinatesList:%ListOfObjects,XCirkel:%Integer,YCirkel:%Integer,ID:%String,Transform:%String="translate(0 0) rotate(0)"</FormalSpec>
-<Implementation><![CDATA[
-	Set Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,1)
-	Set Circle1 = ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(XCirkel,YCirkel,3)
-	Set Circle2 = ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(YCirkel,XCirkel,3)
-	Do Path.SetFill("#A0A0A0")
-	Do Path.SetOpacity(0.5)
-	Do Circle1.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
-	Do Circle2.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
-	
-	
-	Do ..Group.VoegToeElement(Circle1)
-	Do ..Group.VoegToeElement(Circle2)
-	Do ..Group.VoegToeElement(Path)
-	Do ..Group.VoegToeTransform(Transform)
-	Do ..Group.VoegToeID(ID)
-]]></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[
-	Set val=..Group
-   	Set sc = val.XMLExport("g", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
-	Quit sc
+<Implementation><![CDATA[	Quit ..Group.XMLExport("g", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
 ]]></Implementation>
 </Method>
 </Class>