Squeak-dev October 2011

squeak-dev@lists.squeakfoundation.org

47 participants
160 discussions

The Inbox: Kernel-nice.643.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

A new version of Kernel was added to project The Inbox: http://source.squeak.org/inbox/Kernel-nice.643.mcz ==================== Summary ==================== Name: Kernel-nice.643 Author: nice Time: 19 October 2011, 10:20:57.421 pm UUID: 2a71e43b-e95f-468b-8eb1-f9f0395e5800 Ancestors: Kernel-nice.642 Speed-up mixed Fraction-Integer arithmetic. This is at the expense of a few isFraction tests and code duplication. =============== Diff against Kernel-nice.642 =============== Item was changed: ----- Method: Fraction>>- (in category 'arithmetic') ----- - aNumber "Answer the difference between the receiver and aNumber." + | n d d1 d2 | aNumber isFraction ifTrue: + [d := denominator gcd: aNumber denominator. + n := numerator * (d1 := aNumber denominator // d) - (aNumber numerator * (d2 := denominator // d)). + d1 := d1 * d2. + n := n // (d2 := n gcd: d). + (d := d1 * (d // d2)) = 1 ifTrue: [^ n]. + ^ Fraction numerator: n denominator: d]. - [^ self + aNumber negated]. ^ aNumber adaptToFraction: self andSend: #-! Item was changed: ----- Method: Fraction>>/ (in category 'arithmetic') ----- / aNumber "Answer the result of dividing the receiver by aNumber." + | d1 d2 | + aNumber isFraction ifTrue: + [d1 := numerator gcd: aNumber numerator. + d2 := denominator gcd: aNumber denominator. + (d2 = denominator and: [d1 = aNumber numerator]) + ifTrue: [^ numerator // d1 * (aNumber denominator // d2)]. + ^ Fraction numerator: numerator // d1 * (aNumber denominator // d2) + denominator: denominator // d2 * (aNumber numerator // d1)]. - aNumber isFraction - ifTrue: [^self * aNumber reciprocal]. ^ aNumber adaptToFraction: self andSend: #/! Item was changed: ----- Method: Integer>>* (in category 'arithmetic') ----- * aNumber "Refer to the comment in Number * " aNumber isInteger ifTrue: [^ self digitMultiply: aNumber + neg: self negative == aNumber negative == false]. + aNumber isFraction + ifTrue: + [| n d | + n := self // (d := self gcd: aNumber denominator). + d := aNumber denominator // d. + ^d = 1 + ifTrue: [n * aNumber numerator] + ifFalse: [Fraction numerator: n * aNumber numerator denominator: d]]. - neg: self negative ~~ aNumber negative]. ^ aNumber adaptToInteger: self andSend: #*! Item was changed: ----- Method: Integer>>+ (in category 'arithmetic') ----- + aNumber "Refer to the comment in Number + " aNumber isInteger ifTrue: [self negative == aNumber negative ifTrue: [^ (self digitAdd: aNumber) normalize] ifFalse: [^ self digitSubtract: aNumber]]. + aNumber isFraction ifTrue: [^Fraction numerator: self * aNumber denominator + aNumber numerator denominator: aNumber denominator]. ^ aNumber adaptToInteger: self andSend: #+! Item was changed: ----- Method: Integer>>- (in category 'arithmetic') ----- - aNumber "Refer to the comment in Number - " aNumber isInteger ifTrue: [self negative == aNumber negative ifTrue: [^ self digitSubtract: aNumber] ifFalse: [^ (self digitAdd: aNumber) normalize]]. + aNumber isFraction ifTrue: [^Fraction numerator: self * aNumber denominator - aNumber numerator denominator: aNumber denominator]. ^ aNumber adaptToInteger: self andSend: #-! Item was changed: ----- Method: Integer>>/ (in category 'arithmetic') ----- / aNumber "Refer to the comment in Number / " | quoRem | aNumber isInteger ifTrue: [quoRem := self digitDiv: aNumber abs "*****I've added abs here*****" + neg: self negative == aNumber negative == false. - neg: self negative ~~ aNumber negative. (quoRem at: 2) = 0 ifTrue: [^ (quoRem at: 1) normalize] ifFalse: [^ (Fraction numerator: self denominator: aNumber) reduced]]. + aNumber isFraction + ifTrue: + [| n d | + n := self // (d := self gcd: aNumber numerator). + d := aNumber numerator // d. + ^d abs = 1 + ifTrue: [n * aNumber denominator * d] + ifFalse: [Fraction numerator: n * aNumber denominator denominator: d]]. ^ aNumber adaptToInteger: self andSend: #/!

1 0

