Do not refer to non-existant aspect
authorStefan Vogel <sv@exept.de>
Tue, 20 Feb 2007 09:12:55 +0100
changeset 10394 485f6c2d8db0
parent 10393 68b206e1af51
child 10395 62fd9eba5c4b
Do not refer to non-existant aspect
PeekableStream.st
--- a/PeekableStream.st	Mon Feb 19 17:52:22 2007 +0100
+++ b/PeekableStream.st	Tue Feb 20 09:12:55 2007 +0100
@@ -606,45 +606,7 @@
      return the value of the last chunk.
      Someone (which is usually some codeView) is notified of errors."
 
-    self isFileStream ifFalse:[
-        ^ self basicFileInNotifying:notifiedLoader passChunk:passChunk.
-    ].
-
-    ^ self fileInNotifying:notifiedLoader passChunk:passChunk inDirectory:(self pathName asFilename directory).
-!
-
-fileInNotifying:notifiedLoader passChunk:passChunk inDirectory:aDirectory
-    "central method to file in from the receiver, i.e. read chunks and evaluate them -
-     return the value of the last chunk.
-     Someone (which is usually some codeView) is notified of errors."
-
-    |oldPath val thisDirectory thisDirectoryPathName|
-
-    thisDirectory := aDirectory asFilename.
-    thisDirectoryPathName := thisDirectory pathName.
-    oldPath := Smalltalk systemPath.
-
-    [   
-        Smalltalk systemPath:(oldPath copy addFirst:thisDirectoryPathName; yourself).
-        self class currentFileInDirectoryQuerySignal answer:thisDirectory do:[
-            self class currentSourceContainerQuery answer:self do:[
-                val := self basicFileInNotifying:notifiedLoader passChunk:passChunk.
-            ].
-        ]
-    ] ensure:[
-        "take care, someone could have changed SystemPath during fileIn!!"
-        (Smalltalk systemPath copyFrom:2) = oldPath ifTrue:[
-            Smalltalk systemPath:oldPath.
-        ] ifFalse:[
-            (oldPath includes:thisDirectoryPathName) ifFalse:[
-                Smalltalk systemPath remove:thisDirectoryPathName ifAbsent:[].
-                Smalltalk flushPathCaches.
-            ].
-        ].
-    ].
-    ^ val
-
-    "Modified: / 23-10-2006 / 16:35:10 / cg"
+    ^ self basicFileInNotifying:notifiedLoader passChunk:passChunk.
 !
 
 fileInXMLNotifying:someone passChunk:passChunk
@@ -1023,7 +985,7 @@
 !PeekableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PeekableStream.st,v 1.34 2007-01-24 16:20:55 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/PeekableStream.st,v 1.35 2007-02-20 08:12:55 stefan Exp $'
 ! !
 
 PeekableStream initialize!