Packages July 2022

packages@lists.squeakfoundation.org

1 participants
59 discussions

The Trunk: Collections-cmm.1018.mcz
by commits＠source.squeak.org 13 Jul '22

13 Jul '22

Chris Muller uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-cmm.1018.mcz ==================== Summary ==================== Name: Collections-cmm.1018 Author: cmm Time: 12 July 2022, 8:02:42.503867 pm UUID: 1cb21ed1-20f1-4d6b-8781-dbf2cd05daa1 Ancestors: Collections-cmm.1017 Restore most of the efficiency of String>>#format: when used with only numeric tokens. =============== Diff against Collections-cmm.1017 =============== Item was changed: ----- Method: String>>format: (in category 'formatting') ----- format: aCollection "Substitute tokens in the receiver with element values of aCollection. The tokens are indicated in curly-braces and may be either numeric, e.g., {1}, {2}, etc. and map to a SequenceableCollection, OR, alphanumeric, e.g., {name}, {date}, etc., in which case aCollection should be a Dictionary. The values can be static or, with the specification of a Block element, dynamic. Simplest examples: 'foo {date} bar' format: ({'date'->Date today} as: Dictionary). Dynamic calculation is allowed via Blocks. 'foo {NOW} bar' format: ({'NOW'-> [DateAndTime now]} as: Dictionary). Backward-compatible with numeric-only #format: 'foo {1} bar' format: {Date today}. Now with block support: 'foo {1} bar' format: {[Date today]}. Complete example with escaped characters: '\{ \} \\ foo {1} bar {2}' format: {12. 'string'}. + '\{ \} \\ foo {FOO} bar {BAR}' format: ({'FOO'->12. 'BAR'->'string'} as: Dictionary)." + ^ self class + new: self size * 11 // 10 "ready for +10% growth" + streamContents: - '\{ \} \\ foo {FOO} bar {BAR}' format: ({'FOO'->12. 'BAR'->'string'} as: Dictionary). - " - ^ self class new: self size * 11 // 10 "ready for +10% growth"streamContents: [ : output | | lastIndex nextIndex key | lastIndex := 1. + key := 0. - key := WriteStream on: (String new: 10). [ "stream to output until first { or \" (nextIndex := self indexOfAnyOf: FormatCharacterSet startingAt: lastIndex) = 0 ] whileFalse: [ nextIndex = lastIndex ifFalse: [ output next: nextIndex - lastIndex putAll: self startingAt: lastIndex ]. "special char hit, escape char?" (self at: nextIndex) == $\ + ifTrue: + [ "transfer the escaped character. " - ifTrue: [ "transfer the escaped character." output nextPut: (self at: (nextIndex := nextIndex + 1)) ] ifFalse: [ | nextKeyChar | "${ char, parse the key" [ nextKeyChar := self at: (nextIndex := nextIndex + 1). + nextKeyChar isAlphaNumeric ] whileTrue: + [ (key isInteger and: [ nextKeyChar isDigit ]) + ifTrue: [ key := key * 10 + nextKeyChar digitValue ] + ifFalse: + [ key isInteger ifTrue: + [ key := WriteStream with: + (key isZero + ifTrue: [ String empty ] + ifFalse: [ key asString ]) ]. + key nextPut: nextKeyChar ] ]. - nextKeyChar isAlphaNumeric ] whileTrue: [ key nextPut: nextKeyChar ]. nextKeyChar = $} ifFalse: [ self error: '$} expected' ]. + key isInteger + ifTrue: + [ output nextPutAll: (aCollection at: key) value asString. + key := 0 ] + ifFalse: + [ output nextPutAll: (aCollection at: key contents) value asString. + key reset ] ]. - output nextPutAll: (aCollection at: key contents numberOrValue) value asString. - key reset ]. lastIndex := nextIndex + 1 ]. lastIndex <= self size ifTrue: + [ output next: self size - lastIndex + 1 putAll: self startingAt: lastIndex ] ]! - [ output - next: self size - lastIndex + 1 - putAll: self - startingAt: lastIndex ] ]! Item was removed: - ----- Method: String>>numberOrValue (in category 'formatting') ----- - numberOrValue - "If I'm 100% digits, answer my numerical value, otherwise, answer myself." - | number | - number := 0. - self size - to: 1 - by: -1 - do: - [ : pos | | digit | - digit := self at: pos. - digit isDigit ifFalse: [ ^ self ]. - number := number + ((10 raisedTo: self size - pos) * digit digitValue) ]. - ^ number!

1 0

The Trunk: ShoutCore-eem.96.mcz
by commits＠source.squeak.org 12 Jul '22

12 Jul '22

Eliot Miranda uploaded a new version of ShoutCore to project The Trunk: http://source.squeak.org/trunk/ShoutCore-eem.96.mcz ==================== Summary ==================== Name: ShoutCore-eem.96 Author: eem Time: 12 July 2022, 2:56:07.854662 pm UUID: 3cc67eea-1f93-4fec-8eb6-a77683a6bf1f Ancestors: ShoutCore-mt.95 Fix parsing of unary selectors beginning and/or ending weith underscores, which are legal when Scanner prefAllowUnderscoreSelectors. =============== Diff against ShoutCore-mt.95 =============== Item was changed: ----- Method: SHParserST80>>currentTokenType (in category 'parse support') ----- currentTokenType "Cache and return the type of currentToken of #(name keyword binary assignment ansiAssignment other)" ^currentTokenType ifNil: [ currentTokenType := currentToken ifNotNil: [ currentTokenFirst isLetter ifFalse: [ currentTokenFirst == $_ ifTrue: [ + (allowUnderscoreSelectors and: [ currentToken size > 1 ]) + ifTrue: + [currentToken last == $: + ifTrue: [ #keyword ] + ifFalse: + [(currentToken last isLetter or: [currentToken last == $_]) ifTrue: + [ #name ]]] - (allowUnderscoreSelectors - and: [ currentToken size > 1 - and: [ currentToken last == $: ] ]) - ifTrue: [ #keyword ] ifFalse: [ (allowUnderscoreAssignments and: [ currentToken = '_' ]) ifTrue: [ #assignment ] ] ] ifFalse: [ currentToken = ':=' ifTrue: [ #ansiAssignment ] ifFalse: [ (currentToken allSatisfy: [ :each | self isSelectorCharacter: each ]) ifTrue: [ #binary ] ] ] ] ifTrue: [ currentToken last == $: ifTrue: [ #keyword ] ifFalse: [ (currentToken last isAlphaNumeric or: [ allowUnderscoreSelectors and: [ currentToken last == $_ ] ]) ifTrue: [ #name ] ] ] ]. currentTokenType ifNil: [ currentTokenType := #other ] ]!

1 0

The Trunk: ShoutTests-eem.34.mcz
by commits＠source.squeak.org 12 Jul '22

12 Jul '22