The Trunk: Kernel-nice.642.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.642.mcz ==================== Summary ==================== Name: Kernel-nice.642 Author: nice Time: 19 October 2011, 10:11:56.9 pm UUID: 26bbac76-79b8-4600-ac86-f60a02ad6da3 Ancestors: Kernel-nice.641 Correct my own bugs, (-3/2) log should raise a DomainError, not an infinite loop... =============== Diff against Kernel-nice.641 =============== Item was changed: ----- Method: Fraction>>ln (in category 'mathematical functions') ----- ln "This function is defined because super ln might overflow. Note that < 1 is tested before converting to float in order to avoid precision loss due to gradual underflow." | res int | - self < 1 ifTrue: [^self reciprocal ln negated]. self <= 0 ifTrue: [DomainError signal: 'ln is only defined for x > 0']. + self < 1 ifTrue: [^self reciprocal ln negated]. res := super ln. res isFinite ifTrue: [^res]. int := self integerPart. ^int ln + (self / int) ln! Item was changed: ----- Method: Fraction>>log (in category 'mathematical functions') ----- log "This function is defined because super log might overflow. Note that < 1 is tested before converting to float in order to avoid precision loss due to gradual underflow." | res int | - self < 1 ifTrue: [^self reciprocal log negated]. self <= 0 ifTrue: [DomainError signal: 'log is only defined for x > 0']. + self < 1 ifTrue: [^self reciprocal log negated]. res := super log. res isFinite ifTrue: [^res]. int := self integerPart. ^int log + (self / int) log!

1 0

Cog file reading-while-writing problem on Mac OS
by Bert Freudenberg 19 Oct '11

19 Oct '11

I had this several times now. During updating, a notifier would pop up suggesting the sources file was not found. Selecting the file in the popup would always fix it. Similar symptom when I was generating code which involved reading the old source. This sometimes would return nil: oldSource := (aClass >> selector) getSourceFromFile. This fixed it: n := 0. [oldSource := (aClass >> selector) getSourceFromFile. oldSource isNil] whileTrue: [(Delay forMilliseconds: 100) wait. (n := n + 1) > 10 ifTrue: [self halt]]. The halt was never triggered. Just reading the file is no problem. It appears to only manifest with the interleaved reading and writing that's happening when logging stuff to the changes file while also accessing old method sources. In the updating scenario, #readOnlyCopy would return nil. The getSourceFromFile problem sounds similar. I have seen this on Lion, others on Snow Leopard. Any idea? Virtual Machine --------------- /Users/bert/Documents/Work/Frank/Cog.app/Contents/MacOS/Croquet Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.128] Croquet Cog 4.0.0 Mac OS X built on Sep 28 2011 13:20:56 Compiler: 4.2.1 (Apple Inc. build 5666) (dot 3) platform sources revision r2496 http://www.squeakvm.org/svn/squeak/branches/Cog CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b Sep 28 2011 StackToRegisterMappingCogit VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b Sep 28 2011 Loaded VM Modules ----------------- B2DPlugin VMMaker.oscog-eem.69 (i) BitBltPlugin VMMaker.oscog-eem.115 (i) DropPlugin VMMaker-oscog.40 (i) FilePlugin VMMaker.oscog-eem.97 (i) FloatArrayPlugin VMMaker-oscog.40 (e) GeziraBindings bf.18 15 June 2011 (e) InternetConfigPlugin VMMaker-oscog.40 (i) LargeIntegers v1.5 VMMaker.oscog-eem.72 (i) LocalePlugin VMMaker-oscog.40 (i) Matrix2x3Plugin VMMaker-oscog.40 (i) MiscPrimitivePlugin VMMaker-oscog.40 (i) SecurityPlugin VMMaker-oscog.40 (i) SocketPlugin VMMaker-oscog.40 (i) SoundGenerationPlugin VMMaker.oscog-eem.97 (i) SoundPlugin VMMaker-oscog.54 (i) UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.31 (e) ZipPlugin VMMaker-oscog.40 (i) - Bert -

2 1

Behavior>>decompile:
by Bert Freudenberg 19 Oct '11

19 Oct '11

According to its comment, it should return a String. It's returning a MethodNode instead. Should it? - Bert -

3 2

