ifNotNil eliminated
authorClaus Gittinger <cg@exept.de>
Wed, 20 Nov 2002 10:56:43 +0100
changeset 3769 4b0f188d7f5c
parent 3768 e39ab287f08c
child 3770 9f2ef977834e
ifNotNil eliminated
ResourcePack.st
--- a/ResourcePack.st	Tue Nov 19 20:41:58 2002 +0100
+++ b/ResourcePack.st	Wed Nov 20 10:56:43 2002 +0100
@@ -647,27 +647,27 @@
 
     fileReadFailed := false.
     dirName = 'resources' ifTrue:[
-	inStream := Smalltalk resourceFileStreamFor:fileName
+        inStream := Smalltalk resourceFileStreamFor:fileName
     ] ifFalse:[
-	inStream := Smalltalk 
-			systemFileStreamFor:(dirName 
-						ifNil:[fileName]
-						ifNotNil:[dirName asFilename construct:fileName]).
+        inStream := Smalltalk 
+                        systemFileStreamFor:(dirName 
+                                                isNil ifTrue:[fileName]
+                                                ifFalse:[dirName asFilename construct:fileName]).
     ].
     inStream isNil ifTrue:[
-	"
-	 an empty pack
-	"
-	^ self nonexistingFileRead
+        "
+         an empty pack
+        "
+        ^ self nonexistingFileRead
     ].
 
     ok := self readFromResourceStream:inStream in:dirName.
     inStream close.
 
     ok ifFalse:[
-	fileReadFailed := true.
+        fileReadFailed := true.
 
-	('ResourcePack [warning]: ''' , inStream pathName , ''' contains error(s) - data may be incomplete.') errorPrintCR.
+        ('ResourcePack [warning]: ''' , inStream pathName , ''' contains error(s) - data may be incomplete.') errorPrintCR.
     ].
 
     "Modified: 10.1.1997 / 18:05:17 / cg"
@@ -813,6 +813,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.73 2002-11-11 09:27:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.74 2002-11-20 09:56:43 cg Exp $'
 ! !
+
 ResourcePack initialize!