Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/LosProfielToevoeger.cls.xml
===================================================================
diff -u -r60226 -r61908
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/LosProfielToevoeger.cls.xml	(.../LosProfielToevoeger.cls.xml)	(revision 60226)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/LosProfielToevoeger.cls.xml	(.../LosProfielToevoeger.cls.xml)	(revision 61908)
@@ -1,39 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur.LosProfielToevoeger">
-<Super>%RegisteredObject</Super>
+<IncludeCode>vhLib.Macro</IncludeCode>
+<Super>TECH.Mockable</Super>
 
+<Property name="BasisElementFactory">
+<Type>TECH.Svg.BasisElementFactory</Type>
+</Property>
+
+<Property name="CoordinatesService">
+<Type>TECH.Svg.Services.CoordinatesService</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService</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 ..CoordinatesService = $$$Inject(CoordinatesService, ##class(TECH.Svg.Services.CoordinatesService).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="LosProfiel">
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,LosOffset:%Integer,ProfPlaats:%String</FormalSpec>
+<ReturnType>TECH.Svg.Basis.Path</ReturnType>
 <Implementation><![CDATA[
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
-	#dim LeftTopInner As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(LosOffset,LosOffset)
-	#dim RightTopInner As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(Breedte - LosOffset,LosOffset)
-	#dim LeftBottomInner As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(LosOffset,Lengte-LosOffset)
-	#dim RightBottomInner As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(Breedte-LosOffset, Lengte-LosOffset)
+
+	#dim LeftTopInner As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(LosOffset, LosOffset)
+	#dim RightTopInner As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(Breedte - LosOffset, LosOffset)
+	#dim LeftBottomInner As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(LosOffset, Lengte- LosOffset)
+	#dim RightBottomInner As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(Breedte - LosOffset, Lengte - LosOffset)
 	
-	#dim LeftTopOuter As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(0,0)
-	#dim RightTopOuter As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(Breedte,0)
-	#dim LeftBottomOuter As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(0, Lengte)
-	#dim RightBottomOuter As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(Breedte, Lengte)
+	#dim LeftTopOuter As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(0, 0)
+	#dim RightTopOuter As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(Breedte, 0)
+	#dim LeftBottomOuter As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(0, Lengte)
+	#dim RightBottomOuter As TECH.Svg.Basis.Path.Coordinates = ..BasisElementFactory.MaakCoordinaat(Breedte, Lengte)
 	#dim CoordinatesList As %ListOfObject
+	
 	If (ProfPlaats="PL") {
-		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(LeftTopInner, LeftTopOuter, LeftBottomOuter, LeftBottomInner)
+		Set CoordinatesList = ..CoordinatesService.MaakCoordinatenLijstVanCoordinaten(LeftTopInner, LeftTopOuter, LeftBottomOuter, LeftBottomInner)
 	}
 		If (ProfPlaats="PB") {
-		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(LeftTopInner, LeftTopOuter, RightTopOuter, RightTopInner)
+		Set CoordinatesList = ..CoordinatesService.MaakCoordinatenLijstVanCoordinaten(LeftTopInner, LeftTopOuter, RightTopOuter, RightTopInner)
 	}
 		If (ProfPlaats="PR") {
-		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(RightTopInner, RightTopOuter, RightBottomOuter, RightBottomInner)
+		Set CoordinatesList = ..CoordinatesService.MaakCoordinatenLijstVanCoordinaten(RightTopInner, RightTopOuter, RightBottomOuter, RightBottomInner)
 	}
 		If (ProfPlaats="PO") {
-		Set CoordinatesList = CoordinatesService.MaakCoordinatenLijstVanCoordinaten(RightBottomInner, RightBottomOuter, LeftBottomOuter, LeftBottomInner)
+		Set CoordinatesList = ..CoordinatesService.MaakCoordinatenLijstVanCoordinaten(RightBottomInner, RightBottomOuter, LeftBottomOuter, LeftBottomInner)
 	}
-	#dim Path As TECH.Svg.Basis.Path = BasisElementFactory.MaakPath(CoordinatesList)
-		Do Path.SetFill("#F0F0F0")
-		Do Path.SetStroke("black",2)
-		Do Path.SetOpacity(0.5)
+	
+	#dim Path As TECH.Svg.Basis.Path = ..BasisElementFactory.MaakPath(CoordinatesList)
+	Do Path.SetFill("#F0F0F0")
+	Do Path.SetStroke("black",2)
+	Do Path.SetOpacity(0.5)
 	Quit Path
 ]]></Implementation>
 </Method>