hg/stx-libbasic: comparison Filename.st

equal deleted inserted replaced

-:af82888ceb72
+:1f5aa87f6170
 ^ URL fromString:self pathName.
 !
 components
-"return the receivers filename components - that is the name of each directory
+"return the receiver's filename components - that is the name of each directory
 along the pathName (that DOES include the root directory)"
 ^ self species components:self name
 "
 'Makefile' asFilename asAbsoluteFilename components
 "
 !
 makeLegalFilename
-"convert the receivers name to be a legal filename.
+"convert the receiver's name to be a legal filename.
 This removes/replaces invalid characters and/or compresses
 the name as required by the OS.
 The implementation may change in the future to be more
 OS specific."
 "Modified: / 23.12.1999 / 21:52:36 / cg"
 !
 basicMakeDirectory
-"create a directory with the receivers name.
+"create a directory with the receiver's name.
 Return true if successful, false if not."
 ^ OperatingSystem createDirectory:(self osNameForDirectory)
 !
 out reset; contents
 "
 !
 createAsEmptyFile
-"create an empty file with the receivers name.
+"create an empty file with the receiver's name.
 Raises an exception if not successful
 (either already existing or creation not possible)"
 |writeStream|
 self exists ifTrue:[
-	OperatingSystem accessDeniedErrorSignal
+OperatingSystem accessDeniedErrorSignal
-	    raiseRequestWith:self
+raiseRequestWith:self
-	    errorString:(' - file exists: ' , self asString).
+errorString:(' - file exists: ' , self asString).
-	^ self
+^ self
 ].
 FileStream openErrorSignal handle:[:ex|
-	self fileCreationError:self.
+self fileCreationError:self.
-	^ self
+^ self
 ] do:[
-	writeStream := self newReadWriteStream.
+writeStream := self newReadWriteStream.
 ].
 writeStream close.
 !
 createAsSymbolicLinkTo:linkFilenameString
-"create a directory with the receivers name.
+"create a directory with the receiver's name.
 Raises an exception if not successful"
 OperatingSystem createSymbolicLinkFrom:linkFilenameString to:self pathName.
 "
-	'/tmp/link' asFilename makeSymbolicLinkTo:'bla'
+'/tmp/link' asFilename makeSymbolicLinkTo:'bla'
 "
 !
 delete
 "remove the file - same as remove, for ST-80 compatibility"
 self remove
 !
 makeDirectory
-"create a directory with the receivers name.
+"create a directory with the receiver's name.
 Raises an exception if not successful"
 (self basicMakeDirectory) ifFalse:[
-	"/
+"/
-	"/ could have existed before ...
+"/ could have existed before ...
-	"/
+"/
-	(self exists and:[self isDirectory]) ifFalse:[
+(self exists and:[self isDirectory]) ifFalse:[
-	    self fileCreationError:self.
+self fileCreationError:self.
-	    ^ false
+^ false
-	]
+]
 ].
 ^ true
 "Modified: / 5.5.1999 / 13:36:33 / cg"
 !
 filenameCompletion
 "try to complete the receiver filename.
 BAD DESIGN: has side effect on the receiver.
 This method has both a return value and a side effect on the receiver:
 it returns a collection of matching filename objects,
-and changes the receivers filename-string to the longest common
+and changes the receiver's filename-string to the longest common
 match.
-If none matches, the returned collection is empty and the recevier is unchanged.
+If none matches, the returned collection is empty and the receiver is unchanged.
 If there is only one match, the size of the returned collection is exactly 1,
 containing the fully expanded filename and the receivers name is changed to it."
 ^ self filenameCompletionIn:nil
 !
 physicalFilename
 "return the fileName representing the physical file as represented by the receiver,
 If the receiver represents a symbolic link, thats the fileName of the
-final target. Otherwise, its the receivers pathName itself.
+final target. Otherwise, its the receiver's pathName itself.
 If any file along the symbolic path does not exist (i.e. is a broken link),
 nil is returned."
 |pathOrNil|
 pathOrNil := self physicalPathName.
 pathOrNil isNil ifTrue:[
-	^ nil
+^ nil
 ].
 ^ pathOrNil asFilename
 "
 '/foo/bar' asFilename physicalFileName
 !
 physicalPathName
 "return the full pathname of the physical file represented by the receiver,
 If the receiver represents a symbolic link, thats the fileName of the
