Index: APPS/TRANSP/GLS/impl/EtiketService.cls.xml
===================================================================
diff -u -r40755 -r40892
--- APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40755)
+++ APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40892)
@@ -8,14 +8,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="EtiketPrinter">
+<Type>APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI</FormalSpec>
+<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..TransportAPI = $$$Inject(TransportAPI,##class(DOM.DomeinContext).Instance().GeefTransportAPI())
+	Set ..EtiketPrinter = $$$Inject(EtiketPrinter,##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -25,32 +31,19 @@
 <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 Responses = ##class(%ListOfObjects).%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 = ..TransportAPI.GeefDistributeurData(DistributeurDataID)
-		#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = DistributeurData.Response
-		#Dim Etiket as BL.Sys.pxLabel = ..GeefGLSEtiket(Response)
-		Do LabelPrinter.AddLabel(Etiket)
+		#dim DistributeurData As APPS.TRANSP.GLS.GLSv1.data.VerzendData = ..TransportAPI.GeefDistributeurData(DistributeurDataID)
+		Do Responses.Insert(DistributeurData.Response)
 	}
-	Do LabelPrinter.PrintLabels()
+	Do ..EtiketPrinter.PrintEtiketten(Responses,Computernaam,"TRANSP_DI1")
 ]]></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>