Eliot Miranda uploaded a new version of ShoutTests to project The Trunk: http://source.squeak.org/trunk/ShoutTests-eem.34.mcz ==================== Summary ==================== Name: ShoutTests-eem.34 Author: eem Time: 12 July 2022, 2:55:13.45162 pm UUID: 62cd92a6-72ae-4019-9bb0-f322c3f51b95 Ancestors: ShoutTests-mt.33 Add a test for unary selectors beginning and/or ending with underscores, which are legal if Scanner prefAllowUnderscoreSelectors. =============== Diff against ShoutTests-mt.33 =============== Item was added: + ----- Method: SHParserST80Test>>expectedFailures (in category 'failures') ----- + expectedFailures + ^Scanner prefAllowUnderscoreSelectors + ifTrue: [#()] + ifFalse: [#(testUnaryUnderscoreSelectors)]! Item was added: + ----- Method: SHParserST80Test>>testUnaryUnderscoreSelectors (in category 'tests') ----- + testUnaryUnderscoreSelectors + + | types tokens s | + s := 'x self _this_is: #legal. self _but_this_is_also. self as_is_this_. self _and_even_this_.'. + types := self tokenTypesIn: s. + tokens := self tokensIn: s. + self assert: types = #(patternUnary "x" + self undefinedKeyword symbol symbol statementSeparator "self _this_is: #legal." + self undefinedUnary statementSeparator "self _but_this_is_also." + self undefinedUnary statementSeparator "self as_is_this_." + self undefinedUnary statementSeparator). "self _and_even_this_." + + self assert: tokens = #('x' 'self' '_this_is:' '#' '#legal' '.' 'self' '_but_this_is_also' '.' 'self' 'as_is_this_' '.' 'self' '_and_even_this_' '.')!

1 0

The Trunk: Morphic-mt.2018.mcz
by commits＠source.squeak.org 12 Jul '22

12 Jul '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2018.mcz ==================== Summary ==================== Name: Morphic-mt.2018 Author: mt Time: 12 July 2022, 3:36:52.06129 pm UUID: 065963d6-9f4a-8b4c-b10c-a6ec95710a60 Ancestors: Morphic-mt.2017 Morphic layouting. Do not abort full re-layout just because some bounds happen to be unchanged in a proportional layout. Submorphs may still have their own layout to be updated. That is, do not rely on the drawing algorithm to send its #fullBounds later. Instead, do it like TableLayout and use the fullBounds instVar to determine whether something needs to be done or not. For later, maybe also question that "self layoutFrame ifNil:" check for the very same reason. We might just want to re-use layoutBounds in that case as it is an erroneuous case anyway. All submorphs of a "proportional owner" must configure a layoutFrame. =============== Diff against Morphic-mt.2017 =============== Item was changed: ----- Method: Morph>>layoutProportionallyInBounds:positioning: (in category 'layout') ----- layoutProportionallyInBounds: layoutBounds positioning: cellPositioning "Layout specific. Apply the given bounds to the receiver." | cellBounds frame | frame := self layoutFrame ifNil:[^self]. "compute the cell size the receiver has given its layout frame" cellBounds := frame layout: self bounds in: layoutBounds. cellBounds := cellBounds topLeft extent: (cellBounds extent max: self minExtent). - cellBounds = self bounds ifTrue: [^self]. "no change" ^self layoutInBounds: cellBounds positioning: cellPositioning!

1 0

The Trunk: System-ct.1367.mcz
by commits＠source.squeak.org 09 Jul '22

09 Jul '22

Christoph Thiede uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-ct.1367.mcz ==================== Summary ==================== Name: System-ct.1367 Author: ct Time: 9 July 2022, 8:55:09.082532 pm UUID: 5a63f39b-5c50-0140-b457-6c972adb1874 Ancestors: System-mt.1366 Merges accelerateUserInterfaceTheme: Accelerates property accesses to UserInterfaceTheme. This is done by changing the dictionary layout and representing keys as Arrays instead of Associations to improve the hash distribution. The postscript will automatically convert all UserInterfaceTheem subinstances. Revision: Use #atomicUpdate: in postscript. This speeds up theme requests by >3750% and even speeds up common toolbuilding workloads by ~48% (see benchmarks below). Thanks to Levente (ul) and Marcel (mt) for the review! For more information, see: http://lists.squeakfoundation.org/pipermail/squeak-dev/2022-May/220694.html --- Detailed benchmarks and results from my machine: I. Theme requests | theme random keys properties | theme := UserInterfaceTheme current. random := Random seed: 20220526. keys := theme properties keys sorted: [:key | ((key isKindOf: Association) ifTrue: [{key key. key value}] ifFalse: [key]) hash] ascending. properties := (1 to: 1000000) collect: [:i | keys atRandom: random]. [properties do: [:ea | theme get: ea]] timeToRun. "Average of 8 runs: BEFORE: 3133.0 ms AFTER: 655.25 ms" II. Toolbuilding workloads [ToolBuilder build: Browser] benchFor: 30 seconds. "Average of 3 runs: BEFORE: 19.4 ms AFTER: 13.1 ms" =============== Diff against System-mt.1366 =============== Item was changed: ----- Method: UserInterfaceTheme>>get: (in category 'private') ----- get: keyObject "keyObject is intended to be an Association. We have two lookup strategies: 1) along the superclass chain *of the client*, 2) via a linked theme. Evaluate the result because there can be message sends stored or blocks." | k | properties at: keyObject ifPresent: [:prop | ^ prop value]. + keyObject isArray "simple key objects" - keyObject isVariableBinding "simple key objects" ifFalse: [^ self getViaLink: keyObject]. + k := keyObject at: 1. - k := keyObject key. (self getViaSuperclasses: keyObject) ifNotNil: [:prop | ^ prop]. + keyObject at: 1 put: k. "restore" - keyObject key: k. "restore" ^ self getViaLink: keyObject! Item was changed: ----- Method: UserInterfaceTheme>>get:for: (in category 'private') ----- get: propertySymbol for: scope "For convenience. Does support access to non-class keys." | aClass | aClass := (scope isNil or: [scope isBehavior]) ifTrue: [scope] ifFalse: [Smalltalk classNamed: scope]. + aClass ifNotNil: [^ self get: {aClass. propertySymbol}]. - aClass ifNotNil: [^ self get: aClass -> propertySymbol]. properties + at: {scope. propertySymbol} - at: scope -> propertySymbol ifPresent: [:prop | ^ prop value]. + ^ self getViaLink: {scope. propertySymbol}! - ^ self getViaLink: scope -> propertySymbol! Item was changed: ----- Method: UserInterfaceTheme>>getViaSuperclasses: (in category 'private') ----- getViaSuperclasses: keyObject "keyObject is intended to be an Association. Find the superclass of the key of the keyObject (which will initially be the client's class) and make a new keyObject using that and the original message name, then try searching for that." "We know we're the only referencer of keyObject. Update it rather than create new ones, for performance reasons." + keyObject at: 1 put: (keyObject at: 1) superclass. - keyObject key: keyObject key superclass. + (keyObject at: 1) ifNil: [^ nil]. - keyObject key ifNil: [^ nil]. properties at: keyObject ifPresent: [:prop | ^ prop value]. ^ self getViaSuperclasses: keyObject! Item was changed: ----- Method: UserInterfaceTheme>>set:for:to: (in category 'building') ----- set: propertySymbol for: aClassOrSymbol to: valueObject "Where aClass asks its userInterfaceTheme for propertySymbol, provide valueObject." | aClass | aClass := aClassOrSymbol isBehavior ifTrue: [aClassOrSymbol] ifFalse: [Smalltalk classNamed: aClassOrSymbol]. aClass ifNil: [^ self]. ^ self atomicUpdate: [ : props | | key | + key := {aClass. propertySymbol}. - key := aClass -> propertySymbol. valueObject ifNil: [ props removeKey: key ifAbsent: [ "already cleared, don't error" ] ] ifNotNil: [ props at: key put: valueObject ] ]! Item was changed: ----- Method: UserInterfaceThemeRequest>>doesNotUnderstand: (in category 'lookup') ----- doesNotUnderstand: aMessage "Look up the visual attribute specified by aMessage's #selector in the current theme for the current target object." aMessage numArgs = 0 ifTrue: [ + ^ (self theme get: {self target class. aMessage selector}) - ^ (self theme get: self target class -> aMessage selector) ifNil: [(self theme respondsTo: aMessage selector) ifTrue: [self theme perform: aMessage selector] ifFalse: [nil "unset property"]]]. aMessage numArgs = 1 ifTrue: [ ^ self theme + set: {self target class. aMessage selector asSimpleGetter} - set: self target class -> aMessage selector asSimpleGetter to: aMessage arguments first]. ^ self theme perform: aMessage selector withArguments: aMessage arguments.! Item was changed: + (PackageInfo named: 'System') postscript: '"Update UserInterfaceTheme instances (System-ct.1367)" + UserInterfaceTheme allSubInstancesDo: [:theme | + theme atomicUpdate: [:props | + props copy keysAndValuesDo: [:key :value | + (key isKindOf: Association) ifTrue: [ + props + removeKey: key; + at: {key key. key value} put: value]]]].'! - (PackageInfo named: 'System') postscript: 'SystemNavigation initializeAuthors.. "Adds Eric Gade"'!

