Squeak-dev May 2012

squeak-dev@lists.squeakfoundation.org

54 participants
171 discussions

The Trunk: Graphics-bf.194.mcz
by commits＠source.squeak.org 29 May '12

29 May '12

Bert Freudenberg uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-bf.194.mcz ==================== Summary ==================== Name: Graphics-bf.194 Author: bf Time: 29 May 2012, 5:49:32.623 pm UUID: 41c6f0cd-d9fb-41ab-80c5-179d62a166fc Ancestors: Graphics-bf.193 Add Point>>area (needed by CroquetGL) =============== Diff against Graphics-bf.193 =============== Item was added: + ----- Method: Point>>area (in category 'point functions') ----- + area + ^ x * y!

1 0

The Trunk: Installer-Core-bf.355.mcz
by commits＠source.squeak.org 29 May '12

29 May '12

Bert Freudenberg uploaded a new version of Installer-Core to project The Trunk: http://source.squeak.org/trunk/Installer-Core-bf.355.mcz ==================== Summary ==================== Name: Installer-Core-bf.355 Author: bf Time: 29 May 2012, 12:12:41.76 pm UUID: b2d1d0b9-838d-45d0-873c-8aae20ca4851 Ancestors: Installer-Core-ul.354 Do not automatically pick latest version from a different branch. (this currently happened in the FFI repo where the latest versions are FFI-Kernel-tbn.25 and FFI-Kernel.threaded-eem.25 and Installer picked the branch over the mainline) =============== Diff against Installer-Core-ul.354 =============== Item was changed: ----- Method: InstallerMonticello>>mcDetectFileBlock: (in category 'monticello') ----- mcDetectFileBlock: pkg + pkg isString ifTrue: [ ^ [ :aMCVersionName | + (pkg beginsWith: aMCVersionName packageAndBranchName) and: [aMCVersionName beginsWith: pkg ] ] ]. - pkg isString ifTrue: [ ^ [ :aFile | aFile beginsWith: pkg ] ]. (pkg isKindOf: Array) + ifTrue: [ ^ [ :aMCVersionName | pkg anySatisfy: [ :item | + (item beginsWith: aMCVersionName packageAndBranchName) and: [aMCVersionName beginsWith: item ] ] ] ]. - ifTrue: [ ^ [ :aFile | pkg anySatisfy: [ :item | aFile beginsWith: item ] ] ]. pkg isBlock ifTrue: [ ^ pkg ]. - !

1 0

The Trunk: Monticello-bf.509.mcz
by commits＠source.squeak.org 29 May '12

29 May '12

Bert Freudenberg uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-bf.509.mcz ==================== Summary ==================== Name: Monticello-bf.509 Author: bf Time: 29 May 2012, 12:06:58.832 pm UUID: 02bc3aaf-6de3-4b06-8264-852ba776aeb4 Ancestors: Monticello-bf.508 Allow to specify branch name in MCFileBasedRepository>>versionNamesForPackageNamed: =============== Diff against Monticello-bf.508 =============== Item was changed: ----- Method: MCFileBasedRepository>>versionNamesForPackageNamed: (in category 'versions') ----- + versionNamesForPackageNamed: packageName - versionNamesForPackageNamed: packageName ^ Array streamContents: + [ : stream | | wantBranch | + wantBranch := packageName includes: $.. + self allFileNamesOrCache do: + [ : each | | mcVersionName branchName | - [ : stream | self allFileNamesOrCache do: - [ : each | | mcVersionName | mcVersionName := each asMCVersionName. + branchName := wantBranch + ifTrue: [mcVersionName packageAndBranchName] + ifFalse: [mcVersionName packageName]. + packageName = branchName ifTrue: [ stream nextPut: mcVersionName ] ] ]! - mcVersionName packageName = packageName ifTrue: [ stream nextPut: mcVersionName ] ] ]!

1 0

Daily Commit Log
by commits＠source.squeak.org 29 May '12

