[Pkg] The Trunk: Files-fbs.128.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Jul 25 07:26:35 UTC 2013


Frank Shearar uploaded a new version of Files to project The Trunk:
http://source.squeak.org/trunk/Files-fbs.128.mcz

==================== Summary ====================

Name: Files-fbs.128
Author: fbs
Time: 25 July 2013, 8:26:21.116 am
UUID: f751583f-c90a-2b41-b77f-55d51539a705
Ancestors: Files-fbs.127

SmalltalkImage current -> Smalltalk.

=============== Diff against Files-fbs.127 ===============

Item was changed:
  ----- Method: AcornFileDirectory class>>isActiveDirectoryClass (in category 'platform specific') -----
  isActiveDirectoryClass
  	"Does this class claim to be that properly active subclass of FileDirectory  
  	for the current platform? On Acorn, the test is whether platformName 
  	is 'RiscOS' (on newer VMs) or if the primPathNameDelimiter is $. (on
  	older ones), which is what we would like to use for a dirsep if only it
  	would work out. See pathNameDelimiter for more woeful details - then
  	just get on and enjoy Squeak"
  
+ 	^ Smalltalk platformName = 'RiscOS'
- 	^ SmalltalkImage current platformName = 'RiscOS'
  		or: [self primPathNameDelimiter = $.]!

Item was changed:
  ----- Method: CrLfFileStream class>>guessDefaultLineEndConvention (in category 'class initialization') -----
  guessDefaultLineEndConvention
  	"Lets try to guess the line end convention from what we know about the
  	path name delimiter from FileDirectory."
  	FileDirectory pathNameDelimiter = $:
  		ifTrue: [^ self defaultToCR].
  	FileDirectory pathNameDelimiter = $/
+ 		ifTrue: [((Smalltalk osVersion) beginsWith: 'darwin')
- 		ifTrue: [((SmalltalkImage current osVersion) beginsWith: 'darwin')
  				ifTrue: [^ self defaultToCR]
  				ifFalse: [^ self defaultToLF]].
  	FileDirectory pathNameDelimiter = $\
  		ifTrue: [^ self defaultToCRLF].
  	"in case we don't know"
  	^ self defaultToCR!

Item was changed:
  ----- Method: FileDirectory class>>lookInUsualPlaces: (in category 'create/delete file') -----
  lookInUsualPlaces: fileName
  	"Check the default directory, the imagePath, and the vmPath (and the vmPath's owner) for this file."
  
  	| vmp |
  	(FileDirectory default fileExists: fileName)
  		ifTrue: [^ FileDirectory default fileNamed: fileName].
  
+ 	((vmp := FileDirectory on: Smalltalk imagePath) fileExists: fileName)
- 	((vmp := FileDirectory on: SmalltalkImage current imagePath) fileExists: fileName)
  		ifTrue: [^ vmp fileNamed: fileName].
  
+ 	((vmp := FileDirectory on: Smalltalk vmPath) fileExists: fileName)
- 	((vmp := FileDirectory on: SmalltalkImage current vmPath) fileExists: fileName)
  		ifTrue: [^ vmp fileNamed: fileName].
  
  	((vmp := vmp containingDirectory) fileExists: fileName)
  		ifTrue: [^ vmp fileNamed: fileName].
  
  	^ nil!

Item was changed:
  ----- Method: FileDirectory class>>shutDown (in category 'system start up') -----
  shutDown
  
+ 	Smalltalk closeSourceFiles.
- 	SmalltalkImage current closeSourceFiles.
  !

Item was changed:
  ----- Method: FileDirectory class>>startUp (in category 'name utilities') -----
  startUp
  	"Establish the platform-specific FileDirectory subclass. Do any platform-specific startup."
  	self setDefaultDirectoryClass.
  
+ 	self setDefaultDirectory: (self dirPathFor: Smalltalk imageName).
- 	self setDefaultDirectory: (self dirPathFor: SmalltalkImage current imageName).
  
  	Preferences startInUntrustedDirectory 
  		ifTrue:[	"The SecurityManager may override the default directory to prevent unwanted write access etc."
  				self setDefaultDirectory: SecurityManager default untrustedUserDirectory.
  				"Make sure we have a place to go to"
  				DefaultDirectory assureExistence].
+ 	Smalltalk openSourceFiles.
- 	SmalltalkImage current openSourceFiles.
  !

Item was changed:
  ----- Method: MacFileDirectory class>>isActiveDirectoryClass (in category 'platform specific') -----
  isActiveDirectoryClass
  	^ super isActiveDirectoryClass
+ 		and: [(Smalltalk getSystemAttribute: 1201) isNil
+ 				or: [(Smalltalk getSystemAttribute: 1201) asNumber <= 31]]!
- 		and: [(SmalltalkImage current getSystemAttribute: 1201) isNil
- 				or: [(SmalltalkImage current getSystemAttribute: 1201) asNumber <= 31]]!

Item was changed:
  ----- Method: MacHFSPlusFileDirectory class>>isActiveDirectoryClass (in category 'platform specific') -----
  isActiveDirectoryClass
  	"Ok, lets see if we support HFS Plus file names, the long ones"
  
+ 	^ (self pathNameDelimiter = self primPathNameDelimiter) and: [(Smalltalk  getSystemAttribute: 1201) notNil and: [(Smalltalk getSystemAttribute: 1201) asNumber > 31]]!
- 	^ (self pathNameDelimiter = self primPathNameDelimiter) and: [(SmalltalkImage current  getSystemAttribute: 1201) notNil and: [(SmalltalkImage current getSystemAttribute: 1201) asNumber > 31]]!



More information about the Packages mailing list