Index: AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml
===================================================================
diff -u -r43312 -r43315
--- AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml	(.../ArtikelLijstGeneratorRefactored.cls.xml)	(revision 43312)
+++ AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml	(.../ArtikelLijstGeneratorRefactored.cls.xml)	(revision 43315)
@@ -16,6 +16,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="HoofdingFileWriter">
+<Type>TECH.File.FileWriter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RegelFileWriter">
+<Type>TECH.File.FileWriter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="HoofdingStream">
 <Type>%Library.GlobalCharacterStream</Type>
 <Private>1</Private>
@@ -36,14 +46,6 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="DeviceProducten">
-<Type>%String</Type>
-</Property>
-
-<Property name="DeviceKlanten">
-<Type>%String</Type>
-</Property>
-
 <Property name="CurrentTableID">
 <Type>%String</Type>
 </Property>
@@ -60,10 +62,14 @@
 <Method name="%OnNew">
 <Description>
  Do ##class(AX.Uitgaand.VKP.ArtikelLijst.impl.ArtikelLijstGenerator).%New().ExportAll()</Description>
+<FormalSpec>HoofdingFileWriter:TECH.File.FileWriter,RegelFileWriter:TECH.File.FileWriter</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set ..HoofdingFileWriter = $$$Implementation(HoofdingFileWriter, ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter())
+	Set ..RegelFileWriter = $$$Implementation(RegelFileWriter, ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter())
 	Set:..GenerationId="" ..GenerationId=##class(AX.Uitgaand.EC.Klanten.impl.Klanten).LaatsteGenerationID()
 	Set ..SoprConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	
 	Set ..CounterTableID=1000
 	Quit $$$OK
 ]]></Implementation>
@@ -82,32 +88,24 @@
 	. Do ..ExportOne()
 	. Set KlantCount=KlantCount+1
 	
-	Do ..CloseFiles()
+	Do ..HoofdingFileWriter.Open(##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"1701ArtikelLijstKlanten.csv"),$$$False)
+	Do ..HoofdingFileWriter.WriteStream(..HoofdingStream)
+	Do ..HoofdingFileWriter.Close()
+	
+	Do ..RegelFileWriter.Open(##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"1701ArtikelLijstProducten.csv"),$$$False)
+	Do ..RegelFileWriter.WriteStream(..RegelStream)
+	Do ..RegelFileWriter.Close()
 ]]></Implementation>
 </Method>
 
 <Method name="OpenFiles">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Use 0
-	Set ..DeviceProducten=$$OPEN^vhDEV(,"1701ArtikelLijstProducten.csv","W","T")
-	Use ..DeviceProducten
 	Do ..RegelStream.WriteLine("InventDimId;ItemId;ItemListTable;SalesQty;SalesUnit")
-	Use 0
-	Set ..DeviceKlanten=$$OPEN^vhDEV(,"1701ArtikelLijstKlanten.csv","W")
-	Use ..DeviceKlanten
 	Do ..HoofdingStream.WriteLine("CustAccount;Description;ItemListId")
 ]]></Implementation>
 </Method>
 
-<Method name="CloseFiles">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do CLOSE^vhDEV(..DeviceProducten)
-	Do CLOSE^vhDEV(..DeviceKlanten)
-]]></Implementation>
-</Method>
-
 <Method name="ExportOne">
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -141,18 +139,15 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set IdentNr=$$$PRGet($$$IdentNummer)
-	Use ..DeviceProducten
 	Do ..RegelStream.WriteLine("AllBlank")
 	;Write ";",$$$PRGet($$$KortTekst)
-	Do ..RegelStream.WriteLine(";",IdentNr,";",..GeefTableID(),";",1,";","STK",";")
+	Do ..RegelStream.WriteLine(";"_IdentNr_";"_..GeefTableID()_";"_1_";"_"STK"_";")
 ]]></Implementation>
 </Method>
 
 <Method name="ToevoegenKlant">
 <Private>1</Private>
-<Implementation><![CDATA[
-	Use ..DeviceKlanten
-	Do ..HoofdingStream.WriteLine(..GeefKlantIDInAXFormaat(),";","Verkoopanalyse",";",..GeefTableID())
+<Implementation><![CDATA[	Do ..HoofdingStream.WriteLine(..GeefKlantIDInAXFormaat()_";"_"Verkoopanalyse"_";"_..GeefTableID())
 ]]></Implementation>
 </Method>