1 0

The Trunk: MorphicTests-ct.88.mcz
by commits＠source.squeak.org 09 Jul '22

09 Jul '22

Christoph Thiede uploaded a new version of MorphicTests to project The Trunk: http://source.squeak.org/trunk/MorphicTests-ct.88.mcz ==================== Summary ==================== Name: MorphicTests-ct.88 Author: ct Time: 9 July 2022, 7:31:39.249611 pm UUID: 84ddbf6c-cab7-7546-9339-6140fe321128 Ancestors: MorphicTests-mt.87 Complements ToolBuilder-Morphic-ct.320 (tests for file dialogs). =============== Diff against MorphicTests-mt.87 =============== Item was added: + FileAbstractSelectionDialogTest subclass: #DirectoryChooserDialogTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-ToolBuilder'! Item was added: + ----- Method: DirectoryChooserDialogTest>>expectedFailures (in category 'failures') ----- + expectedFailures + + self flag: #todo. "Can only be debugged, but not run - this raises an InvalidDirectoryError which's defaultAction handles the exception silently. Should this class be a Notification instead?" + ^ #(testChooseAbsentDirectory testTypeAndChooseAbsentDirectory)! Item was added: + ----- Method: DirectoryChooserDialogTest>>testChooseAbsentDirectory (in category 'tests - interface') ----- + testChooseAbsentDirectory + + self openDialog. + + dialog acceptFileName: (self pathForFile: 'nurp'). + + self assert: nil equals: result.! Item was added: + ----- Method: DirectoryChooserDialogTest>>testChooseDefault (in category 'tests - interactions') ----- + testChooseDefault + + self openDialog. + + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: mockDirectory equals: result.! Item was added: + ----- Method: DirectoryChooserDialogTest>>testChooseDirectory (in category 'tests - interface') ----- + testChooseDirectory + + self openDialog. + + dialog acceptFileName: mockChildDirectory fullName. + + self assert: mockChildDirectory equals: result.! Item was added: + ----- Method: DirectoryChooserDialogTest>>testNewDirectory (in category 'tests - interface') ----- + testNewDirectory + + self openDialog. + + [dialog newDirectoryName] valueSupplyingAnswer: #('*name*' 'nurp'). + self assert: (mockDirectory directoryExists: 'nurp'). + self assert: mockDirectory / 'nurp' equals: dialog directory. + dialog acceptFileName. + + self assert: mockDirectory / 'nurp' equals: result.! Item was added: + ----- Method: DirectoryChooserDialogTest>>testSelectAndChooseDirectory (in category 'tests - interactions') ----- + testSelectAndChooseDirectory + + self openDialog. + + dialog setDirectoryTo: (dialog subDirectoriesOf: mockDirectory) first. + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: mockChildDirectory equals: result.! Item was added: + ----- Method: DirectoryChooserDialogTest>>testTypeAndChooseAbsentDirectory (in category 'tests - interactions') ----- + testTypeAndChooseAbsentDirectory + + self openDialog. + + dialog selectFileName: (self pathForDirectory: mockDirectory file: 'twin'). + self deny: dialog canAccept. + dialog acceptFileName. + + self assert: nil equals: result.! Item was added: + ----- Method: DirectoryChooserDialogTest>>testTypeAndChooseDirectory (in category 'tests - interactions') ----- + testTypeAndChooseDirectory + + self openDialog. + + dialog selectFileName: mockChildDirectory fullName. + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: mockChildDirectory equals: result.! Item was added: + ClassTestCase subclass: #FileAbstractSelectionDialogTest + instanceVariableNames: 'mockDirectory mockFile1 mockFile2 mockFile3 mockChildDirectory mockChildFile dialog morph result' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-ToolBuilder'! Item was added: + ----- Method: FileAbstractSelectionDialogTest class>>isAbstract (in category 'testing ') ----- + isAbstract + + ^ self = FileAbstractSelectionDialogTest! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>createChildFile: (in category 'support') ----- + createChildFile: fileName + + FileStream + fileNamed: (self pathForChildFile: fileName) + do: [:stream | stream nextPutAll: thisContext longPrintString].! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>createFile: (in category 'support') ----- + createFile: fileName + + FileStream + fileNamed: (self pathForFile: fileName) + do: [:stream | stream nextPutAll: thisContext longPrintString].! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>dialogClass (in category 'accessing') ----- + dialogClass + + ^ self classToBeTested! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>openDialog (in category 'support') ----- + openDialog + + ^ morph := self toolBuilder build: dialog! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>pathForChildFile: (in category 'support') ----- + pathForChildFile: fileName + + ^ self pathForDirectory: mockChildDirectory file: fileName! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>pathForDirectory:file: (in category 'support') ----- + pathForDirectory: directory file: fileName + + ^ directory fullName, directory class slash, fileName! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>pathForFile: (in category 'support') ----- + pathForFile: fileName + + ^ self pathForDirectory: mockDirectory file: fileName! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>setUp (in category 'running') ----- + setUp + + super setUp. + + self setUpDirectory. + self setUpDialog.! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>setUpDialog (in category 'running') ----- + setUpDialog + + dialog := self dialogClass new. + dialog addDependent: self. + dialog directory: mockDirectory.! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>setUpDirectory (in category 'running') ----- + setUpDirectory + + mockDirectory := FileDirectory default / self class asString / UUID new asString. + mockDirectory assureExistence. + + {mockFile1 := 'plonk1.txt'. + mockFile2 := 'plonk2.st'. + mockFile3 := 'plonk3.cs'} + do: [:file | self createFile: file]. + + mockChildDirectory := mockDirectory / 'child'. + mockChildDirectory assureExistence. + + mockChildFile := 'griffle.gif'. + self createChildFile: mockChildFile.! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>tearDown (in category 'running') ----- + tearDown + + [mockDirectory ifNotNil: [mockDirectory assureAbsence]. + (FileDirectory default / self class asString) assureAbsence] + ensure: [super tearDown].! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>testCancel (in category 'tests - interface') ----- + testCancel + + self openDialog. + + dialog cancelFileChooser. + + self assert: nil equals: result.! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>testDirectoryTree (in category 'tests - interface') ----- + testDirectoryTree + + | node index | + self openDialog. + + node := dialog rootDirectoryList + detect: [:root | (dialog directoryNameOf: root) = mockDirectory pathParts first] + ifNone: []. + self assert: node notNil. + + index := 2. + [self assert: (dialog hasMoreDirectories: node). + (dialog subDirectoriesOf: node) + detect: [:child | (dialog directoryNameOf: child) = (mockDirectory pathParts at: index)] + ifFound: [:child | node := child. index := index + 1] + ifNone: [self fail]] + doWhileFalse: [(dialog directoryNameOf: node) = mockDirectory localName]. + self assert: mockDirectory equals: dialog directory. + + self deny: (dialog hasMoreDirectories: mockChildDirectory).! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>toolBuilder (in category 'accessing') ----- + toolBuilder + + ^ self toolBuilderClass new! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>toolBuilderClass (in category 'accessing') ----- + toolBuilderClass + + ^ MorphicToolBuilder! Item was added: + ----- Method: FileAbstractSelectionDialogTest>>update: (in category 'updating') ----- + update: aspect + + aspect = #close ifTrue: + [result := dialog finalChoice].! Item was added: + FileDialogTest subclass: #FileChooserDialogTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-ToolBuilder'! Item was added: + ----- Method: FileChooserDialogTest>>testTypeToSelect (in category 'tests - interactions') ----- + testTypeToSelect + + self openDialog. + + dialog selectFileName: mockFile2 allButLast. + self assert: mockFile2 equals: (dialog fileList at: dialog fileListIndex). + dialog acceptFileName. + + self assert: (self pathForFile: mockFile2) equals: result.! Item was added: + FileAbstractSelectionDialogTest subclass: #FileDialogTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-ToolBuilder'! Item was added: + ----- Method: FileDialogTest class>>isAbstract (in category 'testing ') ----- + isAbstract + + ^ self = FileDialogTest! Item was added: + ----- Method: FileDialogTest>>testChooseAbsentFile (in category 'tests - interface') ----- + testChooseAbsentFile + + self openDialog. + + dialog acceptFileName: mockFile2 , '.absent'. + + self assert: nil equals: result.! Item was added: + ----- Method: FileDialogTest>>testChooseFile (in category 'tests - interface') ----- + testChooseFile + + self openDialog. + + dialog acceptFileName: mockFile2. + + self assert: (self pathForFile: mockFile2) equals: result.! Item was added: + ----- Method: FileDialogTest>>testChooseNothing (in category 'tests - interactions') ----- + testChooseNothing + + self openDialog. + + self deny: dialog canAccept. + dialog acceptFileName. + + self assert: nil equals: result.! Item was added: + ----- Method: FileDialogTest>>testFileList (in category 'tests - interface') ----- + testFileList + + self openDialog. + + self assert: {mockFile1. mockFile2. mockFile3} equals: dialog fileList.! Item was added: + ----- Method: FileDialogTest>>testFileListWithPattern (in category 'tests - interface') ----- + testFileListWithPattern + + dialog pattern: '*2*'. + self openDialog. + + self assert: {mockFile2} equals: dialog fileList.! Item was added: + ----- Method: FileDialogTest>>testFileListWithSuffixList (in category 'tests - interface') ----- + testFileListWithSuffixList + + dialog suffixList: #('cs' 'st'). + self openDialog. + + self assert: {mockFile2. mockFile3} equals: dialog fileList.! Item was added: + ----- Method: FileDialogTest>>testSelectAndChooseFile (in category 'tests - interactions') ----- + testSelectAndChooseFile + + self openDialog. + + dialog fileListIndex: (dialog fileList indexOf: mockFile2). + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: (self pathForFile: mockFile2) equals: result.! Item was added: + ----- Method: FileDialogTest>>testSelectAndChooseSubFile (in category 'tests - interactions') ----- + testSelectAndChooseSubFile + + self openDialog. + + dialog setDirectoryTo: (dialog subDirectoriesOf: dialog directory) first. + self assert: {mockChildFile} equals: dialog fileList. + dialog fileListIndex: (dialog fileList indexOf: mockChildFile). + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: (self pathForChildFile: mockChildFile) equals: result.! Item was added: + ----- Method: FileDialogTest>>testTypeAndChooseAbsentFile (in category 'tests - interactions') ----- + testTypeAndChooseAbsentFile + + self openDialog. + + dialog selectFileName: mockFile2 , '.absent'. + self deny: dialog canAccept. + dialog acceptFileName. + + self assert: nil equals: result.! Item was added: + ----- Method: FileDialogTest>>testTypeAndChooseFile (in category 'tests - interactions') ----- + testTypeAndChooseFile + + self openDialog. + + dialog selectFileName: mockFile2. + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: (self pathForFile: mockFile2) equals: result.! Item was added: + ----- Method: FileDialogTest>>testTypeAndChooseFullPath (in category 'tests - interactions') ----- + testTypeAndChooseFullPath + + self openDialog. + + dialog selectFileName: (self pathForChildFile: mockChildFile). + self assert: mockChildDirectory equals: dialog directory. + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: (self pathForChildFile: mockChildFile) equals: result.! Item was added: + FileDialogTest subclass: #FileSaverDialogTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-ToolBuilder'! Item was added: + ----- Method: FileSaverDialogTest>>testChooseAbsentFile (in category 'tests - interface') ----- + testChooseAbsentFile + + self openDialog. + + dialog acceptFileName: mockFile2 , '.absent'. + + self assert: (self pathForFile: mockFile2 , '.absent') equals: result.! Item was added: + ----- Method: FileSaverDialogTest>>testChooseAbsentFileWithSuffix (in category 'tests - interface') ----- + testChooseAbsentFileWithSuffix + + dialog suffix: 'txt'. + self openDialog. + + dialog acceptFileName: mockFile2 , '.absent'. + + self assert: (self pathForFile: mockFile2 , '.absent.txt') equals: result.! Item was added: + ----- Method: FileSaverDialogTest>>testChooseDirectory (in category 'tests - interface') ----- + testChooseDirectory + + self openDialog. + + dialog acceptFileName: mockChildDirectory localName. + + self deny: dialog canAccept. + self assert: result isNil.! Item was added: + ----- Method: FileSaverDialogTest>>testInitialFileName (in category 'tests - interface') ----- + testInitialFileName + + dialog initialFilename: mockFile2. + self openDialog. + + self assert: mockFile2 equals: dialog inputText. + self assert: mockFile2 equals: (dialog fileList at: dialog fileListIndex). + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: (self pathForFile: mockFile2) equals: result.! Item was added: + ----- Method: FileSaverDialogTest>>testNewDirectory (in category 'tests - interface') ----- + testNewDirectory + + self openDialog. + + [dialog newDirectoryName] valueSupplyingAnswer: #('*name*' 'nurp'). + self assert: (mockDirectory directoryExists: 'nurp'). + self assert: mockDirectory / 'nurp' equals: dialog directory. + dialog acceptFileName: 'zonk'. + + self assert: (self pathForDirectory: mockDirectory / 'nurp' file: 'zonk') equals: result.! Item was added: + ----- Method: FileSaverDialogTest>>testTypeAndChooseAbsentFile (in category 'tests - interactions') ----- + testTypeAndChooseAbsentFile + + self openDialog. + + dialog selectFileName: mockFile2 , '.absent'. + self assert: dialog canAccept. + dialog acceptFileName. + + self assert: (self pathForFile: mockFile2 , '.absent') equals: result.! Item was added: + ----- Method: FileSaverDialogTest>>testTypeAndChooseAbsentFileWithSuffixList (in category 'tests - interactions') ----- + testTypeAndChooseAbsentFileWithSuffixList + + dialog suffixList: #('txt' 'cs'). + self openDialog. + + "suffix choice is cancellable and dialog will remain open" + 2 timesRepeat: + [[dialog selectFileName: mockFile2 , '.absent'. + dialog acceptFileName] + valueSupplyingAnswer: #('*type*' cancel)]. + + [dialog selectFileName: mockFile2 , '.absent'. + dialog acceptFileName] + valueSupplyingAnswer: #('*type*' 'cs'). + + self assert: (self pathForFile: mockFile2 , '.absent.cs') equals: result.!

1 0

The Trunk: ToolBuilder-Morphic-ct.320.mcz
by commits＠source.squeak.org 09 Jul '22

09 Jul '22

Christoph Thiede uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-ct.320.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-ct.320 Author: ct Time: 9 July 2022, 7:31:16.926611 pm UUID: b0d78612-83dd-624c-81ed-41909b6f1026 Ancestors: ToolBuilder-Morphic-ct.319 Merges polish-file-dialogs: Cleans up, tests, and improves the convenience of file selection dialogs. UI improvements: * Add input field for file path to all dialogs. In file dialogs, a directory path can be entered to navigate to the relevant directory in the tree. * Update enablement of canAccept button based on input * Improve automatic selection of filenames * Use explicit help texts instead of filling the input field with a help message * Fixes handling of patterns/suffixes in save dialog * Double click a file/directory to choose it * Save dialog: Assure that the name of an existing directory cannot be chosen as a new file name * Small MVC improvements (however, modal invocation in MVC is still broken at the moment) Refactoring: * Overall deduplication * Consistent spelling of fileName (instead of filename) * Add new suite of acceptance tests Revision: * Fix default selection in directory chooser * Improve todo notes * Update tests to recent ClassTestCase refactoring * Prepare tree selection for path normalization =============== Diff against ToolBuilder-Morphic-ct.319 =============== Item was added: + ----- Method: DirectoryChooserDialog>>acceptDirectory: (in category 'directory tree') ----- + acceptDirectory: dir + + self setDirectoryTo: dir. + self acceptFileName.! Item was changed: + ----- Method: DirectoryChooserDialog>>acceptFileName (in category 'accessing') ----- - ----- Method: DirectoryChooserDialog>>acceptFileName (in category 'initialize-release') ----- acceptFileName "User clicked to accept the current state so save the directory and close the dialog" + self canAccept ifFalse: [^ false]. finalChoice := directory. + self changed: #close. + ^ true! - self changed: #close! Item was changed: ----- Method: DirectoryChooserDialog>>buildDirectoryTreeWith: (in category 'toolbuilder') ----- buildDirectoryTreeWith: builder ^ (super buildDirectoryTreeWith: builder) hScrollBarPolicy: #never; "Use the dialog grips to see more" + doubleClick: #acceptDirectory:; yourself! Item was changed: ----- Method: DirectoryChooserDialog>>buildWith: (in category 'toolbuilder') ----- buildWith: builder "assemble the spec for the chooser dialog UI" | windowSpec window | windowSpec := self buildWindowWith: builder specs: { + (self topConstantHeightFrame: self textViewHeight - (self frameOffsetFromTop: 0 fromLeft: 0 + width: 1) -> [self buildTextInputWith: builder]. + (self frameOffsetFromTop: self textViewHeight + fromLeft: 0 width: 1 offsetFromBottom: 0) -> [self buildDirectoryTreeWith: builder]. }. windowSpec buttons addAll: ( self buildButtonsWith: builder ). window := builder build: windowSpec. + (window respondsTo: #addKeyboardCaptureFilter: ) ifTrue: [ + window addKeyboardCaptureFilter: self]. - window addKeyboardCaptureFilter: self. self changed: #selectedPath. + (window respondsTo: #positionOverWidgetNamed:) ifTrue: [ + window positionOverWidgetNamed: #inputText]. + ^window! - ^window - ! Item was added: + ----- Method: DirectoryChooserDialog>>canAccept (in category 'accessing') ----- + canAccept + + ^ directory notNil and: [directory exists]! Item was added: + ----- Method: DirectoryChooserDialog>>inputText (in category 'filename') ----- + inputText + + ^ directory fullName! Item was added: + ----- Method: DirectoryChooserDialog>>inputText: (in category 'filename') ----- + inputText: aText + + ^ self selectFileName: aText! Item was added: + ----- Method: DirectoryChooserDialog>>selectFileName: (in category 'filename') ----- + selectFileName: aStringOrText + + aStringOrText ifNil: [^ self]. + self directory: ([FileDirectory on: aStringOrText asString] ifError: [^ self]). + isUpdating := true. + [self changed: #selectedPath] + ensure: [isUpdating := false]. + self updateFileList. + self changed: #canAccept.! Item was changed: Model subclass: #FileAbstractSelectionDialog + instanceVariableNames: 'patternList directory directoryCache message listIndex fileName finalChoice nameList sizeList dateList suffixList isUpdating' - instanceVariableNames: 'patternList directory directoryCache message listIndex fileName finalChoice nameList sizeList dateList suffixList' classVariableNames: '' poolDictionaries: '' category: 'ToolBuilder-Morphic-Tools'! + !FileAbstractSelectionDialog commentStamp: 'ct 7/9/2022 16:42' prior: 0! - !FileAbstractSelectionDialog commentStamp: 'tpr 11/21/2017 18:18' prior: 0! FileAbstractSelectionDialog is the abstract superclass for the file chooser & saver modal dialogs. The UI provides a message to the user, a text input field, a directory tree widget and a list of files within any chosen directory, and buttons to accept the selected file name/path or cancel the operation. See subclass comments and class side methods for specific usage examples. + See some todo notes on my class side. + Instance Variables directory: <FileDirectory> used for the currently selected directory directoryCache: <WeakIdentityKeyDictionary> used to cache a boolean to help us more quickly populate the directory tree widget when revisiting a directory fileName: <String|nil> the name of the currently selected file, if any finalChoice: <String|nil> pathname of the finally chosen file, returned as the result of accepting; nil is returned otherwise list: <Array> the list of String of filenames (and date/size) that match the current pattern listIndex: <Integer> list index of the currently selected file patternList: <OrderedCollection of String> the patterns are held as a collection of string that may include * or # wildcards. See FileAbstractSelectionDialog>>#parsePatternString for details message: <String> a message to the user to explain what is expected nameList,DateList, sizeList: <Array> the list of file names matching the pattern and the appropriate date and size values, formatted for a PluggableMultiColumnListMorph! Item was added: + ----- Method: FileAbstractSelectionDialog class>>todo (in category 'documentation') ----- + todo + + self flag: #forLater. "Possible future adventures for the file dialogs: + + * Allow users to enter patterns with stars to filter the current fileList (as known from Microsoft Windows file dialogs) + * Add support for multiple file selection + * Add MVC support (currently, modal dialog invocations windows seems not to work there). See also existing #mvc flag. + * Normalize paths with parentDirectoryNickname to fix selection in tree view"! Item was changed: + ----- Method: FileAbstractSelectionDialog>>acceptFileName (in category 'accessing') ----- - ----- Method: FileAbstractSelectionDialog>>acceptFileName (in category 'initialize-release') ----- acceptFileName - "User clicked to accept the current state so save the filename and close the dialog" + self canAccept ifFalse: [^ false]. + self checkOrCorrectSuffix ifFalse: [^ false]. + ^ self basicAcceptFileName! - finalChoice := fileName. - self changed: #close! Item was added: + ----- Method: FileAbstractSelectionDialog>>acceptFileName: (in category 'filename') ----- + acceptFileName: aStringOrText + + self selectFileName: aStringOrText. + ^ self acceptFileName! Item was added: + ----- Method: FileAbstractSelectionDialog>>basicAcceptFileName (in category 'accessing') ----- + basicAcceptFileName + "Accept the file name without checking for patterns or suffices." + + self canAccept ifFalse: [^ false]. + finalChoice := fileName. + self changed: #close. + ^ true! Item was added: + ----- Method: FileAbstractSelectionDialog>>basicAcceptFileName: (in category 'filename') ----- + basicAcceptFileName: aStringOrText + "Allow the user to press Cmd + S instead of enter to enforce a file name that does not match the pattern/suffx requirements." + + self selectFileName: aStringOrText. + ^ self basicAcceptFileName! Item was changed: ----- Method: FileAbstractSelectionDialog>>buildButtonsWith: (in category 'toolbuilder') ----- buildButtonsWith: builder ^ { builder pluggableButtonSpec new model: self; label: 'Accept' translated; color: (self userInterfaceTheme get: #okColor for: #DialogWindow); + action: #acceptFileName; + enabled: #canAccept; + yourself. - action: #acceptFileName. builder pluggableButtonSpec new model: self; label: 'Cancel' translated; color: (self userInterfaceTheme get: #cancelColor for: #DialogWindow); + action: #cancelFileChooser; + yourself}! - action: #cancelFileChooser}! Item was changed: ----- Method: FileAbstractSelectionDialog>>buildFileListWith: (in category 'toolbuilder') ----- + buildFileListWith: builder + - buildFileListWith: builder | listSpec | listSpec := builder pluggableListSpec new. listSpec + model: self; + list: #fileList; + getIndex: #fileListIndex; + setIndex: #fileListIndex:; + doubleClick: #acceptFileName; + keyPress: nil; + frame: + (self + frameOffsetFromTop:0 + fromLeft: 0 + width: 1 + bottomFraction: 1). + ^ listSpec! - model: self ; - list: #fileList ; - getIndex: #fileListIndex ; - setIndex: #fileListIndex: ; - menu: nil ; - keyPress: nil ; - frame: - (self - frameOffsetFromTop:0 - fromLeft: 0 - width: 1 - bottomFraction: 1) . - ^listSpec! Item was changed: ----- Method: FileAbstractSelectionDialog>>buildTextInputWith: (in category 'toolbuilder') ----- buildTextInputWith: builder | textSpec | textSpec := builder pluggableInputFieldSpec new. textSpec model: self; name: #inputText ; - font: self textViewFont; getText: #inputText; + editText: #selectFileName:; + setText: #basicAcceptFileName:; + selection: #contentsSelection; + help: 'Enter a filename here or choose from list' translated. + ^textSpec! - setText: #selectFilename:; - selection: #contentsSelection. - ^textSpec - ! Item was changed: ----- Method: FileAbstractSelectionDialog>>buildWith: (in category 'toolbuilder') ----- buildWith: builder - "assemble the spec for the common chooser/saver dialog UI" + | windowSpec window | + windowSpec := self buildWindowWith: builder specs: { + (self topConstantHeightFrame: self textViewHeight + fromLeft: 0 + width: 1) -> [self buildTextInputWith: builder]. + (self frameOffsetFromTop: self textViewHeight + fromLeft: 0.35 + width: 0.65 + offsetFromBottom: 0) -> [self buildFileListWith: builder]. + (self frameOffsetFromTop: self textViewHeight + fromLeft: 0 + width: 0.35 + offsetFromBottom: 0) -> [self buildDirectoryTreeWith: builder]. + }. + windowSpec buttons addAll: ( self buildButtonsWith: builder ). + window := builder build: windowSpec. + (window respondsTo: #addKeyboardCaptureFilter:) ifTrue: [ + window addKeyboardCaptureFilter: self]. + self changed: #selectedPath. + self inputText: fileName. + (window respondsTo: #positionOverWidgetNamed:) ifTrue: [ + window positionOverWidgetNamed: #inputText]. + ^window! - ^self subclassResponsibility! Item was added: + ----- Method: FileAbstractSelectionDialog>>canAccept (in category 'accessing') ----- + canAccept + + ^ fileName isEmptyOrNil not + and: [self directory fileExists: fileName]! Item was changed: + ----- Method: FileAbstractSelectionDialog>>cancelFileChooser (in category 'accessing') ----- - ----- Method: FileAbstractSelectionDialog>>cancelFileChooser (in category 'initialize-release') ----- cancelFileChooser "User clicked to cancel the current state so nil the filename and close the dialog" directory := finalChoice := fileName := nil. self changed: #close.! Item was added: + ----- Method: FileAbstractSelectionDialog>>checkOrCorrectSuffix (in category 'filename') ----- + checkOrCorrectSuffix + + ^ patternList anySatisfy: [:each | + each match: fileName "caseSensitive: FileDirectory default isCaseSensitive"]! Item was added: + ----- Method: FileAbstractSelectionDialog>>contentsSelection (in category 'toolbuilder') ----- + contentsSelection + "Initial selection covers entire initial file name/path if any" + + ^ 1 to: (self inputText ifNil: [0] ifNotNil: #size)! Item was changed: ----- Method: FileAbstractSelectionDialog>>entriesMatching: (in category 'file list') ----- entriesMatching: patternList "Answer a list of directory entries which match any of the patterns. See #parsePatternString for the pattern rules" | entries | - "This odd clause helps supports MVC projects; the file list & directory views are built from a list that includes directories. In Morphic we filter out the directories because they are entirely handled by the direcctory tree morph" entries := Smalltalk isMorphic + ifTrue: [self directory fileEntries] + ifFalse: + [self flag: #mvc. "This odd clause helps supports MVC projects; the file list & directory views are built from a list that includes directories. In Morphic we filter out the directories because they are entirely handled by the directory tree morph" + self directory entries copyWith: + (self directory entryAt: self directory class parentDirectoryNickname)]. + - ifTrue:[self directory fileEntries ] - ifFalse:[self directory entries]. - (patternList anySatisfy: [:each | each = '*']) ifTrue: [^ entries]. + ^ entries select: [:entry | + patternList anySatisfy: [:each | + entry isDirectory or: [each match: entry name]]]! - ^ entries select: [:entry | patternList anySatisfy: [:each | each match: entry name]]! Item was changed: ----- Method: FileAbstractSelectionDialog>>fileListIndex: (in category 'file list') ----- fileListIndex: anInteger "We've selected the file at the given index, so find the file name." self okToChange ifFalse: [^ self]. listIndex := anInteger. + fileName := nameList at: anInteger ifAbsent: [nil]. + + (fileName notNil and: [self directory directoryExists: fileName]) ifTrue: + [self flag: #mvc. "file list contains directories" + self setDirectoryTo: (self directory on: (self directory entryAt: fileName) fullName). + self changed: #selectedPath. + fileName := nil]. + - listIndex = 0 - ifTrue: [fileName := nil] - ifFalse: [fileName := nameList at: anInteger]. "open the file selected" - self changed: #fileListIndex; + changed: #inputText; + changed: #canAccept.! - changed: #inputText! Item was changed: + ----- Method: FileAbstractSelectionDialog>>finalChoice (in category 'accessing') ----- - ----- Method: FileAbstractSelectionDialog>>finalChoice (in category 'initialize-release') ----- finalChoice "return the chosen directory/filename that was saved by an accept click or nil; client must check for validity" ^ finalChoice ifNotNil: [self directory fullNameFor: finalChoice]! Item was changed: ----- Method: FileAbstractSelectionDialog>>initialize (in category 'initialize-release') ----- initialize super initialize. directoryCache := WeakIdentityKeyDictionary new. listIndex := 0. patternList := self defaultPatternList. + suffixList := OrderedCollection new. + isUpdating := false.! - suffixList := OrderedCollection new! Item was changed: ----- Method: FileAbstractSelectionDialog>>listForPatterns: (in category 'path and pattern') ----- listForPatterns: arrayOfPatterns "build lists of name, date and size for those file names which match any of the patterns in the array. We use a Set to avoid duplicates and sort them by name" | newList | newList := Set new. newList addAll: (self entriesMatching: arrayOfPatterns). newList := newList sorted: [:a :b| a name <= b name]. nameList := newList collect:[:e| e name]. + + self flag: #dead. "dates and sizes are not in use" dateList := newList collect:[:e| ((Date fromSeconds: e modificationTime ) printFormat: #(3 2 1 $. 1 1 2)) , ' ' , (String streamContents: [:s | (Time fromSeconds: e modificationTime \\ 86400) print24: true on: s])]. + sizeList := newList collect:[:e| e fileSize asStringWithCommas].! - sizeList := newList collect:[:e| e fileSize asStringWithCommas] - ! Item was changed: ----- Method: FileAbstractSelectionDialog>>newDirectoryName (in category 'directory tree') ----- newDirectoryName "Create a new directory; will be a subdirectory of the current chosen directory. If the user input is empty, or if the directory creation fails, fail this method. Update the directory tree display afterwards and set the current directory to the newly created directory" |userInput| + userInput := Project uiManager request: 'New directory name' translated initialAnswer: 'newDir'. - userInput := UIManager default request: 'New directory name' translated initialAnswer: 'newDir'. userInput isEmptyOrNil ifTrue: [^nil]. [self directory createDirectory: userInput] ifError:[^nil]. "I hate using ifError: - it's so indiscriminate. Really ought to be a more precise error to catch properly" + - self changed: #rootDirectoryList. self directory: (self directory / userInput). self changed: #selectedPath! Item was added: + ----- Method: FileAbstractSelectionDialog>>selectFileName: (in category 'filename') ----- + selectFileName: aText + + | result | + fileName := aText asString. + + (directory class dirPathFor: aText asString) ifNotEmpty: [:otherDirPath | + ([directory on: otherDirPath] ifError: [nil]) ifNotNil: [:otherDir | + otherDir exists ifTrue: + [self setDirectoryTo: otherDir. + self changed: #selectedPath. + fileName := directory class localNameFor: aText asString. + self changed: #inputText. + self changed: #canAccept. + ^ self selectFileName: fileName]]]. + + result := self selectExistingFileName. + self changed: #canAccept. + ^ result! Item was changed: ----- Method: FileAbstractSelectionDialog>>setDirectoryTo: (in category 'directory tree') ----- setDirectoryTo: dir "Set the current directory shown in the FileList. Does not allow setting the directory to nil since this blows up in various places." dir ifNil:[^self]. + dir isString ifTrue: [ + self flag: #mvc. "PluggableListView auto-converts all items to strings :(" + ^ self setDirectoryTo: (FileDirectory on: (Scanner new scanTokens: dir) third)]. "okToChange is probably redundant. modelSleep/Wake is related to use of ServerDirectories, which are not yet hooked up" self okToChange ifFalse: [ ^ self ]. self modelSleep. + isUpdating + ifTrue: + [directory := dir. + self changed: #directory] + ifFalse: + [self directory: dir. + self modelWakeUp. + isUpdating := true. + [directory = dir + ifTrue: + [self changed: #directory] + ifFalse: "directory was normalized in #directory:" + [self flag: #workaround. "Must not signal #directory because PluggableTreeMorph does not perform equality comparison when reselecting items. See: http://lists.squeakfoundation.org/pipermail/squeak-dev/2021-October/216808.…" + self changed: #selectedPath]. + self updateFileList. + self changed: #inputText] + ensure: [isUpdating := false]].! - self directory: dir. - self modelWakeUp. - self changed: #directory. - self updateFileList. - self changed: #inputText! Item was removed: - ----- Method: FileAbstractSelectionDialog>>textViewFont (in category 'ui details') ----- - textViewFont - - ^ TextStyle defaultFont! Item was removed: - ----- Method: FileChooserDialog>>buildWith: (in category 'toolbuilder') ----- - buildWith: builder - "assemble the spec for the chooser dialog UI" - - | windowSpec window | - windowSpec := self buildWindowWith: builder specs: { - (self frameOffsetFromTop: 0 - fromLeft: 0.35 - width: 0.65 - offsetFromBottom: 0) -> [self buildFileListWith: builder]. - (self frameOffsetFromTop: 0 - fromLeft: 0 - width: 0.35 - offsetFromBottom: 0) -> [self buildDirectoryTreeWith: builder]. - }. - windowSpec buttons addAll: ( self buildButtonsWith: builder ). - window := builder build: windowSpec. - window addKeyboardCaptureFilter: self. - self changed: #selectedPath. - ^window - ! Item was added: + ----- Method: FileChooserDialog>>inputText (in category 'filename') ----- + inputText + "return the filename to appear in the text field" + + ^fileName! Item was added: + ----- Method: FileChooserDialog>>inputText: (in category 'filename') ----- + inputText: aText + "Initialize the filename entry field to aString. If a file with that name already exists, set up to highlight it." + aText ifNil: [^ self]. + fileName := aText asString. + self selectExistingFileName! Item was added: + ----- Method: FileChooserDialog>>selectExistingFileName (in category 'private') ----- + selectExistingFileName + "Answer whether an existing file in the list matches my proposed filename, selecting it if it does." + + listIndex := nameList findFirst: [:each | + fileName isEmptyOrNil not and: + [each beginsWith: fileName "caseSensitive: FileDirectory default isCaseSensitive"]]. + fileName := nameList at: listIndex ifAbsent: [nil]. + + self changed: #fileListIndex. + self changed: #canAccept. + + ^ listIndex ~= 0! Item was changed: ----- Method: FileChooserDialog>>userMessage (in category 'ui details') ----- userMessage + "return the string to present to the user in order to explain the purpose of this dialog appearing" - "return the string to present to the user in order to explain the purpose of this dialog appearing" ^message ifNil: ['Choose a file name' translated]! Item was removed: - ----- Method: FileSaverDialog>>acceptFileName (in category 'initialize-release') ----- - acceptFileName - "make sure to accept any edit in the filename before closing" - - self changed: #acceptChanges. - ^super acceptFileName! Item was changed: ----- Method: FileSaverDialog>>buildButtonsWith: (in category 'toolbuilder') ----- buildButtonsWith: builder + + ^ (super buildButtonsWith: builder) + copyWith: + (builder pluggableButtonSpec new - "add a 'new directory' button to the beginning of the row of buttons" - ^{ builder pluggableButtonSpec new model: self; label: 'New Directory' translated; color: (self userInterfaceTheme get: #buttonColor for: #DialogWindow); + action: #newDirectoryName; + yourself)! - action: #newDirectoryName}, (super buildButtonsWith: builder)! Item was removed: - ----- Method: FileSaverDialog>>buildWith: (in category 'toolbuilder') ----- - buildWith: builder - "assemble the spec for the saver dialog UI and build the window" - - | window windowSpec | - windowSpec := self buildWindowWith: builder specs: { - (self topConstantHeightFrame: self textViewHeight - fromLeft: 0 - width: 1) -> [self buildTextInputWith: builder]. - (self frameOffsetFromTop: self textViewHeight - fromLeft: 0.35 - width: 0.65 - offsetFromBottom: 0) -> [self buildFileListWith: builder]. - (self frameOffsetFromTop: self textViewHeight - fromLeft: 0 - width: 0.35 - offsetFromBottom: 0) -> [self buildDirectoryTreeWith: builder]. - }. - windowSpec buttons addAll: ( self buildButtonsWith: builder ). - window := builder build: windowSpec. - window addKeyboardCaptureFilter: self. - self changed: #selectedPath. - self inputText: fileName. - window positionOverWidgetNamed: #inputText. - ^window - ! Item was added: + ----- Method: FileSaverDialog>>canAccept (in category 'accessing') ----- + canAccept + + ^ fileName isEmptyOrNil not + and: [(self directory directoryExists: fileName) not]! Item was added: + ----- Method: FileSaverDialog>>checkOrCorrectSuffix (in category 'filename') ----- + checkOrCorrectSuffix + + | suffix | + super checkOrCorrectSuffix ifTrue: [^ true]. + + suffixList ifEmpty: [^ false]. + + suffixList size = 1 ifTrue: + [((suffix := '.' , suffixList anyOne) + compare: (fileName last: (suffix size min: fileName size)) + caseSensitive: directory isCaseSensitive) + = 2 ifFalse: [ fileName := fileName , suffix ]. + ^ true]. + + suffix := (Project uiManager + chooseFrom: suffixList + values: suffixList + title: 'Please choose the type of file to save.' translated) + ifNil: [^ false]. + fileName := fileName , '.' , suffix. + self acceptFileName. + ^ true! Item was removed: - ----- Method: FileSaverDialog>>contentsSelection (in category 'ui details') ----- - contentsSelection - ^ 1 to: 9999! Item was changed: + ----- Method: FileSaverDialog>>initialFilename: (in category 'accessing') ----- - ----- Method: FileSaverDialog>>initialFilename: (in category 'initialize-release') ----- initialFilename: aFilenameOrNil "Set the initial choice of filename to highlight. We split the potential filename to see if it includes a path and if so, use that as the chosen directory - the client can manually change that with a subsequent send of #directory: if wanted. We split the root filename to find an extension and use that as the suffix - again, the client can manually change that later" | e f p | aFilenameOrNil ifNil:[^self]. p := FileDirectory dirPathFor: aFilenameOrNil. p isEmpty ifFalse:[self directory: (FileDirectory on: p)]. f := FileDirectory localNameFor: aFilenameOrNil. fileName := f. e := FileDirectory extensionFor: f. e isEmpty ifFalse:[self suffix: e]! Item was changed: ----- Method: FileSaverDialog>>inputText (in category 'filename') ----- inputText "return the filename to appear in the text field" + ^fileName! - ^fileName ifNil:['Enter a filename here or choose from list' translated]! Item was changed: ----- Method: FileSaverDialog>>inputText: (in category 'filename') ----- inputText: aText "Initialize the filename entry field to aString. If a file with that name already exists, set up to highlight it." aText ifNil: [^ self]. fileName := aText asString. + self selectExistingFileName! - self selectExistingFilename! Item was added: + ----- Method: FileSaverDialog>>selectExistingFileName (in category 'private') ----- + selectExistingFileName + "Answer whether an existing file in the list matches my proposed filename, selecting it if it does." + + listIndex := nameList findFirst: [:each | each = fileName]. + self changed: #fileListIndex. + ^ true! Item was removed: - ----- Method: FileSaverDialog>>selectExistingFilename (in category 'private') ----- - selectExistingFilename - "Answer whether an existing file in the list matches my proposed filename, selecting it if it does." - ^ (patternList anySatisfy: - [ : each | (each - compare: fileName - caseSensitive: FileDirectory default isCaseSensitive) = 2 ]) - and: - [ listIndex := nameList findFirst: [ : each | each = fileName ]. - true ]! Item was removed: - ----- Method: FileSaverDialog>>selectFilename: (in category 'filename') ----- - selectFilename: aText - "The user has entered a potential filename in the text field. Check it against the current pattern; if it is ok we can accept it and then if it is a file in the current list, highlight it. If it would not match the pattern, alert the user." - fileName := aText asString. - ^ self selectExistingFilename - ifTrue: - [ self changed: #fileListIndex. - true ] - ifFalse: - [ suffixList size = 1 - ifTrue: - [ | suffix | - ((suffix := '.' , suffixList anyOne) - compare: (fileName last: (suffix size min: fileName size)) - caseSensitive: FileDirectory default isCaseSensitive) = 2 ifFalse: [ fileName := fileName , suffix ]. - true ] - ifFalse: - [ suffixList - at: - (UIManager default - chooseFrom: suffixList - title: 'Please choose the type of file to save.' translated) - ifPresent: - [ : choice | fileName := fileName , '.' , choice. - true ] - ifAbsent: - [ suffixList isEmpty or: - [ self inform: ('WARNING: File not saved!! A filename matching one of {1} patterns is required.' translated format: {patternList asArray}). - false ] ] ] ]!

1 0

The Trunk: Graphics-mt.528.mcz
by commits＠source.squeak.org 08 Jul '22

08 Jul '22

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.528.mcz ==================== Summary ==================== Name: Graphics-mt.528 Author: mt Time: 8 July 2022, 1:44:04.359615 pm UUID: 35713805-bd5f-c745-9b83-a8d102feb209 Ancestors: Graphics-kfr.527 Avoid deprecation warning when trying to parse binary content into a Form via #fromFileNamed: or #fromBinaryStream:. =============== Diff against Graphics-kfr.527 =============== Item was added: + ----- Method: AnimatedGIFReadWriter class>>understandsImageFormat: (in category 'image reading/writing') ----- + understandsImageFormat: aStream + ^ false!

1 0

The Trunk: Tools-eem.1167.mcz
by commits＠source.squeak.org 08 Jul '22

08 Jul '22

Eliot Miranda uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-eem.1167.mcz ==================== Summary ==================== Name: Tools-eem.1167 Author: eem Time: 7 July 2022, 5:59:46.432372 pm UUID: 42d3bf84-0717-43d8-82d6-497190084e1e Ancestors: Tools-mt.1166 Fix regression in runUntil. doStepUntil: answers self when stepping is to stop for some reason (e.g. user presses shift). So it should be excluded from the "this expression answered a bogus value" test. =============== Diff against Tools-mt.1166 =============== Item was changed: ----- Method: Debugger>>runUntil (in category 'code pane menu') ----- runUntil "Step until an expression evaluates to other than false, reporting an error if it doesn't evaluate to true. Remember the expression in an inst var." | expression receiver context method value | expression := UIManager default request: 'run until expression is true (shift to disable ui update; shift to break).' initialAnswer: (untilExpression ifNil: 'boolean expression'). (expression isNil or: [expression isEmpty]) ifTrue: [^self]. untilExpression := expression. context := self selectedContext. receiver := context receiver. method := receiver class evaluatorClass new compiledMethodFor: untilExpression in: context to: receiver notifying: nil ifFail: [^ #failedDoit]. value := self doStepUntil: [method valueWithReceiver: receiver arguments: {context}]. + (value ~~ self and: [value ~~ false and: [value ~~ true]]) ifTrue: - (value ~~ false and: [value ~~ true]) ifTrue: [UIManager default inform: 'expression ', (untilExpression contractTo: 40), ' answered ', (value printString contractTo: 20), '!!!!']!

1 0

The Trunk: Collections-cmm.1017.mcz
by commits＠source.squeak.org 07 Jul '22

07 Jul '22

Chris Muller uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-cmm.1017.mcz ==================== Summary ==================== Name: Collections-cmm.1017 Author: cmm Time: 6 July 2022, 11:27:25.948092 pm UUID: 871747c5-a53b-4897-81c4-ece30bc41631 Ancestors: Collections-cmm.1016 Include support method missing from Collections-cmm.1016. =============== Diff against Collections-cmm.1016 =============== Item was added: + ----- Method: String>>numberOrValue (in category 'formatting') ----- + numberOrValue + "If I'm 100% digits, answer my numerical value, otherwise, answer myself." + | number | + number := 0. + self size + to: 1 + by: -1 + do: + [ : pos | | digit | + digit := self at: pos. + digit isDigit ifFalse: [ ^ self ]. + number := number + ((10 raisedTo: self size - pos) * digit digitValue) ]. + ^ number!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages July 2022