Index: APPS/Halux/Planning/impl/BatchService.cls.xml
===================================================================
diff -u -r58479 -r59610
--- APPS/Halux/Planning/impl/BatchService.cls.xml	(.../BatchService.cls.xml)	(revision 58479)
+++ APPS/Halux/Planning/impl/BatchService.cls.xml	(.../BatchService.cls.xml)	(revision 59610)
@@ -4,13 +4,13 @@
 <IncludeCode>%occIO</IncludeCode>
 <Super>TECH.RegisteredObject,APPS.Halux.Planning.BatchService</Super>
 
-<Property name="BatchService">
-<Type>APPS.Halux.common.BatchService</Type>
+<Property name="ProductieService">
+<Type>APPS.Halux.common.ProductieService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="ProductieService">
-<Type>APPS.Halux.common.ProductieService</Type>
+<Property name="BatchService">
+<Type>APPS.Halux.common.BatchService</Type>
 <Private>1</Private>
 </Property>
 
@@ -19,16 +19,22 @@
 <Private>1</Private>
 </Property>
 
+<Property name="MaatwerkBatchBuilderFactory">
+<Type>APPS.Halux.Planning.impl.BatchService.MaatwerkBatchBuilderFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductieService:APPS.Halux.common.ProductieService=""</FormalSpec>
+<FormalSpec>ProductieService:APPS.Halux.common.ProductieService="",BatchService:APPS.Halux.common.BatchService,ToeleveringAPI:DOM.AKP.ToeleveringAPI,MaatwerkBatchBuilderFactory:APPS.Halux.Planning.impl.BatchService.MaatwerkBatchBuilderFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
-	set ..ProductieService = $$$Implementation(ProductieService, ##class(APPS.Halux.common.ProductieService).%New())
-	set ..ToeleveringAPI = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI()
+	Set ..BatchService = $$$Inject(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New())
+	Set ..ProductieService = $$$Inject(ProductieService, ##class(APPS.Halux.common.ProductieService).%New())
+	Set ..ToeleveringAPI = $$$Inject(ToeleveringAPI, ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
+	Set ..MaatwerkBatchBuilderFactory = $$$Inject(MaatwerkBatchBuilderFactory, ##class(APPS.Halux.Planning.impl.BatchService.MaatwerkBatchBuilderFactory).%New())
 	
 	quit $$$OK
 ]]></Implementation>
@@ -657,23 +663,7 @@
 <FormalSpec>Categorie:APPS.Halux.common.enu.Categorie</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.Halux.Planning.impl.BatchService.MaatwerkBatchBuilder</ReturnType>
-<Implementation><![CDATA[
-	#dim Builder As APPS.Halux.Planning.impl.BatchService.MaatwerkBatchBuilder
-	
-	if (Categorie = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) {
-		set Builder = ##class(APPS.Halux.Planning.impl.BatchService.TBXMaatwerkBatchBuilder).%New()
-	} elseif (Categorie = ##class(APPS.Halux.common.enu.Categorie).Kaderdeur())	{
-		set Builder = ##class(APPS.Halux.Planning.impl.BatchService.KADMaatwerkBatchBuilder).%New()
-	} elseif (Categorie = ##class(APPS.Halux.common.enu.Categorie).Legrabox()) {
-		set Builder = ##class(APPS.Halux.Planning.impl.BatchService.LBXMaatwerkBatchBuilder).%New()
-	} elseif (Categorie = ##class(APPS.Halux.common.enu.Categorie).TAORbox()) {
-		set Builder = ##class(APPS.Halux.Planning.impl.BatchService.TAXMaatwerkBatchBuilder).%New()
-	} else {
-		set Builder = ##class(APPS.Halux.Planning.impl.BatchService.MaatwerkBatchBuilder).%New()
-		do Builder.ZetCategorie(Categorie)
-	}
-	
-	quit Builder
+<Implementation><![CDATA[	quit ..MaatwerkBatchBuilderFactory.GeefMaatwerkBatchBuilder(Categorie)
 ]]></Implementation>
 </Method>