The Trunk: KernelTests-nice.206.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Nicolas Cellier uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-nice.206.mcz ==================== Summary ==================== Name: KernelTests-nice.206 Author: nice Time: 19 October 2011, 9:05:49.567 pm UUID: f0d273b9-8a0e-4689-8c36-ecd3b6c75f33 Ancestors: KernelTests-nice.205 More tests for #nthRoot: and #nthRootTruncated: =============== Diff against KernelTests-nice.205 =============== Item was added: + ----- Method: FractionTest>>testNthRoot (in category 'tests - mathematical functions') ----- + testNthRoot + self assert: ((-2 raisedTo: 35) / (3 raisedTo: 20) raisedTo: 1/5) equals: (-2 raisedTo: 7) / (3 raisedTo: 4). + self assert: (1 / (1 << 2000) raisedTo: 1/100) equals: 1 / (1 << 20)! Item was added: + ----- Method: IntegerTest>>testNthRoot (in category 'tests - mathematical functions') ----- + testNthRoot + + self shouldnt: [ (1 << 2000 nthRoot: 100) ] raise: ArithmeticError. + self assert: (1 << 2000 nthRoot: 100) equals: 1 << 20! Item was added: + ----- Method: IntegerTest>>testNthRootTruncated (in category 'tests - mathematical functions') ----- + testNthRootTruncated + <timeout: 5 "seconds"> + | tooBigToBeAFloat large | + tooBigToBeAFloat := 1 << 2000. + self assert: (tooBigToBeAFloat nthRootTruncated: 100) equals: 1 << 20. + self assert: (tooBigToBeAFloat + 1 nthRootTruncated: 100) equals: 1 << 20. + self assert: (tooBigToBeAFloat - 1 nthRootTruncated: 100) equals: 1 << 20 - 1. + + large := -3 raisedTo: 255. + self assert: (large nthRootTruncated: 17) equals: (-3 raisedTo: 15). + self assert: (large + 11 nthRootTruncated: 17) equals: (-3 raisedTo: 15) + 1. + self assert: (large - 11 nthRootTruncated: 17) equals: (-3 raisedTo: 15). + + 2 to: 10 do: [:thePower | + 1 to: 10000 do: [:n | + | theTruncatedRoot | + theTruncatedRoot := n nthRootTruncated: thePower. + self assert: (theTruncatedRoot raisedTo: thePower) <= n. + self assert: (theTruncatedRoot + 1 raisedTo: thePower) > n]]!

1 0

The Trunk: Kernel-nice.641.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.641.mcz ==================== Summary ==================== Name: Kernel-nice.641 Author: nice Time: 19 October 2011, 8:44:12.297 pm UUID: e31730ef-2db4-42e3-aa0e-299e45c955ac Ancestors: Kernel-nice.640 Correct #nthRootTruncated: (it did call #nthRootFloor:) Let #nthRoot: retry in exact arithmetic if ever Float overflows. =============== Diff against Kernel-nice.640 =============== Item was changed: ----- Method: Integer>>nthRoot: (in category 'mathematical functions') ----- nthRoot: aPositiveInteger "Answer the nth root of the receiver." | selfAsFloat floatResult guess raised higher lower delta | selfAsFloat := self asFloat. floatResult := selfAsFloat nthRoot: aPositiveInteger. + "If we can't do Float arithmetic, then look for an exact answer in exact arithmetic" - "If we can't do Float arithmetic, currently we can't look for an exact answer" floatResult isInfinite ifTrue: [ + guess := self nthRootTruncated: aPositiveInteger. + (guess raisedToInteger: aPositiveInteger) = self ifTrue: [^guess]. ^floatResult ]. guess := floatResult rounded. "If got an exact answer, answer it." raised := guess raisedToInteger: aPositiveInteger. raised = self ifTrue: [ ^ guess ]. "In this case, maybe it failed because we are such a big integer that the Float method gets inexact, even if we are a whole square number. Note (jmv): The algorithms I found for computing the nthRoot would havily use very large fractions. I wrote this one, that doesn't create fractions." selfAsFloat abs >= (Float maxExactInteger asFloat raisedToInteger: aPositiveInteger) ifTrue: [ raised > self ifTrue: [ higher := guess. delta := floatResult predecessor - floatResult. [ floatResult := floatResult + delta. lower := floatResult rounded. (lower raisedToInteger: aPositiveInteger) > self ] whileTrue: [ delta := delta * 2. higher := lower ] ] ifFalse: [ lower := guess. delta := floatResult successor - floatResult. [ floatResult := floatResult + delta. higher := floatResult rounded. (higher raisedToInteger: aPositiveInteger) < self ] whileTrue: [ delta := delta * 2. lower := higher ]]. [ higher - lower > 1 ] whileTrue: [ guess := lower + higher // 2. raised := guess raisedToInteger: aPositiveInteger. raised = self ifTrue: [ ^ guess ]. raised > self ifTrue: [ higher := guess ] ifFalse: [ lower := guess ]]]. "We need an approximate result" ^floatResult! Item was changed: ----- Method: Integer>>nthRootTruncated: (in category 'mathematical functions') ----- nthRootTruncated: aPositiveInteger "Answer the integer part of the nth root of the receiver." | guess guessToTheNthMinusOne delta | self = 0 ifTrue: [^0]. self negative ifTrue: [aPositiveInteger even ifTrue: [ ArithmeticError signal: 'Negative numbers don''t have even roots.' ]. + ^(self negated nthRootTruncated: aPositiveInteger) negated]. - ^(self negated nthRootFloor: aPositiveInteger) negated]. guess := 1 bitShift: self highBitOfMagnitude + aPositiveInteger - 1 // aPositiveInteger. [ guessToTheNthMinusOne := guess raisedTo: aPositiveInteger - 1. delta := (guess * guessToTheNthMinusOne - self) // (guessToTheNthMinusOne * aPositiveInteger). delta = 0 ] whileFalse: [ guess := guess - delta ]. ( (guess := guess - 1) raisedTo: aPositiveInteger) > self ifTrue: [ guess := guess - 1 ]. ^guess!

