Index: AX/Uitgaand/PM/Assortimenten/impl/KlantenAssortimentGeneratorRefactored.cls.xml
===================================================================
diff -u -r43326 -r43329
--- AX/Uitgaand/PM/Assortimenten/impl/KlantenAssortimentGeneratorRefactored.cls.xml	(.../KlantenAssortimentGeneratorRefactored.cls.xml)	(revision 43326)
+++ AX/Uitgaand/PM/Assortimenten/impl/KlantenAssortimentGeneratorRefactored.cls.xml	(.../KlantenAssortimentGeneratorRefactored.cls.xml)	(revision 43329)
@@ -15,6 +15,26 @@
 <Type>AX.Uitgaand.PM.Assortimenten.impl.AssortimentCategorieBepaler</Type>
 </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>
+</Property>
+
+<Property name="RegelStream">
+<Type>%Library.GlobalCharacterStream</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="GenerationID">
 <Type>%String</Type>
 </Property>
@@ -57,19 +77,25 @@
 
 <Method name="%OnNew">
 <Description>
- Do ##class(AX.Uitgaand.PM.Assortimenten.impl.KlantenAssortimentGenerator).%New().ExportAll()</Description>
+ Do ##class(AX.Uitgaand.PM.Assortimenten.impl.KlantenAssortimentGeneratorRefactored).%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=##class(AX.Uitgaand.EC.Klanten.impl.Klanten).LaatsteGenerationID()
 	Set ..SoprConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
  	Set ..CategorieBepaler=##class(AX.Uitgaand.PM.Assortimenten.impl.AssortimentCategorieBepaler).%New()
+ 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ExportAll">
 <Implementation><![CDATA[
-	Do ..OpenFiles()
+	Set ..HoofdingStream = ##class(%Library.GlobalCharacterStream).%New()
+	Set ..RegelStream = ##class(%Library.GlobalCharacterStream).%New()
+	Do ..MaakHeaders()
 	
 	Set itKlant=..KlantIterator()
 	While itKlant.HasNext() {
@@ -78,8 +104,14 @@
 		Continue:'((..KLNr=4810)||(..KLNr=23112)||(..KLNr=1736))
 		Do ..ExportKlant()
 	}
-
-	Do ..CloseFiles()
+	
+	Do ..HoofdingFileWriter.Open(##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"1601AssortimentKlanten.csv"),$$$False)
+	Do ..HoofdingFileWriter.WriteStream(..HoofdingStream)
+	Do ..HoofdingFileWriter.Close()
+	
+	Do ..RegelFileWriter.Open(##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"1602AssortimentProducten.csv"),$$$False)
+	Do ..RegelFileWriter.WriteStream(..RegelStream)
+	Do ..RegelFileWriter.Close()
 ]]></Implementation>
 </Method>
 
@@ -147,35 +179,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OpenFiles">
+<Method name="MaakHeaders">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Use 0
-	Set ..DeviceProducten=$$OPEN^vhDEV(,"AssortimentProducten.csv","W","T")
-	Use ..DeviceProducten
-	Write "ItemListId;ItemType;ItemId",!
-	Use 0
-	Set ..DeviceKlanten=$$OPEN^vhDEV(,"AssortimentKlanten.csv","W")
-	Use ..DeviceKlanten
-	Write "ItemListId;CustAccount;Description",!
+	Do ..HoofdingStream.WriteLine("ItemListId;CustAccount;Description")
+	Do ..RegelStream.WriteLine("ItemListId;ItemType;ItemId")
 ]]></Implementation>
 </Method>
 
-<Method name="CloseFiles">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do CLOSE^vhDEV(..DeviceProducten)
-	Do CLOSE^vhDEV(..DeviceKlanten)
-]]></Implementation>
-</Method>
-
 <Method name="ExportAssortimentKlant">
 <Private>1</Private>
 <Implementation><![CDATA[
 	Do ..ClearTableID()
 	Do ..ClearAssortimentGroep()
-	Use ..DeviceKlanten
-	Write ..GeefTableID(),";",..GeefKlantIDInAXFormaat(),!
+	Do ..HoofdingStream.WriteLine(..GeefTableID()_";"_..GeefKlantIDInAXFormaat())
 ]]></Implementation>
 </Method>
 
@@ -211,9 +228,8 @@
 <Method name="ToevoegenAssortimentGroep">
 <FormalSpec>AssortimentGroep:%String</FormalSpec>
 <Implementation><![CDATA[
-	Use ..DeviceProducten
 	Do ..OnthoudenAssortimentGroep(AssortimentGroep)
-	Write ..GeefTableID(),";",..CategorieBepaler.VertaalAssortimentGroep(AssortimentGroep),";;","Opnemen",!
+	Do ..RegelStream.WriteLine(..GeefTableID()_";"_..CategorieBepaler.VertaalAssortimentGroep(AssortimentGroep)_";;"_"Opnemen")
 ]]></Implementation>
 </Method>
 
@@ -251,8 +267,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set IdentNr=$$$PRGet($$$IdentNummer)
-	Use ..DeviceProducten
-	Write ..GeefTableID(),";;",IdentNr,";",$S(Excluded:"Niet opnemen",1:"Opnemen"),";",PRNr,!
+	Do ..RegelStream.WriteLine(..GeefTableID()_";;"_IdentNr_";"_$S(Excluded:"Niet opnemen",1:"Opnemen")_";"_PRNr)
 ]]></Implementation>
 </Method>