Index: TECH/File/FileWriter.cls.xml
===================================================================
diff -u -r2184 -r2192
--- TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2184)
+++ TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2192)
@@ -15,14 +15,12 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Lock">
+<Property name="LockHelper">
 <Type>TECH.Lock</Type>
 <Private>1</Private>
 </Property>
 
 <Property name="WriteImmediate">
-<Description>
-Lock vervangen door LockTool of LockHelper</Description>
 <Type>%Boolean</Type>
 <Private>1</Private>
 </Property>
@@ -40,9 +38,9 @@
 	Set ..WriteImmediate = WriteImmediate
 	
 	/// Nagaan of reeds naar bestand wordt geschreven door ander process
-	Set ..Lock = ##class(TECH.Lock).%New(..GeefLockKey())
-	If ('..Lock.HeeftLock()) {
-		Do ..Lock.Lock(##class(TECH.enu.LockType).Exclusive())
+	Set ..LockHelper = ##class(TECH.Lock).%New(..GeefLockKey())
+	If ('..LockHelper.IsGelocked()) {
+		Do ..LockHelper.Lock(##class(TECH.enu.LockType).Exclusive())
 	}Else{
 		Set Exception = ##class(TECH.Exceptions.FileException).%New("Er wordt reeds naar de file '"_..Bestand_"' geschreven.",1)
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
@@ -60,7 +58,7 @@
 		Set ..FileCharacterStream.Filename = ..Bestand
 	}Else{
 		Set TempDir = ##class(TECH.Config.ConfigMgr).Instance().GetString("vhDev.TempFilePath")	
-		Set TempFile = $job_"_"_##class(TECH.DateTime).CurrentTime()_"_"_$random(99999999)  // (RV-JCL) misschien vaste extensie gebruiken..
+		Set TempFile = $job_"_"_##class(TECH.DateTime).CurrentTime()_"_"_$random(99999999)_".tmp"
 		Set TempBestand = ##class(TECH.Files).AppendFile(TempDir,TempFile)
 		Set ..FileCharacterStream.Filename = TempBestand
 	}
@@ -87,16 +85,15 @@
 				Do ##class(TECH.ExceptionHandler).Throw(Exception)	
 			}			
 		}Else{
-			Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden verplaatst. '"_Filename_"' naar '"_..Bestand_"'.",0)
+			Set DeleteGelukt = ##class(TECH.File).Delete(Filename)
+			Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden verplaatst. '"_Filename_"' naar '"_..Bestand_"'. "_Filename_" is verwijderd ? "_DeleteGelukt_".",0)			
 			Do ##class(TECH.ExceptionHandler).Throw(Exception)
-			
-			/// (RV-JCL) hier toch delete herhalen van het temp bestand 
 		}
 	}		
 	Set ..FileCharacterStream = ""
 Catch	
 	Set $ZTRAP = ""
-	Do ..Lock.UnLock(##class(TECH.enu.LockType).Exclusive())
+	Do ..LockHelper.UnLock(##class(TECH.enu.LockType).Exclusive())
 ]]></Implementation>
 </Method>
 
@@ -129,7 +126,7 @@
 <Method name="GeefLockKey">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "^FileHandler("""_..Bestand_""")"  	// (RV-JCL) TECH.File.FileHandler
+<Implementation><![CDATA[	Quit "^TECH.File.FileHandler("""_..Bestand_""")"
 ]]></Implementation>
 </Method>