1 0

ifTrue: vs. ifFalse:
by Chris Muller 19 Oct '11

19 Oct '11

(From vm-dev list) > But I much prefer foo ~~ bar ifTrue: than foo == bar ifFalse:. Hi Eliot. May I ask why you prefer the former over the latter? I'm interested because I'm working on an application where the folks involved prefer something similar, to where they write (expr) not ifTrue: [ ] rather than (expr) ifFalse: [ ]. I know you wouldn't do that but your statement definitely piqued my surprise and curiosity.

8 14

The Trunk: ToolBuilder-SUnit-cmm.15.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Chris Muller uploaded a new version of ToolBuilder-SUnit to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-SUnit-cmm.15.mcz ==================== Summary ==================== Name: ToolBuilder-SUnit-cmm.15 Author: cmm Time: 18 October 2011, 8:13:48.61 pm UUID: f798f016-1576-4829-b6b8-59573eb884ba Ancestors: ToolBuilder-SUnit-nice.14 Added test for handling Notification inside a progress block. =============== Diff against ToolBuilder-SUnit-nice.14 =============== Item was added: + ----- Method: SUnitToolBuilderTests>>testHandlingNotification (in category 'tests') ----- + testHandlingNotification + | receivedSignal resumed | + receivedSignal := resumed := false. + [ | count | + "client-code puts up progress, and signals some notications" + count := 0. + 'doing something' + displayProgressFrom: 0 + to: 10 + during: + [ : bar | 10 timesRepeat: + [ bar value: (count := count + 1). + (Delay forMilliseconds: 200) wait. + Notification signal: 'message'. + resumed := true ] ] ] + on: Notification + do: + [ : noti | receivedSignal := true. + noti resume ]. + self + assert: receivedSignal ; + assert: resumed!

1 0

The Trunk: ToolBuilder-Kernel-cmm.52.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Chris Muller uploaded a new version of ToolBuilder-Kernel to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Kernel-cmm.52.mcz ==================== Summary ==================== Name: ToolBuilder-Kernel-cmm.52 Author: cmm Time: 18 October 2011, 8:12:42.168 pm UUID: 54416a65-63c1-4ba4-959e-7f1f7db3aa62 Ancestors: ToolBuilder-Kernel-dtl.51 Fix ability to safely catch Notification so that, if #displayProgressAt:from:to:during: is sent, will actually execute the during block. =============== Diff against ToolBuilder-Kernel-dtl.51 =============== Item was changed: ----- Method: ProgressInitiationException>>defaultAction (in category 'as yet unclassified') ----- defaultAction + self resume! - - | result | - result := UIManager default - displayProgress: progressTitle - at: aPoint - from: minVal - to: maxVal - during: workBlock. - self resume: result! Item was added: + ----- Method: ProgressInitiationException>>defaultResumeValue (in category 'as yet unclassified') ----- + defaultResumeValue + ^ UIManager default + displayProgress: progressTitle + at: aPoint + from: minVal + to: maxVal + during: workBlock!

1 0