-final target. Otherwise, its the receivers pathName itself.
+final target. Otherwise, its the receiver's pathName itself.
 If any file along the symbolic path does not exist (i.e. is a broken link),
 nil is returned."
 |t path info|
 info := self linkInfo.
 info isNil ifTrue:[
-	" I do not exist"
+" I do not exist"
-	^ nil.
+^ nil.
 ].
 info isSymbolicLink ifFalse:[
-	^ self pathName
+^ self pathName
 ].
 t := self.
 [
-	path := info path.
+path := info path.
-	path isNil ifTrue:[
+path isNil ifTrue:[
-	    "/ cannot happen
+"/ cannot happen
-	    ^ nil
+^ nil
-	].
+].
-	path asFilename isAbsolute ifTrue:[
+path asFilename isAbsolute ifTrue:[
-	    t := path asFilename
+t := path asFilename
-	] ifFalse:[
+] ifFalse:[
-	    t := (self species named:t directoryName) construct:path.
+t := (self species named:t directoryName) construct:path.
-	].
+].
-	info := t linkInfo.
+info := t linkInfo.
-	info isNil ifTrue:[
+info isNil ifTrue:[
-	    "t does not exist"
+"t does not exist"
-	     ^ nil
+^ nil
-	].
+].
 ] doWhile:[info isSymbolicLink].
 ^ t pathName
 "
 ! !
 !Filename methodsFor:'suffixes'!
 addSuffix:aSuffix
-"return a new filename for the receivers name with a additional suffix.
+"return a new filename for the receiver's name with a additional suffix.
 The new suffix is simply appended to the name,
 regardless whether there is already an existing suffix.
 See also #withSuffix:"
 |prefixName|
 prefixName := self name.
 aSuffix isEmptyOrNil ifTrue:[
-	^ self species named:prefixName
+^ self species named:prefixName
 ].
 ^ self species named:
-	(prefixName
+(prefixName
-	 , self species suffixSeparator asString
+, self species suffixSeparator asString
-	 , aSuffix asString)
+, aSuffix asString)
 "
 'abc.st' asFilename addSuffix:nil
 'a.b.c' asFilename addSuffix:nil
 '.b.c.' asFilename addSuffix:nil
 "Modified: 7.9.1997 / 02:55:25 / cg"
 !
 nameWithoutSuffix
-"return the receivers name without the suffix.
+"return the receiver's name without the suffix.
 If the name has no suffix, the original name is returned."
 |nm idx idxFromEnd|
 nm := self baseName.
 "Modified: 7.9.1995 / 11:09:03 / claus"
 !
 withSuffix:aSuffix
-"return a new filename for the receivers name with a different suffix.
+"return a new filename for the receiver's name with a different suffix.
 If the name already has a suffix, the new suffix replaces it;
 otherwise, the new suffix is simply appended to the name."
 |prefixName|
 prefixName := self nameWithoutSuffix.
 aSuffix isEmptyOrNil ifTrue:[
-	^ self species named:prefixName
+^ self species named:prefixName
 ].
 ^ self species named:
-	(prefixName
+(prefixName
-	 , self class suffixSeparator asString
+, self class suffixSeparator asString
-	 , aSuffix asString)
+, aSuffix asString)
 "
 'abc.st' asFilename withSuffix:nil
 'a.b.c' asFilename withSuffix:nil
 '.b.c.' asFilename withSuffix:nil
 "Modified: / 07-09-1995 / 11:15:42 / claus"
 "Modified: / 07-11-2006 / 13:58:45 / cg"
 !
 withoutSuffix
-"return a new filename for the receivers name without the suffix.
+"return a new filename for the receiver's name without the suffix.
 If the name has no suffix, a filename representing the same file as the receiver is returned."
 |n|
 n := self nameWithoutSuffix.

branch	jv
changeset 19478	1f5aa87f6170
parent 19406	faccbadf3034
parent 19440	10dcec541744
child 19610	a9a6940944a9