29 May '12

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2012-May/005351.html Name: ToolBuilder-Morphic-cmm.85 Ancestors: ToolBuilder-Morphic-cwp.84 - TreeMorph: allow drop-target callbacks to interrogate the shouldCopy argument. - After the drop operation is complete, remove the drop highlight. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-May/005352.html Name: Tools-cmm.409 Ancestors: Tools-cmm.408 - Recover FileList's drag-and-drop capabilities. - Recover HierarchyBrowser's drag-and-drop capabilities. =============================================

1 0

Re: [squeak-dev] The Trunk: Tools-cmm.409.mcz
by Chris Muller 28 May '12

28 May '12

I accidently left an unsent method in here -- I'll remove it soon. On Sun, May 27, 2012 at 10:01 PM, <commits(a)source.squeak.org> wrote: > Chris Muller uploaded a new version of Tools to project The Trunk: > http://source.squeak.org/trunk/Tools-cmm.409.mcz > > ==================== Summary ==================== > > Name: Tools-cmm.409 > Author: cmm > Time: 27 May 2012, 10:01:04.714 pm > UUID: a45e1538-f3ab-4ca2-954a-13cb6caeff7c > Ancestors: Tools-cmm.408 > > - Recover FileList's drag-and-drop capabilities. > - Recover HierarchyBrowser's drag-and-drop capabilities. > > =============== Diff against Tools-cmm.408 =============== > > Item was changed: > ----- Method: Browser>>dragFromClassList: (in category 'drag and drop') ----- > + dragFromClassList: index > - dragFromClassList: index > "Drag a class from the browser" > | name envt | > + (name := self classList at: index) ifNil: [ ^ nil ]. > + (envt := self selectedEnvironment) ifNil: [ ^ nil ]. > + ^ envt > + at: name withBlanksTrimmed asSymbol > + ifAbsent: [ ]! > - (name := self classList at: index) ifNil: [^ nil]. > - (envt := self selectedEnvironment) ifNil: [^ nil]. > - ^ envt at: name ifAbsent:[nil]! > > Item was changed: > ----- Method: FileList class>>windowColorSpecification (in category 'window color') ----- > windowColorSpecification > "Answer a WindowColorSpec object that declares my preference" > + ^ WindowColorSpec > + classSymbol: self name > + wording: 'File List' > + brightColor: #lightGray > + pastelColor: #lightGray > + helpMessage: 'A tool for looking at files'! > - > - ^ WindowColorSpec classSymbol: self name wording: 'File List' brightColor: #lightMagenta pastelColor: #paleMagenta helpMessage: 'A tool for looking at files'! > > Item was changed: > ----- Method: FileList>>buildDirectoryTreeWith: (in category 'toolbuilder') ----- > + buildDirectoryTreeWith: builder > - buildDirectoryTreeWith: builder > | treeSpec | > treeSpec := builder pluggableTreeSpec new. > + treeSpec > + model: self ; > + roots: #rootDirectoryList ; > + hasChildren: #hasMoreDirectories: ; > + getChildren: #subDirectoriesOf: ; > + getSelectedPath: #selectedPath ; > + setSelected: #setDirectoryTo: ; > + label: #directoryNameOf: ; > + menu: #volumeMenu: ; > + autoDeselect: false. > + Preferences browseWithDragNDrop ifTrue: > + [ treeSpec > + dragItem: #dragFromDirectoryList: ; > + dropItem: #drop:ontoDirectory:shouldCopy: ]. > + ^ treeSpec! > - treeSpec > - model: self; > - roots: #rootDirectoryList; > - hasChildren: #hasMoreDirectories:; > - getChildren: #subDirectoriesOf:; > - getSelectedPath: #selectedPath; > - setSelected: #setDirectoryTo:; > - label: #directoryNameOf:; > - menu: #volumeMenu:; > - autoDeselect: false. > - ^treeSpec > - ! > > Item was changed: > ----- Method: FileList>>buildFileListWith: (in category 'toolbuilder') ----- > + buildFileListWith: builder > - buildFileListWith: builder > | buttons listSpec top | > top := builder pluggablePanelSpec new. > top children: OrderedCollection new. > - > buttons := self buildButtonPaneWith: builder. > + buttons frame: > + (self > + topConstantHeightFrame: self buttonHeight > + fromLeft: 0 > + width: 1). > - buttons frame: (self topConstantHeightFrame: self buttonHeight fromLeft: 0 width: 1). > top children add: buttons. > - > listSpec := builder pluggableListSpec new. > + listSpec > + model: self ; > + list: #fileList ; > + getIndex: #fileListIndex ; > + setIndex: #fileListIndex: ; > + menu: #fileListMenu: ; > + keyPress: nil ; > + frame: > + (self > + frameOffsetFromTop: self buttonHeight + 4 > + fromLeft: 0 > + width: 1 > + bottomFraction: 1) ; > + color: Color white. > + Preferences browseWithDragNDrop ifTrue: [ listSpec dragItem: #dragFromFileList: ]. > - listSpec > - model: self; > - list: #fileList; > - getIndex: #fileListIndex; > - setIndex: #fileListIndex:; > - menu: #fileListMenu:; > - keyPress: nil; > - frame: (self frameOffsetFromTop: self buttonHeight + 4 fromLeft: 0 width: 1 bottomFraction: 1); > - color: Color white. > top children add: listSpec. > + ^ top! > - ^top. > - ! > > Item was changed: > ----- Method: FileList>>directory: (in category 'initialization') ----- > + directory: aFileDirectory > - directory: dir > "Set the path of the volume to be displayed." > + self okToChange ifFalse: [ ^ self ]. > - > - self okToChange ifFalse: [^ self]. > - > self modelSleep. > + directory := aFileDirectory. > - directory := dir. > self modelWakeUp. > + sortMode == nil ifTrue: [ sortMode := #date ]. > + volList := (Array with: '[]') , directory pathParts withIndexCollect: > + [ : each : i | (String > + new: i - 1 > + withAll: Character space) , each ]. > - > - sortMode == nil ifTrue: [sortMode := #date]. > - volList := ((Array with: '[]'), directory pathParts) "Nesting suggestion from RvL" > - withIndexCollect: [:each :i | ( String new: i-1 withAll: $ ), each]. > volListIndex := volList size. > self changed: #relabel. > self changed: #volumeList. > + self pattern: pattern! > - self pattern: pattern.! > > Item was added: > + ----- Method: FileList>>dragFromDirectoryList: (in category 'file list') ----- > + dragFromDirectoryList: anIndex > + ^ self directory! > > Item was added: > + ----- Method: FileList>>dragFromFileList: (in category 'file list') ----- > + dragFromFileList: anIndex > + ^ self directory entryAt: (self fileNameFromFormattedItem: (self fileList at: self fileListIndex))! > > Item was added: > + ----- Method: FileList>>dragPassengerFor:inMorph: (in category 'drag''n''drop') ----- > + dragPassengerFor: item inMorph: dragSource > + ^self directory fullNameFor: ((self fileNameFromFormattedItem: item contents copy) > + copyReplaceAll: self folderString with: ''). > + ! > > Item was added: > + ----- Method: FileList>>drop:ontoDirectory: (in category 'toolbuilder') ----- > + drop: aDirectoryEntryFile ontoDirectory: aFileDirectory > + | oldName oldEntry newName newEntry baseName response | > + self halt. > + oldName := aDirectoryEntryFile fullName. > + baseName := FileDirectory localNameFor: oldName. > + newName := aFileDirectory fullNameFor: baseName. > + newName = oldName ifTrue: [ "Transcript nextPutAll: 'same as old name'; cr." > + ^ true ]. > + oldEntry := FileDirectory directoryEntryFor: oldName. > + newEntry := FileDirectory directoryEntryFor: newName. > + newEntry ifNotNil: > + [ | msg | > + msg := String streamContents: > + [ : s | s > + nextPutAll: 'destination file ' ; > + nextPutAll: newName ; > + nextPutAll: ' exists already,' ; > + cr ; > + nextPutAll: 'and is ' ; > + nextPutAll: > + (oldEntry modificationTime < newEntry modificationTime > + ifTrue: [ 'newer' ] > + ifFalse: [ 'not newer' ]) ; > + nextPutAll: ' than source file ' ; > + nextPutAll: oldName ; > + nextPut: $. ; > + cr ; > + nextPutAll: 'Overwrite file ' ; > + nextPutAll: newName ; > + nextPut: $? ]. > + response := self confirm: msg. > + response ifFalse: [ ^ false ] ]. > + " aTransferMorph shouldCopy > + ifTrue: > + [ self > + primitiveCopyFileNamed: oldName > + to: newName ] > + " false ifFalse: > + [ directory > + rename: oldName > + toBe: newName ]. > + self > + updateFileList ; > + fileListIndex: 0. > + ^ true! > > Item was added: > + ----- Method: FileList>>drop:ontoDirectory:shouldCopy: (in category 'toolbuilder') ----- > + drop: aDirectoryEntryFile ontoDirectory: aFileDirectory shouldCopy: aBoolean > + aDirectoryEntryFile containingDirectory = aFileDirectory ifTrue: [ ^ self ]. > + aBoolean > + ifTrue: [ aFileDirectory copyHere: aDirectoryEntryFile ] > + ifFalse: > + [ directory > + rename: aDirectoryEntryFile fullName > + toBe: (aFileDirectory fullNameFor: aDirectoryEntryFile name). > + self setDirectoryTo: directory ]! > > Item was changed: > ----- Method: FileList2>>dropDestinationDirectory:event: (in category 'drag''n''drop') ----- > dropDestinationDirectory: dest event: evt > "Answer a FileDirectory representing the drop destination in the directory hierarchy morph dest" > + self isThisEverCalled. > ^ (dest itemFromPoint: evt position) withoutListWrapper! > >

1 0

Simple Canvas(-like) interface for OpenGL?
by Yoshiki Ohshima 28 May '12

28 May '12

Hello, I'm looking for a very simple canvas like abstraction to rotate, scale and translate several dozens of textured rectangles in Squeak on Mac. It seems that I'd require some hardware support to get a reasonable framerate so, I'm looking for an OpenGL-backed implementation. CroquetGL (http://www.squeaksource.com/CroquetGL/) seems almost cover the space but to support textures it seems that the textures depends on the better set of Croquet objects. GLMorphic (http://www.squeaksource.com/GLMorphic) is Windows only. What would be recommended here? Maybe if there is a simple way to just add texture support to the CroquetGL's core? Thank you! -- Yoshiki

2 2

The Trunk: Tools-cmm.409.mcz
by commits＠source.squeak.org 28 May '12

28 May '12

Chris Muller uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-cmm.409.mcz ==================== Summary ==================== Name: Tools-cmm.409 Author: cmm Time: 27 May 2012, 10:01:04.714 pm UUID: a45e1538-f3ab-4ca2-954a-13cb6caeff7c Ancestors: Tools-cmm.408 - Recover FileList's drag-and-drop capabilities. - Recover HierarchyBrowser's drag-and-drop capabilities. =============== Diff against Tools-cmm.408 =============== Item was changed: ----- Method: Browser>>dragFromClassList: (in category 'drag and drop') ----- + dragFromClassList: index - dragFromClassList: index "Drag a class from the browser" | name envt | + (name := self classList at: index) ifNil: [ ^ nil ]. + (envt := self selectedEnvironment) ifNil: [ ^ nil ]. + ^ envt + at: name withBlanksTrimmed asSymbol + ifAbsent: [ ]! - (name := self classList at: index) ifNil: [^ nil]. - (envt := self selectedEnvironment) ifNil: [^ nil]. - ^ envt at: name ifAbsent:[nil]! Item was changed: ----- Method: FileList class>>windowColorSpecification (in category 'window color') ----- windowColorSpecification "Answer a WindowColorSpec object that declares my preference" + ^ WindowColorSpec + classSymbol: self name + wording: 'File List' + brightColor: #lightGray + pastelColor: #lightGray + helpMessage: 'A tool for looking at files'! - - ^ WindowColorSpec classSymbol: self name wording: 'File List' brightColor: #lightMagenta pastelColor: #paleMagenta helpMessage: 'A tool for looking at files'! Item was changed: ----- Method: FileList>>buildDirectoryTreeWith: (in category 'toolbuilder') ----- + buildDirectoryTreeWith: builder - buildDirectoryTreeWith: builder | treeSpec | treeSpec := builder pluggableTreeSpec new. + treeSpec + model: self ; + roots: #rootDirectoryList ; + hasChildren: #hasMoreDirectories: ; + getChildren: #subDirectoriesOf: ; + getSelectedPath: #selectedPath ; + setSelected: #setDirectoryTo: ; + label: #directoryNameOf: ; + menu: #volumeMenu: ; + autoDeselect: false. + Preferences browseWithDragNDrop ifTrue: + [ treeSpec + dragItem: #dragFromDirectoryList: ; + dropItem: #drop:ontoDirectory:shouldCopy: ]. + ^ treeSpec! - treeSpec - model: self; - roots: #rootDirectoryList; - hasChildren: #hasMoreDirectories:; - getChildren: #subDirectoriesOf:; - getSelectedPath: #selectedPath; - setSelected: #setDirectoryTo:; - label: #directoryNameOf:; - menu: #volumeMenu:; - autoDeselect: false. - ^treeSpec - ! Item was changed: ----- Method: FileList>>buildFileListWith: (in category 'toolbuilder') ----- + buildFileListWith: builder - buildFileListWith: builder | buttons listSpec top | top := builder pluggablePanelSpec new. top children: OrderedCollection new. - buttons := self buildButtonPaneWith: builder. + buttons frame: + (self + topConstantHeightFrame: self buttonHeight + fromLeft: 0 + width: 1). - buttons frame: (self topConstantHeightFrame: self buttonHeight fromLeft: 0 width: 1). top children add: buttons. - listSpec := builder pluggableListSpec new. + listSpec + model: self ; + list: #fileList ; + getIndex: #fileListIndex ; + setIndex: #fileListIndex: ; + menu: #fileListMenu: ; + keyPress: nil ; + frame: + (self + frameOffsetFromTop: self buttonHeight + 4 + fromLeft: 0 + width: 1 + bottomFraction: 1) ; + color: Color white. + Preferences browseWithDragNDrop ifTrue: [ listSpec dragItem: #dragFromFileList: ]. - listSpec - model: self; - list: #fileList; - getIndex: #fileListIndex; - setIndex: #fileListIndex:; - menu: #fileListMenu:; - keyPress: nil; - frame: (self frameOffsetFromTop: self buttonHeight + 4 fromLeft: 0 width: 1 bottomFraction: 1); - color: Color white. top children add: listSpec. + ^ top! - ^top. - ! Item was changed: ----- Method: FileList>>directory: (in category 'initialization') ----- + directory: aFileDirectory - directory: dir "Set the path of the volume to be displayed." + self okToChange ifFalse: [ ^ self ]. - - self okToChange ifFalse: [^ self]. - self modelSleep. + directory := aFileDirectory. - directory := dir. self modelWakeUp. + sortMode == nil ifTrue: [ sortMode := #date ]. + volList := (Array with: '[]') , directory pathParts withIndexCollect: + [ : each : i | (String + new: i - 1 + withAll: Character space) , each ]. - - sortMode == nil ifTrue: [sortMode := #date]. - volList := ((Array with: '[]'), directory pathParts) "Nesting suggestion from RvL" - withIndexCollect: [:each :i | ( String new: i-1 withAll: $ ), each]. volListIndex := volList size. self changed: #relabel. self changed: #volumeList. + self pattern: pattern! - self pattern: pattern.! Item was added: + ----- Method: FileList>>dragFromDirectoryList: (in category 'file list') ----- + dragFromDirectoryList: anIndex + ^ self directory! Item was added: + ----- Method: FileList>>dragFromFileList: (in category 'file list') ----- + dragFromFileList: anIndex + ^ self directory entryAt: (self fileNameFromFormattedItem: (self fileList at: self fileListIndex))! Item was added: + ----- Method: FileList>>dragPassengerFor:inMorph: (in category 'drag''n''drop') ----- + dragPassengerFor: item inMorph: dragSource + ^self directory fullNameFor: ((self fileNameFromFormattedItem: item contents copy) + copyReplaceAll: self folderString with: ''). + ! Item was added: + ----- Method: FileList>>drop:ontoDirectory: (in category 'toolbuilder') ----- + drop: aDirectoryEntryFile ontoDirectory: aFileDirectory + | oldName oldEntry newName newEntry baseName response | + self halt. + oldName := aDirectoryEntryFile fullName. + baseName := FileDirectory localNameFor: oldName. + newName := aFileDirectory fullNameFor: baseName. + newName = oldName ifTrue: [ "Transcript nextPutAll: 'same as old name'; cr." + ^ true ]. + oldEntry := FileDirectory directoryEntryFor: oldName. + newEntry := FileDirectory directoryEntryFor: newName. + newEntry ifNotNil: + [ | msg | + msg := String streamContents: + [ : s | s + nextPutAll: 'destination file ' ; + nextPutAll: newName ; + nextPutAll: ' exists already,' ; + cr ; + nextPutAll: 'and is ' ; + nextPutAll: + (oldEntry modificationTime < newEntry modificationTime + ifTrue: [ 'newer' ] + ifFalse: [ 'not newer' ]) ; + nextPutAll: ' than source file ' ; + nextPutAll: oldName ; + nextPut: $. ; + cr ; + nextPutAll: 'Overwrite file ' ; + nextPutAll: newName ; + nextPut: $? ]. + response := self confirm: msg. + response ifFalse: [ ^ false ] ]. + " aTransferMorph shouldCopy + ifTrue: + [ self + primitiveCopyFileNamed: oldName + to: newName ] + " false ifFalse: + [ directory + rename: oldName + toBe: newName ]. + self + updateFileList ; + fileListIndex: 0. + ^ true! Item was added: + ----- Method: FileList>>drop:ontoDirectory:shouldCopy: (in category 'toolbuilder') ----- + drop: aDirectoryEntryFile ontoDirectory: aFileDirectory shouldCopy: aBoolean + aDirectoryEntryFile containingDirectory = aFileDirectory ifTrue: [ ^ self ]. + aBoolean + ifTrue: [ aFileDirectory copyHere: aDirectoryEntryFile ] + ifFalse: + [ directory + rename: aDirectoryEntryFile fullName + toBe: (aFileDirectory fullNameFor: aDirectoryEntryFile name). + self setDirectoryTo: directory ]! Item was changed: ----- Method: FileList2>>dropDestinationDirectory:event: (in category 'drag''n''drop') ----- dropDestinationDirectory: dest event: evt "Answer a FileDirectory representing the drop destination in the directory hierarchy morph dest" + self isThisEverCalled. ^ (dest itemFromPoint: evt position) withoutListWrapper!

1 0

The Trunk: ToolBuilder-Morphic-cmm.85.mcz
by commits＠source.squeak.org 28 May '12

28 May '12

Chris Muller uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-cmm.85.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-cmm.85 Author: cmm Time: 27 May 2012, 9:59:06.378 pm UUID: 86972436-d2b6-4b86-b2c8-11f321fb7fad Ancestors: ToolBuilder-Morphic-cwp.84 - TreeMorph: allow drop-target callbacks to interrogate the shouldCopy argument. - After the drop operation is complete, remove the drop highlight. =============== Diff against ToolBuilder-Morphic-cwp.84 =============== Item was changed: ----- Method: PluggableTreeMorph>>acceptDroppingMorph:event: (in category 'morphic') ----- + acceptDroppingMorph: aTransferMorph event: evt + dropItemSelector ifNil: [ ^ self ]. + model + perform: dropItemSelector + withEnoughArguments: {aTransferMorph passenger. + (self itemFromPoint: evt position) withoutListWrapper. + aTransferMorph shouldCopy}. - acceptDroppingMorph: aMorph event: evt - | item dropTarget | - dropItemSelector ifNil:[^self]. - item := aMorph passenger. - dropTarget := (self itemFromPoint: evt position) withoutListWrapper. - model perform: dropItemSelector with: item with: dropTarget. evt hand releaseMouseFocus: self. + potentialDropMorph ifNotNil: [ potentialDropMorph highlightForDrop: false ]. + Cursor normal show! - Cursor normal show. - !