The Trunk: Morphic-cmm.586.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.586.mcz ==================== Summary ==================== Name: Morphic-cmm.586 Author: cmm Time: 18 October 2011, 9:10:21.732 pm UUID: b8ec878b-8538-4fb1-ad84-a3e9acd99fb1 Ancestors: Morphic-cmm.585 - Added a setter for the #clearFilterAutomatically preference. - Improved comments. =============== Diff against Morphic-Richo.583 =============== Item was changed: ScrollPane subclass: #PluggableListMorph + instanceVariableNames: 'list getListSelector getListSizeSelector getListElementSelector getIndexSelector setIndexSelector keystrokeActionSelector autoDeselect lastKeystrokeTime lastKeystrokes lastClickTime doubleClickSelector handlesBasicKeys potentialDropRow listMorph hScrollRangeCache keystrokePreviewSelector priorSelection' + classVariableNames: 'ClearFilterAutomatically FilterableLists' - instanceVariableNames: 'list getListSelector getListSizeSelector getListElementSelector getIndexSelector setIndexSelector keystrokeActionSelector autoDeselect lastKeystrokeTime lastKeystrokes lastClickTime doubleClickSelector handlesBasicKeys potentialDropRow listMorph hScrollRangeCache keystrokePreviewSelector' - classVariableNames: '' poolDictionaries: '' category: 'Morphic-Pluggable Widgets'! + !PluggableListMorph commentStamp: 'cmm 8/21/2011 23:37' prior: 0! + When a PluggableListMorph is in focus, type in a letter (or several letters quickly) to go to the next item that begins with that letter (if FilterableLists is false). - !PluggableListMorph commentStamp: '<historical>' prior: 0! - ... - When a PluggableListMorph is in focus, type in a letter (or several - letters quickly) to go to the next item that begins with that letter. Special keys (up, down, home, etc.) are also supported.! Item was added: + ----- Method: PluggableListMorph class>>clearFilterAutomatically (in category 'preferences') ----- + clearFilterAutomatically + <preference: 'Filterable Lists Clear Automatically' + category: 'scrolling' + description: 'When using the Filterable Lists option, if this option is also selected, then the filter will be cleared as soon as the list loses keyboard focus.' + type: #Boolean> + ^ ClearFilterAutomatically ifNil: [ true ]! Item was added: + ----- Method: PluggableListMorph class>>clearFilterAutomatically: (in category 'preferences') ----- + clearFilterAutomatically: aBoolean + ClearFilterAutomatically := aBoolean! Item was added: + ----- Method: PluggableListMorph class>>filterableLists (in category 'preferences') ----- + filterableLists + <preference: 'Filterable Lists' + category: 'scrolling' + description: 'When true, using the keyboard on a list will filter it rather than scroll. Pressing enter clears the filter and keeps the filtered selection. Backspace clears the filter and returns to the prior selection.' + type: #Boolean> + ^ FilterableLists ifNil: [ true ]! Item was added: + ----- Method: PluggableListMorph class>>filterableLists: (in category 'preferences') ----- + filterableLists: aBoolean + "When true, using the keyboard on a list will filter it rather than scroll. Pressing enter clears the filter and keeps the filtered selection. Backspace clears the filter and returns to the prior selection." + FilterableLists := aBoolean! Item was changed: ----- Method: PluggableListMorph>>basicKeyPressed: (in category 'model access') ----- basicKeyPressed: aChar - | milliseconds slowKeyStroke listSize newSelectionIndex oldSelectionIndex startIndex | oldSelectionIndex := newSelectionIndex := self getCurrentSelectionIndex. listSize := self getListSize. milliseconds := Time millisecondClockValue. + slowKeyStroke := (Time + milliseconds: milliseconds + since: lastKeystrokeTime) > (self class filterableLists ifTrue: [500] ifFalse: [ 300 ]). - slowKeyStroke := (Time milliseconds: milliseconds since: lastKeystrokeTime) > 300. lastKeystrokeTime := milliseconds. slowKeyStroke + ifTrue: + [ self class filterableLists ifTrue: [ self hasFilter ifFalse: [ priorSelection := self modelIndexFor: self selectionIndex] ]. + "forget previous keystrokes and search in following elements" - ifTrue: ["forget previous keystrokes and search in following elements" lastKeystrokes := aChar asLowercase asString. + newSelectionIndex := newSelectionIndex \\ listSize + 1. + self class filterableLists ifTrue: [ list := self getFullList ] ] + ifFalse: [ "append quick keystrokes but don't move selection if it still matches" - newSelectionIndex := newSelectionIndex \\ listSize + 1 ] - ifFalse: ["append quick keystrokes but don't move selection if it still matches" lastKeystrokes := lastKeystrokes , aChar asLowercase asString. newSelectionIndex := newSelectionIndex max: 1 ]. "No change if model is locked" + model okToChange ifFalse: [ ^ self ]. + self class filterableLists + ifTrue: + [ self + filterList ; + updateList. + newSelectionIndex := self modelIndexFor: 1 ] + ifFalse: + [ startIndex := newSelectionIndex. + listSize := self getListSize. + [ (self getListItem: newSelectionIndex) asString withBlanksTrimmed asLowercase beginsWith: lastKeystrokes ] whileFalse: + [ (newSelectionIndex := newSelectionIndex \\ listSize + 1) = startIndex ifTrue: [ ^ self flash"Not in list." ] ]. + newSelectionIndex = oldSelectionIndex ifTrue: [ ^ self flash ] ]. + (self hasFilter and: [(self getCurrentSelectionIndex = newSelectionIndex) not]) ifTrue: + [self changeModelSelection: newSelectionIndex]! - model okToChange ifFalse: [ ^self ]. - "Get rid of blanks and style used in some lists" - startIndex := newSelectionIndex. - [ - (self getListItem: newSelectionIndex) asString - withBlanksTrimmed asLowercase beginsWith: lastKeystrokes ] - whileFalse: [ - (newSelectionIndex := newSelectionIndex \\ listSize + 1) = startIndex ifTrue: [ - ^self flash. "Not in list." ] ]. - newSelectionIndex = oldSelectionIndex ifTrue: [ ^self flash ]. "Same selection." - ^self changeModelSelection: newSelectionIndex! Item was added: + ----- Method: PluggableListMorph>>filterList (in category 'filtering') ----- + filterList + self hasFilter + ifTrue: + [ | frontMatching substringMatching newList | + self indicateFiltered. + frontMatching := OrderedCollection new. + substringMatching := OrderedCollection new. + list withIndexDo: + [ : each : n | | foundPos | + foundPos := each asString + findString: lastKeystrokes + startingAt: 1 + caseSensitive: false. + foundPos = 1 + ifTrue: [ frontMatching add: each ] + ifFalse: + [ foundPos = 0 ifFalse: [ substringMatching add: each ] ] ]. + newList := frontMatching , substringMatching. + newList + ifEmpty: + [ lastKeystrokes := lastKeystrokes allButLast: 1. + self + flash ; + filterList ] + ifNotEmpty: [ list := newList ] ] + ifFalse: [ self indicateUnfiltered ]! Item was added: + ----- Method: PluggableListMorph>>getFullList (in category 'model access') ----- + getFullList + "The full, unfiltered list." + ^ model perform: getListSelector! Item was changed: ----- Method: PluggableListMorph>>getList (in category 'model access') ----- getList "Answer the list to be displayed. Caches the returned list in the 'list' ivar" + getListSelector == nil ifTrue: [ ^ Array empty ]. + list := self getFullList. + self class filterableLists ifTrue: [ self filterList ]. - getListSelector == nil ifTrue: [ ^ #() ]. - list := model perform: getListSelector. ^ list ifNil: [ Array empty ]! Item was added: + ----- Method: PluggableListMorph>>hasFilter (in category 'filtering') ----- + hasFilter + ^ lastKeystrokes isEmptyOrNil not! Item was added: + ----- Method: PluggableListMorph>>indicateFiltered (in category 'filtering') ----- + indicateFiltered + self color: Color red muchLighter muchLighter! Item was added: + ----- Method: PluggableListMorph>>indicateUnfiltered (in category 'filtering') ----- + indicateUnfiltered + self color: Color white! Item was changed: ----- Method: PluggableListMorph>>keyboardFocusChange: (in category 'event handling') ----- + keyboardFocusChange: aBoolean - keyboardFocusChange: aBoolean "The message is sent to a morph when its keyboard focus changes. The given argument indicates that the receiver is gaining (versus losing) the keyboard focus. In this case, all we need to do is to redraw border feedback" + aBoolean ifFalse: + [ self class clearFilterAutomatically ifTrue: + [ self hasFilter ifTrue: + [ self + removeFilter ; + updateList ] ] ]. + (self innerBounds areasOutside: (self innerBounds insetBy: 1)) do: + [ : rect | self invalidRect: rect ]! - - (self innerBounds areasOutside: (self innerBounds insetBy: 1)) - do: [ :rect | self invalidRect: rect ]! Item was added: + ----- Method: PluggableListMorph>>modelIndexFor: (in category 'selection') ----- + modelIndexFor: selectionIndex + "The model does not know anything about the receiver's filtering, so if I am filtered, we must determine the correct index by scanning the full list in the model." + ^ (selectionIndex > 0 and: [ self hasFilter ]) + ifTrue: + [ list + ifEmpty: [ 0 ] + ifNotEmpty: [ self getFullList indexOf: (self getListItem: selectionIndex) ] ] + ifFalse: [ selectionIndex ]! Item was changed: ----- Method: PluggableListMorph>>mouseUp: (in category 'events') ----- mouseUp: event "The mouse came up within the list; take appropriate action" | row | row := self rowAtLocation: event position. "aMorph ifNotNil: [aMorph highlightForMouseDown: false]." model okToChange ifFalse: [^ self]. "No change if model is locked" row = self selectionIndex ifTrue: [(autoDeselect ifNil: [true]) ifTrue:[row = 0 ifFalse: [self changeModelSelection: 0] ]] + ifFalse: [self changeModelSelection: (self modelIndexFor: row)]. - ifFalse: [self changeModelSelection: row]. Cursor normal show! Item was added: + ----- Method: PluggableListMorph>>removeFilter (in category 'model access') ----- + removeFilter + lastKeystrokes := String empty. + list := nil! Item was changed: ----- Method: PluggableListMorph>>scrollSelectionIntoView (in category 'selection') ----- scrollSelectionIntoView "make sure that the current selection is visible" | row | + row := self uiIndexFor: self getCurrentSelectionIndex. - row := self getCurrentSelectionIndex. row = 0 ifTrue: [ ^ self ]. self scrollToShow: (self listMorph drawBoundsForRow: row)! Item was changed: ----- Method: PluggableListMorph>>selectedMorph: (in category 'selection') ----- selectedMorph: aMorph "this shouldn't be used any longer" + self isThisEverCalled . - "self isThisEverCalled ." - - Beeper beep. true ifTrue: [^self]! Item was changed: ----- Method: PluggableListMorph>>setSelectedMorph: (in category 'selection') ----- + setSelectedMorph: aMorph + self changeModelSelection: (self modelIndexFor: (scroller submorphs indexOf: aMorph))! - setSelectedMorph: aMorph - self changeModelSelection: (scroller submorphs indexOf: aMorph)! Item was changed: ----- Method: PluggableListMorph>>specialKeyPressed: (in category 'model access') ----- specialKeyPressed: asciiValue "A special key with the given ascii-value was pressed; dispatch it" - | oldSelection nextSelection max howManyItemsShowing | + (#(8 13) includes: asciiValue) ifTrue: + [ "backspace key - clear the filter, restore the list with the selection" + self removeFilter. + priorSelection ifNotNil: + [ | prior | + prior := priorSelection. + priorSelection := self getCurrentSelectionIndex. + asciiValue = 8 ifTrue: [ self changeModelSelection: prior ] ]. + ^ self updateList ]. asciiValue = 27 ifTrue: [" escape key" ^ ActiveEvent shiftPressed ifTrue: [ActiveWorld putUpWorldMenuFromEscapeKey] ifFalse: [self yellowButtonActivity: false]]. max := self maximumSelection. max > 0 ifFalse: [^ self]. + nextSelection := oldSelection := self selectionIndex. - nextSelection := oldSelection := self getCurrentSelectionIndex. asciiValue = 31 ifTrue: [" down arrow" nextSelection := oldSelection + 1. nextSelection > max ifTrue: [nextSelection := 1]]. asciiValue = 30 ifTrue: [" up arrow" nextSelection := oldSelection - 1. nextSelection < 1 ifTrue: [nextSelection := max]]. asciiValue = 1 ifTrue: [" home" nextSelection := 1]. asciiValue = 4 ifTrue: [" end" nextSelection := max]. howManyItemsShowing := self numSelectionsInView. asciiValue = 11 ifTrue: [" page up" nextSelection := 1 max: oldSelection - howManyItemsShowing]. asciiValue = 12 ifTrue: [" page down" nextSelection := oldSelection + howManyItemsShowing min: max]. model okToChange ifFalse: [^ self]. "No change if model is locked" oldSelection = nextSelection ifTrue: [^ self flash]. + ^ self changeModelSelection: (self modelIndexFor: nextSelection)! - ^ self changeModelSelection: nextSelection! Item was removed: - ----- Method: PluggableListMorph>>superDrawOn: (in category 'drawing') ----- - superDrawOn: aCanvas - super drawOn: aCanvas. - ! Item was added: + ----- Method: PluggableListMorph>>uiIndexFor: (in category 'selection') ----- + uiIndexFor: modelIndex + "The model does not know anything about the receiver's filtering. Answer the index in my (possibly filtered) list for modelIndex." + (modelIndex > 0 and: [ self hasFilter ]) + ifTrue: + [ | selectedItem | + selectedItem := self getFullList at: modelIndex. + (list ifNil: [ self getList ]) withIndexDo: + [ : eachMatchingItem : n | eachMatchingItem = selectedItem ifTrue: [ ^ n ] ]. + ^ 0 ] + ifFalse: [ ^ modelIndex ]! Item was changed: ----- Method: PluggableListMorph>>update: (in category 'updating') ----- update: aSymbol "Refer to the comment in View|update:." + aSymbol == getListSelector ifTrue: + [ self updateList. + ^ self ]. - - aSymbol == getListSelector ifTrue: - [self updateList. - ^ self]. aSymbol == getIndexSelector ifTrue: + [ | uiIndex modelIndex | + uiIndex := self uiIndexFor: (modelIndex := self getCurrentSelectionIndex). + self selectionIndex: + (uiIndex = 0 + ifTrue: + [ "The filter is preventing us from selecting the item we want - remove it." + (list notNil and: [list size > 0]) ifTrue: [ self removeFilter ]. + modelIndex ] + ifFalse: [ uiIndex ]). + ^ self ]! - [self selectionIndex: self getCurrentSelectionIndex. - ^ self]. - ! Item was changed: ----- Method: PluggableListMorph>>updateList (in category 'updating') ----- updateList | index | "the list has changed -- update from the model" self listMorph listChanged. self setScrollDeltas. scrollBar setValue: 0.0. index := self getCurrentSelectionIndex. self resetPotentialDropRow. + self selectionIndex: (self uiIndexFor: index). - self selectionIndex: index. ! Item was changed: ----- Method: PluggableListMorph>>verifyContents (in category 'updating') ----- verifyContents "Verify the contents of the receiver, reconstituting if necessary. Called whenever window is reactivated, to react to possible structural changes. Also called periodically in morphic if the smartUpdating preference is true" | newList existingSelection anIndex oldList | oldList := list ifNil: [ #() ]. newList := self getList. oldList = newList ifTrue: [ ^ self ]. existingSelection := self selectionIndex > 0 ifTrue: [ oldList at: self selectionIndex ] ifFalse: [ nil ]. self updateList. + (existingSelection notNil and: [(anIndex := self getFullList indexOf: existingSelection asStringOrText ifAbsent: [nil]) notNil]) - (existingSelection notNil and: [(anIndex := list indexOf: existingSelection asStringOrText ifAbsent: [nil]) notNil]) ifTrue: [model noteSelectionIndex: anIndex for: getListSelector. self selectionIndex: anIndex] ifFalse: [self changeModelSelection: 0]! Item was changed: ----- Method: PluggableListMorphOfMany>>mouseDown: (in category 'event handling') ----- mouseDown: event | oldIndex oldVal row | event yellowButtonPressed ifTrue: [^ self yellowButtonActivity: event shiftPressed]. row := self rowAtLocation: event position. row = 0 ifTrue: [^super mouseDown: event]. model okToChange ifFalse: [^ self]. "No change if model is locked" "Set meaning for subsequent dragging of selection" dragOnOrOff := (self listSelectionAt: row) not. oldIndex := self getCurrentSelectionIndex. oldIndex ~= 0 ifTrue: [oldVal := self listSelectionAt: oldIndex]. "Set or clear new primary selection (listIndex)" dragOnOrOff + ifTrue: [self changeModelSelection: (self modelIndexFor: row)] - ifTrue: [self changeModelSelection: row] ifFalse: [self changeModelSelection: 0]. "Need to restore the old one, due to how model works, and set new one." oldIndex ~= 0 ifTrue: [self listSelectionAt: oldIndex put: oldVal]. self listSelectionAt: row put: dragOnOrOff. "event hand releaseMouseFocus: aMorph." "aMorph changed"! Item was changed: ----- Method: PluggableListMorphOfMany>>mouseMove: (in category 'event handling') ----- mouseMove: event "The mouse has moved, as characterized by the event provided. Adjust the scrollbar, and alter the selection as appropriate" | oldIndex oldVal row | event position y < self top ifTrue: [scrollBar scrollUp: 1. row := self rowAtLocation: scroller topLeft + (1 @ 1)] ifFalse: [row := event position y > self bottom ifTrue: [scrollBar scrollDown: 1. self rowAtLocation: scroller bottomLeft + (1 @ -1)] ifFalse: [ self rowAtLocation: event position]]. row = 0 ifTrue: [^super mouseDown: event]. model okToChange ifFalse: [^self]. "No change if model is locked" dragOnOrOff ifNil: ["Was not set at mouse down, which means the mouse must have gone down in an area where there was no list item" dragOnOrOff := (self listSelectionAt: row) not]. "Set meaning for subsequent dragging of selection" oldIndex := self getCurrentSelectionIndex. oldIndex ~= 0 ifTrue: [oldVal := self listSelectionAt: oldIndex]. "Set or clear new primary selection (listIndex)" dragOnOrOff + ifTrue: [self changeModelSelection: (self modelIndexFor: row)] - ifTrue: [self changeModelSelection: row] ifFalse: [self changeModelSelection: 0]. "Need to restore the old one, due to how model works, and set new one." oldIndex ~= 0 ifTrue: [self listSelectionAt: oldIndex put: oldVal]. self listSelectionAt: row put: dragOnOrOff. row changed!

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page: