Index: DOM/AKP/impl/ToeleveringService.cls.xml
===================================================================
diff -u -r37949 -r38015
--- DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37949)
+++ DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 38015)
@@ -3,28 +3,54 @@
 <Class name="DOM.AKP.impl.ToeleveringService">
 <Super>TECH.RegisteredObject,DOM.AKP.ToeleveringService</Super>
 
+<Property name="ToeleveringApi">
+<Type>DOM.AKP.ToeleveringAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ProductTypeArray">
 <Type>%ArrayOfDataTypes</Type>
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI,ProductTypeApi:DOM.PM.ProductTypeAPI,OrderApi:DOM.VKP.OrderAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ToeleveringApi = $$$Inject(ToeleveringApi,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
+	set ..ProductTypeApi = $$$Inject(ProductTypeApi,##class(DOM.DomeinContext).Instance().GeefProductTypeAPI())
+	set ..OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductTypes">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.PM.enu.ProductType"</ReturnTypeParams>
 <Implementation><![CDATA[
-	
-	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
-	#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
+	#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringID)
 	#dim ProductLijnIt As TECH.Iterator = Toelevering.GeefProductLijnIterator()
 	
-	While (ProductLijnIt.HasNext())
-	{
+	While (ProductLijnIt.HasNext()) {
 		#dim ProductLijn As DOM.AKP.ProductToeleveringLijn = ProductLijnIt.Next()
 		#dim ProductID As %String = ProductLijn.GeefProductID()
 		
-		#dim ProductType As DOM.PM.enu.ProductType = ProductTypeAPI.GeefProductType(ProductID)
-		Do ..RegistreerProductType(ProductType)
+		#dim ProductType As DOM.PM.enu.ProductType = ..ProductTypeApi.GeefProductType(ProductID)
+		Do ..ProductTypeArray.SetAt(1,ProductType)
 	}
 	
 	Set ProductTypes = ##class(%ListOfDataTypes).%New()
@@ -37,18 +63,11 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RegistreerProductType">
-<FormalSpec>ProductType:DOM.PM.enu.ProductType</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[	Do ..ProductTypeArray.SetAt(1,ProductType)
-]]></Implementation>
-</Method>
-
 <Method name="GeefKlant">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
 <Implementation><![CDATA[
-	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
+	#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringID)
 	#dim OrderID As %String = Toelevering.GeefOrderID()
 	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Order.GeefKlantID()
@@ -62,7 +81,7 @@
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
+	#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringID)
 	Quit ##class(TECH.DynamicIterator).%New(Toelevering.GeefProductLijnIterator(),"Item.GeefProductID()","Item.%Extends(""DOM.AKP.ProductToeleveringLijn"")=1")
 ]]></Implementation>
 </Method>
@@ -71,7 +90,7 @@
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>DOM.VKP.enu.TransportWaarborgType</ReturnType>
 <Implementation><![CDATA[
-	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
+	#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringID)
 	#dim OrderID As %String = Toelevering.GeefOrderID()
 	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)