Index: APPS/TRANSP/GLS/impl/EtiketService.cls.xml
===================================================================
diff -u -r40510 -r40755
--- APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40510)
+++ APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40755)
@@ -1,30 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.GLS.impl.EtiketService">
-<Super>%RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
+<Property name="TransportAPI">
+<Type>APPS.TRANSP.TransportAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..TransportAPI = $$$Inject(TransportAPI,##class(DOM.DomeinContext).Instance().GeefTransportAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="PrintEtikettenVoorLevering">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[
 	#dim Computernaam As %String = $Piece(##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam(),".",1)
 	Set Computernaam = ##class(TECH.StringUtils).ToUpper(Computernaam)
 	#dim LabelPrinter As APPS.common.Print.LabelPrinter = ##class(APPS.ApplicatieContext).Instance().GeefPrintAPI().GeefLabelPrinter("TRANSP_DI1",Computernaam)
 	
-	Set EtiketBouwerResponseVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
 	
 	#dim DistributeurDataIDs As %ListOfDataTypes = Levering.GeefDistributeurDataIDs()
 	Set DistributeurDataIDIt = ##class(TECH.ListIterator).%New(DistributeurDataIDs)
-	While DistributeurDataIDIt.HasNext(){
-		#dim DistributeurDataID As %String = DistributeurDataIDIt.Next()
-		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefDistributeurData(DistributeurDataID)
+	While DistributeurDataIDIt.HasNext()
+	{
+		#Dim DistributeurDataID as %String = DistributeurDataIDIt.Next()
+		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ..TransportAPI.GeefDistributeurData(DistributeurDataID)
 		#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = DistributeurData.Response
-		Do Response.Accept(EtiketBouwerResponseVisitor)
-		#dim Etiket As BL.Sys.pxLabel = EtiketBouwerResponseVisitor.GeefEtiket()
+		#Dim Etiket as BL.Sys.pxLabel = ..GeefGLSEtiket(Response)
 		Do LabelPrinter.AddLabel(Etiket)
 	}
 	Do LabelPrinter.PrintLabels()
 ]]></Implementation>
 </Method>
+
+<Method name="GeefGLSEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>BL.Sys.pxLabel</ReturnType>
+<Implementation><![CDATA[
+	Set EtiketBouwerResponseVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
+	Do Response.Accept(EtiketBouwerResponseVisitor)
+	Quit EtiketBouwerResponseVisitor.GeefEtiket()
+]]></Implementation>
+</Method>
 </Class>