1 0

The Inbox: Files-cmm.118.mcz
by commits＠source.squeak.org 28 May '12

28 May '12

A new version of Files was added to project The Inbox: http://source.squeak.org/inbox/Files-cmm.118.mcz ==================== Summary ==================== Name: Files-cmm.118 Author: cmm Time: 27 May 2012, 9:39:33.09 pm UUID: f13f4d5e-ec34-440f-bbee-1b14db589ff4 Ancestors: Files-eem.117 - Fix guards in FileDirectory>>#rename:toBe:. =============== Diff against Files-eem.117 =============== Item was changed: ----- Method: FileDirectory>>rename:toBe: (in category 'file operations') ----- + rename: oldFileName toBe: newFileName - rename: oldFileName toBe: newFileName - | selection oldName newName | "Rename the file of the given name to the new name. Fail if there is no file of the old name or if there is an existing file with the new name." "Modified for retry after GC ar 3/21/98 18:09" + | selection oldName newName | oldName := self fullNameFor: oldFileName. newName := self fullNameFor: newFileName. + (self fileExists: oldFileName) ifFalse: [ ^ self error: 'Attempt to rename a non-existent file' ]. + (self fileExists: newFileName) ifTrue: + [ selection := UIManager default + chooseFrom: #('delete version in target directory' 'cancel' ) + title: newFileName , ' already exists'. + selection = 1 + ifTrue: [ self deleteFileNamed: newFileName ] + ifFalse: [ ^ self ] ]. + (StandardFileStream + retryWithGC: + [ self + primRename: oldName asVmPathName + to: newName asVmPathName ] + until: [ : result | result notNil ] + forFileNamed: oldName) ~~ nil ifTrue: [ ^ self ]. + ^ self error: 'Failed to rename file'! - (StandardFileStream - retryWithGC:[self primRename: oldName asVmPathName to: newName asVmPathName] - until:[:result| result notNil] - forFileNamed: oldName) ~~ nil ifTrue:[^self]. - (self fileExists: oldFileName) ifFalse:[ - ^self error:'Attempt to rename a non-existent file'. - ]. - (self fileExists: newFileName) ifTrue:[ - selection := UIManager default chooseFrom:#('delete old version' 'cancel') - title: 'Trying to rename a file to be - ', newFileName , ' - and it already exists.'. - selection = 1 ifTrue: - [self deleteFileNamed: newFileName. - ^ self rename: oldFileName toBe: newFileName]]. - ^self error:'Failed to rename file'.!

1 0

Daily Commit Log
by commits＠source.squeak.org 28 May '12

28 May '12

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2012-May/005349.html Name: Kernel-eem.692 Ancestors: Kernel-nice.691 Implement CompiledMethod>>#hash, both to accord with CompiledMethod>>#= and to override ByteArray>>#hash which looks at all bytes of the receiver and hence may produce a variable hash if the GC moves literals in a method. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-May/005350.html Name: KernelTests-eem.224 Ancestors: KernelTests-nice.223 Add a long test case for CompiledMethod = & hash =============================================

1 0

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page: