hg/stx-libview: comparison ResourcePack.st

equal deleted inserted replaced

-:55ca0b1e251b
+:e7faff5c7fea
 "{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 1993 by Claus Gittinger
-	      All Rights Reserved
+All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 "{ Package: 'stx:libview' }"
 "{ NameSpace: Smalltalk }"
 Dictionary subclass:#ResourcePack
-	instanceVariableNames:'packsClassName packsFileName fileReadFailed superPack projectPack
+instanceVariableNames:'packsClassName packsFileName fileReadFailed superPack projectPack
-		usedKeys cache'
+usedKeys cache'
-	classVariableNames:'Packs FailedToLoadPacks DebugModifications
+classVariableNames:'Packs FailedToLoadPacks DebugModifications
-		KeepStatisticsOnUsedKeys'
+KeepStatisticsOnUsedKeys'
-	poolDictionaries:''
+poolDictionaries:''
-	category:'Interface-Internationalization'
+category:'Interface-Internationalization'
 !
 !ResourcePack class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1993 by Claus Gittinger
-	      All Rights Reserved
+All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 examples
 "
 normally, resources are found in files named after their classes sourcefile
 For example, the FileBrowsers resources are found in 'FBrowser.rs'.
 For the examples below, we process resources from a constant string;
-	this is NOT representative.
+this is NOT representative.
-									[exBegin]
+[exBegin]
-	|stream res|
+|stream res|
-	stream := ReadStream on:'
+stream := ReadStream on:'
 foo  ''the translation for foo''
 #if Language == #de
 bar  ''die deutsche uebersetzung von bar''
 baz  ''baz hat den Wert %1''
 #endif
 baz  ''%1, c''''est baz''
 #endif
 '.
-	res := ResourcePack new readFromResourceStream:stream in:nil.
+res := ResourcePack new readFromResourceStream:stream in:nil.
-	Transcript showCR:'baz is translated to: ' , (res string:'baz' with:'1234').
+Transcript showCR:'baz is translated to: ' , (res string:'baz' with:'1234').
-	Transcript showCR:'bar is translated to: ' , (res string:'bar').
+Transcript showCR:'bar is translated to: ' , (res string:'bar').
-	Transcript showCR:'foo is translated to: ' , (res string:'foo').
+Transcript showCR:'foo is translated to: ' , (res string:'foo').
-	Transcript showCR:'fooBar is translated to: ' , (res string:'fooBar').
+Transcript showCR:'fooBar is translated to: ' , (res string:'fooBar').
-									[exEnd]
+[exEnd]
 set the Language to french:
-									[exBegin]
+[exBegin]
-	Language := #fr
+Language := #fr
-									[exEnd]
+[exEnd]
 and repeat the above.
 back to english:
-									[exBegin]
+[exBegin]
-	Language := #en
+Language := #en
-									[exEnd]
+[exEnd]
 back to german:
-									[exBegin]
+[exBegin]
-	Language := #de
+Language := #de
-									[exEnd]
+[exEnd]
 "
 ! !
 !ResourcePack class methodsFor:'initialization'!
 "
 !
 initialize
 Packs isNil ifTrue:[
-	Packs := WeakArray new:100.
+Packs := WeakArray new:100.
-	FailedToLoadPacks := Set new.
+FailedToLoadPacks := Set new.
 ].
 "
 ResourcePack initialize
 "
 |fullName pack rsrcDir file|
 fullName := package , '/resources/',resourceFileName.
 cached ifTrue:[
-	pack := self searchCacheFor:fullName.
+pack := self searchCacheFor:fullName.
-	pack notNil ifTrue:[^ pack].
+pack notNil ifTrue:[^ pack].
-	(FailedToLoadPacks includes:fullName) ifTrue:[^ nil].
+(FailedToLoadPacks includes:fullName) ifTrue:[^ nil].
 ].
 rsrcDir := Smalltalk projectDirectoryForPackage:package.
 rsrcDir isNil ifTrue:[
-	file := Smalltalk getResourceFileName:resourceFileName forPackage:package.
+file := Smalltalk getResourceFileName:resourceFileName forPackage:package.
-	file isNil ifTrue:[
+file isNil ifTrue:[
-	    FailedToLoadPacks add:fullName.
+FailedToLoadPacks add:fullName.
-	    ^ nil
+^ nil
-	].
+].
-	rsrcDir := file asFilename directory.
+rsrcDir := file asFilename directory.
 ] ifFalse:[
-	rsrcDir := rsrcDir asFilename construct:'resources'.
+rsrcDir := rsrcDir asFilename construct:'resources'.
-	rsrcDir exists ifFalse:[
+rsrcDir exists ifFalse:[
-	    FailedToLoadPacks add:fullName.
+FailedToLoadPacks add:fullName.
-	    ^ nil
+^ nil
-	].
+].
 ].
 pack := self fromFile:resourceFileName directory:rsrcDir cached:cached.
 pack packsClassOrFileName:fullName.
 ^ pack
 addToCache:aPack
 |idx|
 Packs isNil ifTrue:[
-	self initialize.
+self initialize.
 ].
 idx := Packs identityIndexOf:nil.
 idx == 0 ifTrue:[
-	idx := Packs findFirst:[:slot | slot class == SmallInteger].
+idx := Packs findFirst:[:slot | slot class == SmallInteger].
 ].
 idx == 0 ifTrue:[
-	"
+"
-	 throw away oldest
+throw away oldest
-	"
+"
-	idx := Packs size.
+idx := Packs size.
-	Packs replaceFrom:1 to:idx-1 with:Packs startingAt:2.
+Packs replaceFrom:1 to:idx-1 with:Packs startingAt:2.
 ].
 aPack at:'__language__' put:(UserPreferences current language,'_',UserPreferences current languageTerritory).
 Packs at:idx put:aPack.
 "Modified: / 18-09-2006 / 19:12:12 / cg"
 searchCacheFor:aClassOrFileName
 |sz "{ Class: SmallInteger }" lang|
 Packs isNil ifTrue:[
-	self initialize.
+self initialize.
-	^ nil
+^ nil
 ].
 lang := (UserPreferences current language,'_',UserPreferences current languageTerritory).
 sz := Packs size.
 1 to:sz do:[:idx |
-	|aPack|
+|aPack|
-	aPack := Packs at:idx.
+aPack := Packs at:idx.
-	(aPack notNil and:[aPack class ~~ SmallInteger]) ifTrue:[
+(aPack notNil and:[aPack class ~~ SmallInteger]) ifTrue:[
-	    (aPack at:'__language__' ifAbsent:nil) = lang ifTrue:[
+(aPack at:'__language__' ifAbsent:nil) = lang ifTrue:[
-		aClassOrFileName = aPack packsClassOrFileName ifTrue:[
+aClassOrFileName = aPack packsClassOrFileName ifTrue:[
-		    "
+"
-		     bring to front for LRU
+bring to front for LRU
-		    "
+"
-		    idx ~~ 1 ifTrue:[
+idx ~~ 1 ifTrue:[
-			Packs replaceFrom:2 to:idx with:Packs startingAt:1.
+Packs replaceFrom:2 to:idx with:Packs startingAt:1.
-			Packs at:1 put:aPack.
+Packs at:1 put:aPack.
-		    ].
+].
-		    ^ aPack
+^ aPack
-		]
+]
-	    ]
+]
-	]
+]
 ].
 ^ nil
 "
 ResourcePack searchCacheFor:'TextView'
 (lineString startsWith:'encoding') ifFalse:[^ nil].
 rest := lineString copyFrom:9.
 rest := rest withoutSeparators.
 (rest startsWith:'#') ifTrue:[
-	rest := rest copyFrom:2.
+rest := rest copyFrom:2.
 ].
 (rest startsWith:'''') ifTrue:[
-	rest := rest copyFrom:2.
+rest := rest copyFrom:2.
-	(rest endsWith:'''') ifTrue:[
+(rest endsWith:'''') ifTrue:[
-	    rest := rest copyButLast:1.
+rest := rest copyButLast:1.
-	].
+].
 ].
 encoding := rest asSymbol.
 ^ encoding.
 !
 processResourceLine:lineString encoding:encodingSymbolOrEncoder file:fileName printErrorWith:printError for:aResourcePack
 "process a single valid line (i.e. #ifdef & #include has already been processed)"
 self
-	processResourceLine:lineString encoding:encodingSymbolOrEncoder file:fileName printErrorWith:printError for:aResourcePack
+processResourceLine:lineString encoding:encodingSymbolOrEncoder file:fileName printErrorWith:printError for:aResourcePack
-	keepUselessTranslations:false.
+keepUselessTranslations:false.
 !
 processResourceLine:lineString encoding:encodingSymbolOrEncoder file:fileName printErrorWith:printError for:aResourcePack keepUselessTranslations:keepUselessTranslations
 "process a single valid line (i.e. #ifdef & #include has already been processed)"
 |name lineStream idx rest macroName value
 conditional hasError decoder oldValue ignoreTranslation indirect|
 "/ Transcript showCR:lineString.
 encodingSymbolOrEncoder notNil ifTrue:[
-	encodingSymbolOrEncoder isSymbol ifTrue:[
+encodingSymbolOrEncoder isSymbol ifTrue:[
-	    decoder := CharacterEncoder encoderFor:encodingSymbolOrEncoder ifAbsent:nil.
+decoder := CharacterEncoder encoderFor:encodingSymbolOrEncoder ifAbsent:nil.
-	    decoder isNil ifTrue:[ decoder := CharacterEncoder nullEncoderInstance ].
+decoder isNil ifTrue:[ decoder := CharacterEncoder nullEncoderInstance ].
-	] ifFalse:[
+] ifFalse:[
-	    decoder := encodingSymbolOrEncoder
+decoder := encodingSymbolOrEncoder
-	].
+].
 ].
 decoder notNil ifTrue:[
-	lineStream := (decoder decodeString:lineString) readStream.
+lineStream := (decoder decodeString:lineString) readStream.
 ] ifFalse:[
-	lineStream := lineString readStream.
+lineStream := lineString readStream.
 ].
 lineStream signalAtEnd:false.
 lineStream skipSeparators.
 lineStream peek == $# ifTrue:[
-	name := Array
+name := Array
-		    readFrom:lineStream
+readFrom:lineStream
-		    onError:[
+onError:[
-				printError value:('invalid line <' , lineString , '>').
+printError value:('invalid line <' , lineString , '>').
-				nil
+nil
-			    ].
+].
 ] ifFalse:[
-	lineStream peek == $' ifTrue:[
+lineStream peek == $' ifTrue:[
-	    name := String
+name := String
-			readSmalltalkStringFrom:lineStream
+readSmalltalkStringFrom:lineStream
-			onError:[
+onError:[
-				    printError value:('invalid line <' , lineString , '>').
+printError value:('invalid line <' , lineString , '>').
-				    nil
+nil
-				].
+].
-	] ifFalse:[
+] ifFalse:[
-	    name := lineStream upToSeparator.
+name := lineStream upToSeparator.
-	].
+].
 ].
 name isNil ifTrue:[^ self ].
 ignoreTranslation := false.
 lineStream skipSeparators.
 idx := lineStream position + 1 + 1.
 lineStream peek == $< ifTrue:[
-	"
+"
-	 skip <type> if present
+skip <type> if present
-	"
+"
-	lineStream skipThrough:$>.
+lineStream skipThrough:$>.
-	lineStream skipSeparators.
+lineStream skipSeparators.
-	idx := lineStream position + 2.
+idx := lineStream position + 2.
 ].
 conditional := indirect := false.
 lineStream peek == $? ifTrue:[
-	conditional := true.
+conditional := true.
-	lineStream next.
+lineStream next.
-	lineStream skipSeparators.
+lineStream skipSeparators.
 ].
 lineStream peek == $@ ifTrue:[
-	indirect := true.
+indirect := true.
-	lineStream next.
+lineStream next.
-	lineStream skipSeparators.
+lineStream skipSeparators.
 ].
 lineStream peek == $= ifTrue:[
-	lineStream next.
+lineStream next.
-	macroName := lineStream nextAlphaNumericWord.
+macroName := lineStream nextAlphaNumericWord.
-	[lineStream peek == $.] whileTrue:[
+[lineStream peek == $.] whileTrue:[
-	    lineStream next.
+lineStream next.
-	    lineStream peek notNil ifTrue:[
+lineStream peek notNil ifTrue:[
-		macroName := macroName , '.' , (lineStream nextAlphaNumericWord)
+macroName := macroName , '.' , (lineStream nextAlphaNumericWord)
-	    ]
+]
-	].
+].
-	rest := lineStream upToEnd.
+rest := lineStream upToEnd.
-	value := aResourcePack at:macroName ifAbsent:nil.
+value := aResourcePack at:macroName ifAbsent:nil.
-	(value isNil) ifTrue:[
+(value isNil) ifTrue:[
-	    hasError := true.
+hasError := true.
-	    printError value:('bad (nil-valued) macro: ' , macroName).
+printError value:('bad (nil-valued) macro: ' , macroName).
-	].
+].
 "/        value isBlock ifTrue:[
 "/            value := value value
 "/        ].
-	rest isBlank ifFalse:[
+rest isBlank ifFalse:[
-	    value := Compiler evaluate:('self ' , rest)
+value := Compiler evaluate:('self ' , rest)
-			      receiver:value
+receiver:value
-			      notifying:nil
+notifying:nil
-			      compile:false.
+compile:false.
-	    (value == #Error) ifTrue:[
+(value == #Error) ifTrue:[
-		hasError := true.
+hasError := true.
-		printError value:('error in: "self ' , rest , '"').
+printError value:('error in: "self ' , rest , '"').
-	    ].
+].
-	    "/ 'self ' print. rest print. ' -> ' print. value printCR.
+"/ 'self ' print. rest print. ' -> ' print. value printCR.
-	]
+]
 ] ifFalse:[
-	lineStream peek == $' ifTrue:[
+lineStream peek == $' ifTrue:[
-	    value := String
+value := String
-			readSmalltalkStringFrom:lineStream
+readSmalltalkStringFrom:lineStream
-			onError:[
+onError:[
-				    printError value:('invalid line <' , lineString , '>').
+printError value:('invalid line <' , lineString , '>').
-				    nil
+nil
-				].
+].
-	    "/ ' -> ' print. value printCR.
+"/ ' -> ' print. value printCR.
-	] ifFalse:[
+] ifFalse:[
-	    rest := lineStream upToEnd.
+rest := lineStream upToEnd.
-	    [
+[
-		value := Compiler evaluate:rest compile:"true" false.
+value := Compiler evaluate:rest compile:"true" false.
-	    ] on:Error do:[
+] on:Error do:[
-		printError value:('invalid line <' , rest , '>').
+printError value:('invalid line <' , rest , '>').
-		"/ value := rest
+"/ value := rest
-	    ].
+].
-	    "/ rest print. ' -> ' print. value printCR.
+"/ rest print. ' -> ' print. value printCR.
-	].
+].
-	(value == #Error) ifTrue:[
+(value == #Error) ifTrue:[
-	    hasError := true.
+hasError := true.
-	    printError value:('error in: "' , rest , '"').
+printError value:('error in: "' , rest , '"').
-	] ifFalse:[
+] ifFalse:[
 "/            value isString ifTrue:[
 "/                decoder notNil ifTrue:[
 "/                    value := decoder decodeString:value
 "/                ]
 "/            ]
-	]
+]
 ].
 "/ Transcript show:name; show:' -> '; showCR:value.
 hasError ifFalse:[
-	(conditional not
+(conditional not
-	or:[(aResourcePack includesKey:name) not]) ifTrue:[
+or:[(aResourcePack includesKey:name) not]) ifTrue:[
-	    name = value ifTrue:[
+name = value ifTrue:[
-		keepUselessTranslations ifFalse:[
+keepUselessTranslations ifFalse:[
-		    printError value:('useless resource: "' , name , '"').
+printError value:('useless resource: "' , name , '"').
-		    ignoreTranslation := true
+ignoreTranslation := true
-		].
+].
-	    ].
+].
-	    ignoreTranslation ifFalse:[
+ignoreTranslation ifFalse:[
-		oldValue := aResourcePack at:name ifAbsent:nil.
+oldValue := aResourcePack at:name ifAbsent:nil.
-		oldValue notNil ifTrue:[
+oldValue notNil ifTrue:[
-		    oldValue ~= value ifTrue:[
+oldValue ~= value ifTrue:[
-			printError value:('conflicting resource: "' , name , '"').
+printError value:('conflicting resource: "' , name , '"').
-			printError value:('oldValue: ' , oldValue printString).
+printError value:('oldValue: ' , oldValue printString).
-			printError value:('newValue: ' , value printString).
+printError value:('newValue: ' , value printString).
-		    ] ifFalse:[
+] ifFalse:[
-			printError value:('duplicate resource: "' , name , '"').
+printError value:('duplicate resource: "' , name , '"').
-		    ].
+].
-		].
+].
-		indirect ifTrue:[
+indirect ifTrue:[
-		    value := aResourcePack string:value.
+value := aResourcePack string:value.
-		].
+].
-		DebugModifications == true ifTrue:[
+DebugModifications == true ifTrue:[
-		    "/ for debugging only !! (not all primitive code is ready for immutableStrings)
+"/ for debugging only !! (not all primitive code is ready for immutableStrings)
-		    value class == String ifTrue:[
+value class == String ifTrue:[
-			value := value asImmutableString.
+value := value asImmutableString.
-		    ].
+].
-		].
+].
-		aResourcePack at:name put:value.
+aResourcePack at:name put:value.
-	    ]
+]
-	]
+]
 ]
 "Modified: / 06-02-2014 / 15:33:03 / cg"
 !
 "
 !
 shortenedKeyFor:aKey
 "if
-	  aKey is '(...)', then return '...'
+aKey is '(...)', then return '...'
-	  if aKey is '[...]', then return '...'
+if aKey is '[...]', then return '...'
-	  if aKey is '{...}', then return '...'
+if aKey is '{...}', then return '...'
-	  if aKey starts or ends with any of '\:=.,?!! ', then return aKey without it
+if aKey starts or ends with any of '\:=.,?!! ', then return aKey without it
 This means, that only a single translation is required to provide local translations for
 things like
-	'search'
+'search'
-	'search:'
+'search:'
-	'search...'
+'search...'
 "
 |idx idx1 idx2 first last keySize|
 first := aKey first.
 keySize := aKey size.
 ((first == $( and:[last == $) ])
 or:[ (first == $[ and:[last == $] ])
 or:[ (first == ${ and:[last == $} ]) ]]) ifTrue:[
-	^ self shortenedKeyFor:(aKey copyFrom:2 to:keySize-1).
+^ self shortenedKeyFor:(aKey copyFrom:2 to:keySize-1).
 ].
 idx1 := aKey findFirst:[:ch | ch isSeparator not].
 idx2 := aKey findLast:[:ch | ch isSeparator not] ifNone:keySize.
 (idx1 > 1 or:[idx2 < keySize]) ifTrue:[
-	^ self shortenedKeyFor:(aKey copyFrom:idx1 to:idx2)
+^ self shortenedKeyFor:(aKey copyFrom:idx1 to:idx2)
 ].
 idx1 := aKey findFirst:[:ch | ('*:=.?!!,-><\' includes:ch) not].
 idx2 := aKey findLast:[:ch | ('*:=.?!!,-><\' includes:ch) not] ifNone:keySize.
 (idx1 > 1 or:[idx2 < keySize]) ifTrue:[
-	^ self shortenedKeyFor:(aKey copyFrom:idx1 to:idx2)
+^ self shortenedKeyFor:(aKey copyFrom:idx1 to:idx2)
 ].
 "/ change duplicated &'s to single
 (idx := aKey indexOf:$&) ~~ 0 ifTrue:[
-	(aKey at:idx+1 ifAbsent:nil) ~~ $& ifTrue:[
+(aKey at:idx+1 ifAbsent:nil) ~~ $& ifTrue:[
-	    ^ self shortenedKeyFor:(aKey copyTo:idx-1),(aKey copyFrom:idx+1).
+^ self shortenedKeyFor:(aKey copyTo:idx-1),(aKey copyFrom:idx+1).
-	].
+].
 ].
 ^ aKey.
 "
 'abcde' findFirst:[:ch | 'bcd' includes:ch]
 val notNil ifTrue:[
 cache at:aKey put:val.
 ^ val
 ].
 ].
-alreadySearched := Set new.
+alreadySearched := IdentitySet new.
 projectPack notNil ifTrue:[ alreadySearched add:projectPack ].
 pack := self superPack.
 [ pack notNil ] whileTrue:[
 val := pack localAt:aKey.
 ^ self at:s ifAbsent:s
 "
 NewLauncher classResources
-	string:'LICENCEFILE'
+string:'LICENCEFILE'
 "
 !
 string:s default:defaultString
 "translate (retrieve) a string - if not present, return defaultString"
 ^ self at:s ifAbsent:defaultString
 "
 NewLauncher classResources
-	string:'fooBar' default:'Hello world'
+string:'fooBar' default:'Hello world'
 "
 !
 string:s default:defaultString with:arg
 val := self localAt:aKey.
 val notNil ifTrue:[^ self].
 (projectPack := self projectPack) notNil ifTrue:[
-	val := projectPack localAt:aKey.
+val := projectPack localAt:aKey.
-	val notNil ifTrue:[^ projectPack].
+val notNil ifTrue:[^ projectPack].
 ].
 alreadySearched := Set new.
 projectPack notNil ifTrue:[ alreadySearched add:projectPack ].
 pack := self superPack.
 [ pack notNil ] whileTrue:[
-	val := pack localAt:aKey.
+val := pack localAt:aKey.
-	val notNil ifTrue:[^ pack].
+val notNil ifTrue:[^ pack].
-	(projectPack := pack projectPack) notNil ifTrue:[
+(projectPack := pack projectPack) notNil ifTrue:[
-	    (alreadySearched includes:projectPack) ifFalse:[
+(alreadySearched includes:projectPack) ifFalse:[
-		val := projectPack localAt:aKey.
+val := projectPack localAt:aKey.
-		val notNil ifTrue:[^ projectPack].
+val notNil ifTrue:[^ projectPack].
-		alreadySearched add:projectPack.
+alreadySearched add:projectPack.
-	    ].
+].
-	].
+].
-	pack := pack superPack
+pack := pack superPack
 ].
 alreadySearched copy do:[:projectPack |
-	|p|
+|p|
-	p := projectPack superPack.
+p := projectPack superPack.
-	[p notNil and:[(alreadySearched includes:p) not]] whileTrue:[
+[p notNil and:[(alreadySearched includes:p) not]] whileTrue:[
-	    val := p localAt:aKey.
+val := p localAt:aKey.
-	    val notNil ifTrue:[^ p].
+val notNil ifTrue:[^ p].
-	    alreadySearched add:p.
+alreadySearched add:p.
-	    p := p superPack.
+p := p superPack.
-	].
+].
 ].
 ^ nil
 ! !
 processLine:lineString encoding:encodingSymbolOrEncoder file:fileName printErrorWith:printError
 "process a single valid line (i.e. #ifdef & #include has already been processed)"
 self class
-	processResourceLine:lineString
+processResourceLine:lineString
-	encoding:encodingSymbolOrEncoder
+encoding:encodingSymbolOrEncoder
-	file:fileName
+file:fileName
-	printErrorWith:printError
+printErrorWith:printError
-	for:self
+for:self
 !
 readFromFile:fileName directory:dirName
 "read definitions from a file in a directory"
 fileReadFailed := false.
 "/ need to catch errors here, as the handler might itself need resources.
 "/ (happens when da.rs is not present in libbasic/resources.rs)
 ExternalStream openErrorSignal handle:[:ex |
-	Transcript showCR:'ResourcePack: failed to open file: ',fileName asString,' in ',dirName asString.
+Transcript showCR:'ResourcePack: failed to open file: ',fileName asString,' in ',dirName asString.
-	inStream := nil.
+inStream := nil.
 ] do:[
-	dirName = 'resources' ifTrue:[
+dirName = 'resources' ifTrue:[
-	    inStream := Smalltalk resourceFileStreamFor:fileName
+inStream := Smalltalk resourceFileStreamFor:fileName
-	] ifFalse:[
+] ifFalse:[
-	    inStream := Smalltalk systemFileStreamFor:
+inStream := Smalltalk systemFileStreamFor:
-			    (dirName isNil
+(dirName isNil
-				ifTrue:[fileName]
+ifTrue:[fileName]
-				ifFalse:[dirName asFilename construct:fileName]).
+ifFalse:[dirName asFilename construct:fileName]).
-	].
+].
 ].
 inStream isNil ifTrue:[
-	"
+"
-	 an empty pack
+an empty pack
-	"
+"
-	^ self nonexistingFileRead
+^ self nonexistingFileRead
 ].
 triedFilename := inStream pathName.
 [
-	ok := self readFromResourceStream:inStream in:(triedFilename asFilename directoryName).
+ok := self readFromResourceStream:inStream in:(triedFilename asFilename directoryName).
 ] ensure:[
-	inStream close.
+inStream close.
 ].
 ok ifTrue:[
-	packsFileName := triedFilename
+packsFileName := triedFilename
 ] ifFalse:[
-	fileReadFailed := true.
+fileReadFailed := true.
-	('ResourcePack [warning]: "' , triedFilename , '" contains error(s) - data may be incomplete.') errorPrintCR.
+('ResourcePack [warning]: "' , triedFilename , '" contains error(s) - data may be incomplete.') errorPrintCR.
 ].
 "Modified: / 20-08-2011 / 17:10:02 / cg"
 !

changeset 8462	e7faff5c7fea
parent 8461	55ca0b1e251b
child 8470	fa52e3d659d7