Index: TECH/File/FileReader.cls.xml
===================================================================
diff -u -r2184 -r2192
--- TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2184)
+++ TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2192)
@@ -6,20 +6,13 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Bestand">
-<Description>
-wat met locking ??? wat als iemand bezig is met het bestand te wijzigen ???</Description>
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
-<UDLText name="T">
-<Content><![CDATA[
-// (RV-JCL) private ??
-
-]]></Content>
-</UDLText>
-
 <Property name="FileCharacterStream">
 <Type>%FileCharacterStream</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -54,20 +47,27 @@
 <Method name="ReadLine">
 <Description>
 Leest een lijn uit. 
-Resultaat -1 = einde van bestand.
-
-(RV-JCL) zou AtEnd in aparte waarde steken .. wat als de tekst juist -1 is ;-)
-wat met rewind ??? of iedere keer file reader opnieuw openen..</Description>
+Resultaat -1 = einde van bestand.</Description>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Line = -1
+	Set Line = ""
 	If ('..FileCharacterStream.AtEnd){
 		Set Line = ..FileCharacterStream.ReadLine()
 	}
+	If (Line = "") { 
+		Set Exception = ##class(TECH.Exceptions.FileException).%New("Einde van bestand  '"_..Bestand_"' reeds bereikt.")
+		Do ##class(TECH.ExceptionHandler).Throw(Exception) 
+	}
 	Quit Line
 ]]></Implementation>
 </Method>
 
+<Method name="HasNextLine">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit '..AtEnd()
+]]></Implementation>
+</Method>
+
 <Method name="AtEnd">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ..FileCharacterStream.AtEnd
@@ -81,7 +81,9 @@
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Do ..Close()
+<Implementation><![CDATA[
+	Do ..Close()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 </Class>