Index: vhTest/Fake/TECH/File/FileReader.cls.xml
===================================================================
diff -u -r2401 -r2525
--- vhTest/Fake/TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2401)
+++ vhTest/Fake/TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2525)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.TECH.File.FileReader">
-<Super>TECH.File.FileReader,TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,TECH.File.FileReader</Super>
 
-<Property name="FakeList">
-<Type>TECH.ListbuildIterator</Type>
+<Property name="Stream">
+<Type>%Stream.Object</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FakeList:%List=""</FormalSpec>
+<FormalSpec>Stream:%Stream.Object=""</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..FakeList = ##class(TECH.ListbuildIterator).%New(FakeList)
+	set ..Stream = $$$Inject(Stream,##class(%GlobalCharacterStream).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefStream">
 <ReturnType>%FileCharacterStream</ReturnType>
-<Implementation><![CDATA[	Quit ""
+<Implementation><![CDATA[	Quit ..Stream
 ]]></Implementation>
 </Method>
 
 <Method name="Close">
-<Implementation><![CDATA[	Do ..FakeList.%Close()
+<Implementation><![CDATA[	Do ..Stream.%Close()
 ]]></Implementation>
 </Method>
 
 <Method name="ReadLine">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..FakeList.Next()
+<Implementation><![CDATA[	Quit ..Stream.ReadLine()
 ]]></Implementation>
 </Method>
 
-<Method name="HasNextLine">
+<Method name="AtEnd">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..FakeList.HasNext()
+<Implementation><![CDATA[	Quit ..Stream.AtEnd
 ]]></Implementation>
 </Method>
 
-<Method name="AtEnd">
+<Method name="HasNextLine">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit '..FakeList.HasNext()
+<Implementation><![CDATA[	quit '..AtEnd()
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/File/impl/FileReader.cls.xml
===================================================================
diff -u -r913 -r2525
--- TECH/File/impl/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 913)
+++ TECH/File/impl/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2525)
@@ -11,8 +11,8 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
-<Property name="FileCharacterStream">
-<Type>%FileCharacterStream</Type>
+<Property name="Stream">
+<Type>%Stream.Object</Type>
 <Private>1</Private>
 </Property>
 
@@ -22,14 +22,13 @@
 <FormalSpec>Bestand:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	
 	Set ..Bestand = Bestand
 	
 	If ##class(TECH.File).Exists(..Bestand)
 	{
-		Set ..FileCharacterStream = ##class(%FileCharacterStream).%New()
-		Set ..FileCharacterStream.Filename = ..Bestand
-		Do ..FileCharacterStream.Rewind()
+		Set ..Stream = ##class(%FileCharacterStream).%New()
+		Set ..Stream.Filename = ..Bestand
+		Do ..Stream.Rewind()
 	}Else{
 		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Het bestand '"_..Bestand_"' bestaat niet.")
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
@@ -40,14 +39,14 @@
 
 <Method name="GeefStream">
 <ReturnType>%FileCharacterStream</ReturnType>
-<Implementation><![CDATA[	quit ..FileCharacterStream
+<Implementation><![CDATA[	quit ..Stream
 ]]></Implementation>
 </Method>
 
 <Method name="Close">
 <Implementation><![CDATA[
-	Do ..FileCharacterStream.%Close()
-	Set ..FileCharacterStream = ""
+	Do ..Stream.%Close()
+	Set ..Stream = ""
 ]]></Implementation>
 </Method>
 
@@ -58,8 +57,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Line As %String = ""
-	If ('..FileCharacterStream.AtEnd){
-		Set Line = ..FileCharacterStream.ReadLine()
+	If ('..Stream.AtEnd){
+		Set Line = ..Stream.ReadLine()
 	}
 	If (Line = "") { 
 		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Einde van bestand  '"_..Bestand_"' reeds bereikt.")
@@ -77,14 +76,11 @@
 
 <Method name="AtEnd">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..FileCharacterStream.AtEnd
+<Implementation><![CDATA[	Quit ..Stream.AtEnd
 ]]></Implementation>
 </Method>
 
 <Method name="%OnClose">
-<Description><![CDATA[
-This callback method is invoked by the <METHOD>%Close</METHOD> method to 
-provide notification that the current object is being closed.]]></Description>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>