Squeak-dev May 2015

squeak-dev@lists.squeakfoundation.org

50 participants
615 discussions

The Trunk: 46Deprecated-mt.2.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of 46Deprecated to project The Trunk: http://source.squeak.org/trunk/46Deprecated-mt.2.mcz ==================== Summary ==================== Name: 46Deprecated-mt.2 Author: mt Time: 3 May 2015, 2:43:14.241 pm UUID: a45140cf-2faa-8642-a1b8-2f81eaea8990 Ancestors: 46Deprecated-mt.1 Added a widget that was once used for showing message category lists. =============== Diff against 46Deprecated-mt.1 =============== Item was added: + SystemOrganization addCategory: #'46Deprecated-Morphic-Pluggable Widgets'! Item was added: + PluggableListMorph subclass: #PluggableMessageCategoryListMorph + instanceVariableNames: 'getRawListSelector priorRawList' + classVariableNames: '' + poolDictionaries: '' + category: '46Deprecated-Morphic-Pluggable Widgets'! + + !PluggableMessageCategoryListMorph commentStamp: '<historical>' prior: 0! + A variant of PluggableListMorph designed specially for efficient handling of the --all-- feature in message-list panes. In order to be able *quickly* to check whether there has been an external change to the list, we cache the raw list for identity comparison (the actual list is a combination of the --all-- element and the the actual list).! Item was added: + ----- Method: PluggableMessageCategoryListMorph class>>on:list:selected:changeSelected:menu:keystroke:getRawListSelector: (in category 'as yet unclassified') ----- + on: anObject list: getListSel selected: getSelectionSel changeSelected: setSelectionSel menu: getMenuSel keystroke: keyActionSel getRawListSelector: getRawSel + ^ self new on: anObject list: getListSel selected: getSelectionSel changeSelected: setSelectionSel menu: getMenuSel keystroke: keyActionSel getRawListSelector: getRawSel! Item was added: + ----- Method: PluggableMessageCategoryListMorph>>getList (in category 'model access') ----- + getList + "Differs from the generic in that here we obtain and cache the raw list, then cons it together with the special '-- all --' item to produce the list to be used in the browser. This special handling is done in order to avoid excessive and unnecessary reformulation of the list in the step method" + + getRawListSelector == nil ifTrue: ["should not happen!!" priorRawList := nil. ^ #()]. + model classListIndex = 0 ifTrue: [^ priorRawList := list := Array new]. + priorRawList := model perform: getRawListSelector. + list := (Array with: ClassOrganizer allCategory), priorRawList. + ^list! Item was added: + ----- Method: PluggableMessageCategoryListMorph>>on:list:selected:changeSelected:menu:keystroke:getRawListSelector: (in category 'as yet unclassified') ----- + on: anObject list: getListSel selected: getSelectionSel changeSelected: setSelectionSel menu: getMenuSel keystroke: keyActionSel getRawListSelector: getRawSel + self model: anObject. + getListSelector := getListSel. + getIndexSelector := getSelectionSel. + setIndexSelector := setSelectionSel. + getMenuSelector := getMenuSel. + keystrokeActionSelector := keyActionSel. + autoDeselect := true. + self borderWidth: 1. + getRawListSelector := getRawSel. + self updateList. + self selectionIndex: self getCurrentSelectionIndex. + self initForKeystrokes! Item was added: + ----- Method: PluggableMessageCategoryListMorph>>verifyContents (in category 'updating') ----- + verifyContents + | newList existingSelection anIndex newRawList | + (model editSelection == #editComment) ifTrue: [^ self]. + model classListIndex = 0 ifTrue: [^ self]. + newRawList := model perform: getRawListSelector. + newRawList == priorRawList ifTrue: [^ self]. "The usual case; very fast" + priorRawList := newRawList. + newList := (Array with: ClassOrganizer allCategory), priorRawList. + list = newList ifTrue: [^ self]. + existingSelection := self selection. + self updateList. + (anIndex := newList indexOf: existingSelection ifAbsent: [nil]) + ifNotNil: + [model noteSelectionIndex: anIndex for: getListSelector. + self selectionIndex: anIndex] + ifNil: + [self changeModelSelection: 0]!

1 0

The Trunk: Morphic-mt.964.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.964.mcz ==================== Summary ==================== Name: Morphic-mt.964 Author: mt Time: 3 May 2015, 2:41:32.279 pm UUID: 99fbd4f1-a84a-b344-90f2-9f28f14f5e4a Ancestors: Morphic-mt.963 Moved specialized list morph for message categories into deprecation. All browsers have regular lists morphs--even for message category lists. =============== Diff against Morphic-mt.963 =============== Item was removed: - PluggableListMorph subclass: #PluggableMessageCategoryListMorph - instanceVariableNames: 'getRawListSelector priorRawList' - classVariableNames: '' - poolDictionaries: '' - category: 'Morphic-Pluggable Widgets'! - - !PluggableMessageCategoryListMorph commentStamp: '<historical>' prior: 0! - A variant of PluggableListMorph designed specially for efficient handling of the --all-- feature in message-list panes. In order to be able *quickly* to check whether there has been an external change to the list, we cache the raw list for identity comparison (the actual list is a combination of the --all-- element and the the actual list).! Item was removed: - ----- Method: PluggableMessageCategoryListMorph class>>on:list:selected:changeSelected:menu:keystroke:getRawListSelector: (in category 'as yet unclassified') ----- - on: anObject list: getListSel selected: getSelectionSel changeSelected: setSelectionSel menu: getMenuSel keystroke: keyActionSel getRawListSelector: getRawSel - ^ self new on: anObject list: getListSel selected: getSelectionSel changeSelected: setSelectionSel menu: getMenuSel keystroke: keyActionSel getRawListSelector: getRawSel! Item was removed: - ----- Method: PluggableMessageCategoryListMorph>>getList (in category 'model access') ----- - getList - "Differs from the generic in that here we obtain and cache the raw list, then cons it together with the special '-- all --' item to produce the list to be used in the browser. This special handling is done in order to avoid excessive and unnecessary reformulation of the list in the step method" - - getRawListSelector == nil ifTrue: ["should not happen!!" priorRawList := nil. ^ #()]. - model classListIndex = 0 ifTrue: [^ priorRawList := list := Array new]. - priorRawList := model perform: getRawListSelector. - list := (Array with: ClassOrganizer allCategory), priorRawList. - ^list! Item was removed: - ----- Method: PluggableMessageCategoryListMorph>>on:list:selected:changeSelected:menu:keystroke:getRawListSelector: (in category 'as yet unclassified') ----- - on: anObject list: getListSel selected: getSelectionSel changeSelected: setSelectionSel menu: getMenuSel keystroke: keyActionSel getRawListSelector: getRawSel - self model: anObject. - getListSelector := getListSel. - getIndexSelector := getSelectionSel. - setIndexSelector := setSelectionSel. - getMenuSelector := getMenuSel. - keystrokeActionSelector := keyActionSel. - autoDeselect := true. - self borderWidth: 1. - getRawListSelector := getRawSel. - self updateList. - self selectionIndex: self getCurrentSelectionIndex. - self initForKeystrokes! Item was removed: - ----- Method: PluggableMessageCategoryListMorph>>verifyContents (in category 'updating') ----- - verifyContents - | newList existingSelection anIndex newRawList | - (model editSelection == #editComment) ifTrue: [^ self]. - model classListIndex = 0 ifTrue: [^ self]. - newRawList := model perform: getRawListSelector. - newRawList == priorRawList ifTrue: [^ self]. "The usual case; very fast" - priorRawList := newRawList. - newList := (Array with: ClassOrganizer allCategory), priorRawList. - list = newList ifTrue: [^ self]. - existingSelection := self selection. - self updateList. - (anIndex := newList indexOf: existingSelection ifAbsent: [nil]) - ifNotNil: - [model noteSelectionIndex: anIndex for: getListSelector. - self selectionIndex: anIndex] - ifNil: - [self changeModelSelection: 0]!

1 0

The Trunk: Collections-ul.628.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.628.mcz ==================== Summary ==================== Name: Collections-ul.628 Author: ul Time: 3 May 2015, 2:37:08.318 pm UUID: 45ec1e72-ea02-42fc-8dcb-10a1dfd22209 Ancestors: Collections-ul.627, Collections-ul.625 Merged Collections-ul.625. =============== Diff against Collections-ul.627 =============== Item was changed: ----- Method: Character>>asLowercase (in category 'converting') ----- asLowercase + "Answer the receiver's matching lowercase Character." + + value > 255 ifFalse: [ + | result | + (result := (ClassificationTable at: value + 1) bitAnd: 16rFF) > 0 + ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toLowercaseCode: value)! - "If the receiver is uppercase, answer its matching lowercase Character." - "A tentative implementation. Eventually this should consult the Unicode table." - - | v | - v := self charCode. - (((8r101 <= v and: [v <= 8r132]) or: [16rC0 <= v and: [v <= 16rD6]]) or: [16rD8 <= v and: [v <= 16rDE]]) - ifTrue: [^ Character value: v + 8r40]. - v < 256 ifTrue: [^self]. - ^self class value: ((value < 16r400000 - ifTrue: [Unicode] - ifFalse: [self encodedCharSet charsetClass]) - toLowercaseCode: v)! Item was changed: ----- Method: Character>>asUppercase (in category 'converting') ----- asUppercase + "Answer the receiver's matching uppercase Character." + + value > 255 ifFalse: [ + | result | + (result := ((ClassificationTable at: value + 1) bitShift: -8) bitAnd: 16rFF) > 0 + ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toUppercaseCode: value)! - "If the receiver is lowercase, answer its matching uppercase Character." - "A tentative implementation. Eventually this should consult the Unicode table." - - | v | - v := self charCode. - (((8r141 <= v and: [v <= 8r172]) or: [16rE0 <= v and: [v <= 16rF6]]) or: [16rF8 <= v and: [v <= 16rFE]]) - ifTrue: [^ Character value: v - 8r40]. - v < 256 ifTrue: [^self]. - ^self class value: ((value < 16r400000 - ifTrue: [Unicode] - ifFalse: [self encodedCharSet charsetClass]) - toUppercaseCode: v)! Item was changed: ----- Method: Character>>isAlphaNumeric (in category 'testing') ----- isAlphaNumeric "Answer whether the receiver is a letter or a digit." + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: AlphaNumericMask) > 0 ]. ^self encodedCharSet isAlphaNumeric: self! Item was changed: ----- Method: Character>>isDigit (in category 'testing') ----- isDigit + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: DigitBit) > 0 ]. ^self encodedCharSet isDigit: self. ! Item was changed: ----- Method: Character>>isLetter (in category 'testing') ----- isLetter + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: LetterMask) > 0 ]. + ^self encodedCharSet isLetter: self! - ^self encodedCharSet isLetter: self. - ! Item was changed: ----- Method: Character>>isLowercase (in category 'testing') ----- isLowercase + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: LowercaseBit) > 0 ]. ^self encodedCharSet isLowercase: self. ! Item was changed: ----- Method: Character>>isUppercase (in category 'testing') ----- isUppercase + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: UppercaseBit) > 0 ]. ^self encodedCharSet isUppercase: self. !

1 0

The Trunk: Collections-ul.627.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.627.mcz ==================== Summary ==================== Name: Collections-ul.627 Author: ul Time: 3 May 2015, 2:23:44.317 pm UUID: 6562bd09-b06e-436f-8771-a7cf2ecf6a25 Ancestors: Collections-mt.626, Collections-ul.624 Merged Collections-ul.624. Updated #initializeClassificationTable to save only the fully initialized table to the class variable. Reinitialize String in postscript to update the lower/uppercasing tables there too. =============== Diff against Collections-mt.626 =============== Item was changed: Magnitude subclass: #Character instanceVariableNames: 'value' + classVariableNames: 'AlphaNumericMask CharacterTable ClassificationTable DigitBit DigitValues LetterMask LowercaseBit UppercaseBit' - classVariableNames: 'CharacterTable ClassificationTable DigitValues LetterBits LowercaseBit UppercaseBit' poolDictionaries: '' category: 'Collections-Strings'! !Character commentStamp: 'ar 4/9/2005 22:35' prior: 0! I represent a character by storing its associated Unicode. The first 256 characters are created uniquely, so that all instances of latin1 characters ($R, for example) are identical. The code point is based on Unicode. Since Unicode is 21-bit wide character set, we have several bits available for other information. As the Unicode Standard states, a Unicode code point doesn't carry the language information. This is going to be a problem with the languages so called CJK (Chinese, Japanese, Korean. Or often CJKV including Vietnamese). Since the characters of those languages are unified and given the same code point, it is impossible to display a bare Unicode code point in an inspector or such tools. To utilize the extra available bits, we use them for identifying the languages. Since the old implementation uses the bits to identify the character encoding, the bits are sometimes called "encoding tag" or neutrally "leading char", but the bits rigidly denotes the concept of languages. The other languages can have the language tag if you like. This will help to break the large default font (font set) into separately loadable chunk of fonts. However, it is open to the each native speakers and writers to decide how to define the character equality, since the same Unicode code point may have different language tag thus simple #= comparison may return false. I represent a character by storing its associated ASCII code (extended to 256 codes). My instances are created uniquely, so that all instances of a character ($R, for example) are identical.! Item was changed: ----- Method: Character class>>initializeClassificationTable (in category 'class initialization') ----- initializeClassificationTable + "Initialize the classification table. + The classification table is a compact encoding of upper and lower cases and digits of characters with + - bits 0-7: The lower case value of this character or 0, if its greater than 255. + - bits 8-15: The upper case value of this character or 0, if its greater than 255. + - bit 16: lowercase bit (isLowercase == true) + - bit 17: uppercase bit (isUppercase == true) + - bit 18: digit bit (isDigit == true)" + " self initializeClassificationTable " - " - Initialize the classification table. The classification table is a - compact encoding of upper and lower cases of characters with + | encodedCharSet newClassificationTable | + "Base the table on the EncodedCharset of these characters' leadingChar - 0." + encodedCharSet := EncodedCharSet charsetAt: 0. - - bits 0-7: The lower case value of this character. - - bits 8-15: The upper case value of this character. - - bit 16: lowercase bit (e.g., isLowercase == true) - - bit 17: uppercase bit (e.g., isUppercase == true) - " - | ch1 | - LowercaseBit := 1 bitShift: 16. UppercaseBit := 1 bitShift: 17. + DigitBit := 1 bitShift: 18. + "Initialize the letter mask (e.g., isLetter == true)" + LetterMask := LowercaseBit bitOr: UppercaseBit. - "Initialize the letter bits (e.g., isLetter == true)" - LetterBits := LowercaseBit bitOr: UppercaseBit. + "Initialize the alphanumeric mask (e.g. isAlphaNumeric == true)" + AlphaNumericMask := LetterMask bitOr: DigitBit. - ClassificationTable := Array new: 256. - "Initialize the defaults (neither lower nor upper case)" - 0 to: 255 do:[:i| - ClassificationTable at: i+1 put: (i bitShift: 8) + i. - ]. + "Initialize the table based on encodedCharSet." + newClassificationTable := Array new: 256. + 0 to: 255 do: [ :code | + | isLowercase isUppercase isDigit lowercaseCode uppercaseCode value | + isLowercase := encodedCharSet isLowercaseCode: code. + isUppercase := encodedCharSet isUppercaseCode: code. + isDigit := encodedCharSet isDigitCode: code. + lowercaseCode := encodedCharSet toLowercaseCode: code. + lowercaseCode > 255 ifTrue: [ lowercaseCode := 0 ]. + uppercaseCode := encodedCharSet toUppercaseCode: code. + uppercaseCode > 255 ifTrue: [ uppercaseCode := 0 ]. + value := (uppercaseCode bitShift: 8) + lowercaseCode. + isLowercase ifTrue: [ value := value bitOr: LowercaseBit ]. + isUppercase ifTrue: [ value := value bitOr: UppercaseBit ]. + isDigit ifTrue: [ value := value bitOr: DigitBit ]. + newClassificationTable at: code + 1 put: value ]. + ClassificationTable := newClassificationTable! - "Initialize character pairs (upper-lower case)" - #( - "Basic roman" - ($A $a) ($B $b) ($C $c) ($D $d) - ($E $e) ($F $f) ($G $g) ($H $h) - ($I $i) ($J $j) ($K $k) ($L $l) - ($M $m) ($N $n) ($O $o) ($P $p) - ($Q $q) ($R $r) ($S $s) ($T $t) - ($U $u) ($V $v) ($W $w) ($X $x) - ($Y $y) ($Z $z) - "International" - ($Ä $ä) ($Å $å) ($Ç $ç) ($É $é) - ($Ñ $ñ) ($Ö $ö) ($Ü $ü) ($À $à) - ($Ã $ã) ($Õ $õ) ($ $) ($Æ $æ) - "International - Spanish" - ($Á $á) ($Í $í) ($Ó $ó) ($Ú $ú) - "International - PLEASE CHECK" - ($È $è) ($Ì $ì) ($Ò $ò) ($Ù $ù) - ($Ë $ë) ($Ï $ï) - ($Â $â) ($Ê $ê) ($Î $î) ($Ô $ô) ($Û $û) - ) do:[:pair| | ch2 | - ch1 := pair first asciiValue. - ch2 := pair last asciiValue. - ClassificationTable at: ch1+1 put: (ch1 bitShift: 8) + ch2 + UppercaseBit. - ClassificationTable at: ch2+1 put: (ch1 bitShift: 8) + ch2 + LowercaseBit. - ]. - - "Initialize a few others for which we only have lower case versions." - #($ß $Ø $ø $ÿ) do:[:char| - ch1 := char asciiValue. - ClassificationTable at: ch1+1 put: (ch1 bitShift: 8) + ch1 + LowercaseBit. - ]. - ! Item was changed: ----- Method: Character>>encodedCharSet (in category 'accessing') ----- encodedCharSet + + value < 16r400000 ifTrue: [ ^Unicode ]. "Shortcut" - ^EncodedCharSet charsetAt: self leadingChar ! Item was changed: ----- Method: Character>>tokenish (in category 'testing') ----- tokenish + "Answer whether the receiver is a valid token-character--letter, digit, or colon." - "Answer whether the receiver is a valid token-character--letter, digit, or - colon." + self == $_ ifTrue: [ ^Scanner prefAllowUnderscoreSelectors ]. + ^self == $: or: [ self isAlphaNumeric ]! - ^ self == $_ - ifTrue: [ Scanner prefAllowUnderscoreSelectors ] - ifFalse: [ self == $: or: [ self isLetter or: [ self isDigit ] ] ]! Item was changed: ----- Method: String>>withoutLineEndings (in category 'converting') ----- withoutLineEndings + ^self withLineEndings: ' '! - ^ self withSqueakLineEndings - copyReplaceAll: String cr - with: ' ' - asTokens: false! Item was changed: ----- Method: Symbol>>numArgs: (in category 'system primitives') ----- numArgs: n "Answer a string that can be used as a selector with n arguments. TODO: need to be extended to support shrinking and for selectors like #+ " + | numArgs offset |. + (numArgs := self numArgs) >= n ifTrue: [ ^self ]. + numArgs = 0 + ifTrue: [ offset := 1 ] + ifFalse: [ offset := 0 ]. + ^(String new: n - numArgs + offset * 5 + offset + self size streamContents: [ :stream | + stream nextPutAll: self. + numArgs = 0 ifTrue: [ stream nextPut: $:. ]. + numArgs + offset + 1 to: n do: [ :i | stream nextPutAll: 'with:' ] ]) asSymbol! - | numArgs aStream offs |. - (numArgs := self numArgs) >= n ifTrue: [^self]. - aStream := WriteStream on: (String new: 16). - aStream nextPutAll: self. - - (numArgs = 0) ifTrue: [aStream nextPutAll: ':'. offs := 0] ifFalse: [offs := 1]. - 2 to: n - numArgs + offs do: [:i | aStream nextPutAll: 'with:']. - ^aStream contents asSymbol! Item was changed: + (PackageInfo named: 'Collections') postscript: 'Character initializeClassificationTable. + String initialize'! - (PackageInfo named: 'Collections') postscript: 'LRUCache allInstances do: [ :each | each reset ]'!

1 0

Re: [squeak-dev] The Trunk: ST80-mt.184.mcz
by H. Hirzel 03 May '15

03 May '15

Thank you for working on this! Hannes Hirzel On Sun, 3 May 2015 09:29:54.509 0000, commits(a)source.squeak.org <commits(a)source.squeak.org> wrote: > Marcel Taeumel uploaded a new version of ST80 to project The Trunk: > http://source.squeak.org/trunk/ST80-mt.184.mcz > > ==================== Summary ==================== > > Name: ST80-mt.184 > Author: mt > Time: 3 May 2015, 11:29:52.063 am > UUID: 435ddd17-290f-9447-a3fd-bbf5b6d7af81 > Ancestors: ST80-mt.183 > > Added some missing stuff due to changes in Morphic land. > > =============== Diff against ST80-mt.183 =============== > > Item was changed: > ----- Method: PluggableTextController>>accept (in category 'as yet > unclassified') ----- > accept > view hasUnacceptedEdits ifFalse: [^ view flash]. > view hasEditingConflicts ifTrue: > [(self confirm: > 'Caution!! This method may have been > changed elsewhere since you started > editing it here. Accept anyway?' translated) ifFalse: [^ self flash]]. > > + (view setText: paragraph text from: self) == true ifTrue: > - (view setText: paragraph text from: self) ifTrue: > [initialText := paragraph text copy. > view ifNotNil: [view hasUnacceptedEdits: false]] . > ! > > Item was changed: > ----- Method: PluggableTextView>>update: (in category 'updating') ----- > update: aSymbol > "Refer to the comment in View|update:. Do nothing if the given symbol > does not match any action. " > > aSymbol == #wantToChange ifTrue: > [self canDiscardEdits ifFalse: [self promptForCancel]. ^ self]. > aSymbol == #flash ifTrue: [^ controller flash]. > aSymbol == getTextSelector ifTrue: [^ self updateDisplayContents]. > aSymbol == getSelectionSelector ifTrue: [^ self setSelection: self > getSelection]. > aSymbol == #clearUserEdits ifTrue: [^ self hasUnacceptedEdits: false]. > (aSymbol == #autoSelect and: [getSelectionSelector ~~ nil]) ifTrue: > [ParagraphEditor abandonChangeText. "no replacement!!" > ^ controller setSearch: model autoSelectString; > againOrSame: true]. > aSymbol == #appendEntry ifTrue: > [^ controller doOccluded: [controller appendEntry]]. > aSymbol == #clearText ifTrue: > [^ controller doOccluded: > [controller changeText: Text new]]. > aSymbol == #bs ifTrue: > [^ controller doOccluded: > [controller bsText]]. > aSymbol == #codeChangedElsewhere ifTrue: > [^ self hasEditingConflicts: true]. > aSymbol == #saveContents ifTrue: > [^self controller saveContentsInFile]. > aSymbol == #close ifTrue: > + [^self topView controller closeAndUnscheduleNoTerminate]. > + aSymbol == #acceptChanges ifTrue: > + [^ self controller accept]. > + aSymbol == #revertChanges ifTrue: > + [^ self controller cancel].! > - [^self topView controller closeAndUnscheduleNoTerminate] > - > - ! > > Item was added: > + ----- Method: View>>balloonText: (in category 'morphic compatibility') > ----- > + balloonText: aString > + "Unfortunately we just ignore this help text because we are not morphic" > + ! > > Item was changed: > ----- Method: View>>setBalloonText: (in category 'morphic compatibility') > ----- > setBalloonText: aString > - "Unfortunately we just ignore this help text because we are not morphic" > > self flag: #deprecated. "mt: Use #balloonText: or just remove."! > > >

1 0

The Trunk: Tools-mt.617.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.617.mcz ==================== Summary ==================== Name: Tools-mt.617 Author: mt Time: 3 May 2015, 12:08:33.481 pm UUID: 550a7de0-db51-154d-873a-d2569c50c8a6 Ancestors: Tools-mt.616 "Message Names" tool refactored. =============== Diff against Tools-mt.616 =============== Item was changed: MessageSet subclass: #MessageNames + instanceVariableNames: 'searchString selectorList selectorListIndex' - instanceVariableNames: 'searchString selectorList selectorListIndex searchPane' classVariableNames: '' poolDictionaries: '' category: 'Tools-Browser'! Item was changed: ----- Method: MessageNames>>buildSearchPaneWith: (in category 'toolbuilder') ----- buildSearchPaneWith: builder + + | panelSpec textSpec buttonSpec | + panelSpec := builder pluggablePanelSpec new + layout: #horizontal; + children: OrderedCollection new; + yourself. + - | textSpec | textSpec := builder pluggableInputFieldSpec new. textSpec + model: searchString; + help: 'Type here, then hit Search.' translated; + getText: #contents; + setText: #contents:. + panelSpec children add: textSpec. + + buttonSpec := builder pluggableActionButtonSpec new. + buttonSpec model: self; + label: 'Search'; + action: #doSearch; + horizontalResizing: #shrinkWrap. + panelSpec children add: buttonSpec. + + ^ panelSpec! - name: #search; - getText: #searchString; - setText: #searchString:notifying:. - ^textSpec! Item was changed: ----- Method: MessageNames>>buildWith: (in category 'toolbuilder') ----- buildWith: builder "ToolBuilder open: MessageNames new" + + | windowSpec max searchHeight | - | windowSpec max buttonSpec result | max := self wantsOptionalButtons ifTrue:[0.42] ifFalse:[0.5]. + searchHeight := Preferences standardDefaultTextFont height * 2. + windowSpec := self buildWindowWith: builder specs: { + (self topConstantHeightFrame: searchHeight fromLeft: 0 width: 0.5) -> [self buildSearchPaneWith: builder]. + (self frameOffsetFromTop: searchHeight fromLeft: 0 width: 0.5 bottomFraction: max) -> [self buildSelectorListWith: builder]. - (0.15@0 corner: 0.5(a)0.08) -> [self buildSearchPaneWith: builder]. - (0(a)0.08 corner: 0.5@max) -> [self buildSelectorListWith: builder]. (0.5(a)0.0 corner: 1.0@max) -> [self buildMessageListWith: builder]. (0@max corner: 1@1) -> [self buildCodePaneWith: builder]. }. + ^ builder build: windowSpec! - buttonSpec := builder pluggableActionButtonSpec new. - buttonSpec - model: self; - label: 'Search'; - action: [self doSearchFrom: searchPane]; - frame: (0.0@0 corner: 0.15(a)0.08). - windowSpec children add: buttonSpec. - - result := builder build: windowSpec. - searchPane := builder widgetAt: #search. - ^result! Item was added: + ----- Method: MessageNames>>computeMessageList (in category 'search') ----- + computeMessageList + + ^ selectorListIndex = 0 + ifTrue: [#()] + ifFalse: [self systemNavigation + allImplementorsOf: (selectorList at: selectorListIndex)]! Item was added: + ----- Method: MessageNames>>computeSelectorListFrom: (in category 'search') ----- + computeSelectorListFrom: searchString + "Compute selector list from search string. The searchString is a list of expressions separated by ;. Each expression is matched individually. An expression can be a simple string (same as *expression*), a string with double quotes (exact match) or a match expression (see String >> #match:)." + + ^ (Array streamContents: [ :stream | + (searchString findBetweenSubStrs: ';') do: [ :selPat | + (selPat first = $" and: [ selPat last = $" and: [ selPat size > 2 ] ]) + ifTrue: [ + Symbol + hasInterned: (selPat copyFrom: 2 to: selPat size - 1) + ifTrue: [ :sym | stream nextPut: sym ] ] + ifFalse: [ + | raw n m | + n := selPat occurrencesOf: $*. + m := selPat occurrencesOf: $#. + raw := ((n > 0 or: [ m > 0 ]) and: [ selPat size > (n + m) ]) + ifTrue: [ Symbol selectorsMatching: selPat ] + ifFalse: [ Symbol selectorsContaining: selPat ]. + stream nextPutAll: raw ] ] ]) + sort: [ :x :y | x caseInsensitiveLessOrEqual: y ]! Item was removed: - ----- Method: MessageNames>>computeSelectorListFromSearchString (in category 'search') ----- - computeSelectorListFromSearchString - "Compute selector list from search string. The searchString is a list of expressions separated by ;. Each expression is matched individually. An expression can be a simple string (same as *expression*), a string with double quotes (exact match) or a match expression (see String >> #match:)." - - searchString := searchString asString copyWithout: $ . "?dubious?" - ^selectorList := Cursor wait showWhile: [ - (Array streamContents: [ :stream | - (searchString findBetweenSubStrs: ';') do: [ :selPat | - (selPat first = $" and: [ selPat last = $" and: [ selPat size > 2 ] ]) - ifTrue: [ - Symbol - hasInterned: (selPat copyFrom: 2 to: selPat size - 1) - ifTrue: [ :sym | stream nextPut: sym ] ] - ifFalse: [ - | raw n m | - n := selPat occurrencesOf: $*. - m := selPat occurrencesOf: $#. - raw := ((n > 0 or: [ m > 0 ]) and: [ selPat size > (n + m) ]) - ifTrue: [ Symbol selectorsMatching: selPat ] - ifFalse: [ Symbol selectorsContaining: selPat ]. - stream nextPutAll: raw ] ] ]) - sort: [ :x :y | x caseInsensitiveLessOrEqual: y ] ]! Item was removed: - ----- Method: MessageNames>>defaultBrowserTitle (in category 'initialization') ----- - defaultBrowserTitle - ^ 'Message Names'! Item was added: + ----- Method: MessageNames>>doSearch (in category 'search') ----- + doSearch + "The user hit the Search button -- treat it as a synonym for the user having hit the Return or Enter (or cmd-s) in the type-in pane" + + searchString changed: #acceptChanges.! Item was added: + ----- Method: MessageNames>>doSearch: (in category 'search') ----- + doSearch: aSearchString + + | normalizedSearchString | + normalizedSearchString := aSearchString asString copyWithout: Character space. + + Cursor wait showWhile: [ + self selectorList: (self computeSelectorListFrom: normalizedSearchString)]. + + ^ true! Item was removed: - ----- Method: MessageNames>>doSearchFrom: (in category 'search') ----- - doSearchFrom: aPane - "The user hit the Search button -- treat it as a synonym for the user having hit the Return or Enter (or cmd-s) in the type-in pane" - - aPane accept. - aPane selectAll! Item was added: + ----- Method: MessageNames>>frameOffsetFromTop:fromLeft:width:bottomFraction: (in category 'toolbuilder') ----- + frameOffsetFromTop: height fromLeft: leftFraction width: rightFraction bottomFraction: bottomFraction + ^LayoutFrame new + topFraction: 0 offset: height; + leftFraction: leftFraction offset: 0; + rightFraction: (leftFraction + rightFraction) offset: 0; + bottomFraction: bottomFraction offset: 0; + yourself.! Item was added: + ----- Method: MessageNames>>initialize (in category 'initialization') ----- + initialize + + super initialize. + + searchString := ValueHolder new contents: ''. + searchString addDependent: self. + + selectorList := #(). + selectorListIndex := 0.! Item was added: + ----- Method: MessageNames>>labelString (in category 'initialization') ----- + labelString + + ^ self searchString + ifEmpty: ['Message Names'] + ifNotEmpty: [:s | 'Message names containing "', s asString asLowercase, '"']! Item was removed: - ----- Method: MessageNames>>messageList (in category 'selector list') ----- - messageList - "Answer the receiver's message list, computing it if necessary. The way - to force a recomputation is to set the messageList to nil" - messageList - ifNil: [messageList := selectorListIndex = 0 - ifTrue: [#()] - ifFalse: [self systemNavigation - allImplementorsOf: (selectorList at: selectorListIndex)]. - self - messageListIndex: (messageList size > 0 - ifTrue: [1] - ifFalse: [0])]. - ^ messageList! Item was added: + ----- Method: MessageNames>>messageList: (in category 'message list') ----- + messageList: someObjects + + messageList := someObjects. + self changed: #messageList. + + self messageListIndex: (messageList size > 0 + ifTrue: [1] + ifFalse: [0]).! Item was changed: ----- Method: MessageNames>>searchString (in category 'search') ----- searchString - "Answer the current searchString, initializing it if need be" + ^ searchString contents! - | pane | - searchString isEmptyOrNil ifTrue: - [searchString := 'type here, then hit Search'. - pane := self containingWindow findDeepSubmorphThat: - [:m | m knownName = 'Search'] ifAbsent: ["this happens during window creation" ^ searchString]. - pane setText: searchString. - pane setTextMorphToSelectAllOnMouseEnter. - pane selectAll]. - ^ searchString! Item was changed: ----- Method: MessageNames>>searchString: (in category 'search') ----- searchString: aString + + searchString contents: aString.! - "Set the current searchString" - self searchString: aString notifying: nil! Item was removed: - ----- Method: MessageNames>>searchString:notifying: (in category 'search') ----- - searchString: aString notifying: aController - "Take what the user typed and find all selectors containing it" - - searchString := aString asString copyWithout: $ . - self containingWindow ifNotNil:[:w| w setLabel: 'Message names containing "', searchString asLowercase, '"']. - selectorList := nil. - self changed: #selectorList. - self changed: #messageList. - ^ true! Item was changed: + ----- Method: MessageNames>>selectedMessageName (in category 'message list') ----- - ----- Method: MessageNames>>selectedMessageName (in category 'selection') ----- selectedMessageName selectorList basicSize = 0 ifTrue: [^ nil]. "Deals with selectorList nil or empty" ^selectorList at: (selectorListIndex max: 1) ifAbsent: [nil] "If no selection we can still find a selector"! Item was changed: ----- Method: MessageNames>>selectorList (in category 'selector list') ----- selectorList - "Answer the selectorList" - selectorList ifNil: - [self computeSelectorListFromSearchString. - selectorListIndex := selectorList size > 0 - ifTrue: [1] - ifFalse: [0]. - messageList := nil]. ^ selectorList! Item was added: + ----- Method: MessageNames>>selectorList: (in category 'selector list') ----- + selectorList: someObjects + "Answer the selectorList" + + selectorList := someObjects. + self changed: #selectorList. + + "Select first result if any." + self selectorListIndex: (selectorList size > 0 + ifTrue: [1] + ifFalse: [0]).! Item was changed: ----- Method: MessageNames>>selectorListIndex: (in category 'selector list') ----- selectorListIndex: anInteger "Set the selectorListIndex as specified, and propagate consequences" selectorListIndex := anInteger. - selectorListIndex = 0 - ifTrue: [^ self]. - messageList := nil. self changed: #selectorListIndex. + + messageList := self computeMessageList. + self changed: #messageList.! - self changed: #messageList! Item was changed: + ----- Method: MessageNames>>selectorListKey:from: (in category 'selector list') ----- - ----- Method: MessageNames>>selectorListKey:from: (in category 'initialization') ----- selectorListKey: aChar from: view "Respond to a Command key in the message-list pane." aChar == $n ifTrue: [^ self browseSenders]. aChar == $c ifTrue: [^ self copyName]. aChar == $b ifTrue: [^ self browseMethodFull]. ! Item was changed: ----- Method: MessageNames>>showOnlyImplementedSelectors (in category 'search') ----- showOnlyImplementedSelectors "Caution -- can be slow!! Filter my selector list down such that it only shows selectors that are actually implemented somewhere in the system." + self okToChange ifFalse: [^ self]. + + Cursor wait showWhile: [ + self selectorList: (self systemNavigation allSelectorsWithAnyImplementorsIn: selectorList)].! - self okToChange - ifTrue: [Cursor wait - showWhile: [selectorList := self systemNavigation allSelectorsWithAnyImplementorsIn: selectorList. - self changed: #selectorList. - self changed: #messageList]]! Item was changed: + ----- Method: MessageNames>>topConstantHeightFrame:fromLeft:width: (in category 'toolbuilder') ----- - ----- Method: MessageNames>>topConstantHeightFrame:fromLeft:width: (in category 'as yet unclassified') ----- topConstantHeightFrame: height fromLeft: leftFraction width: rightFraction ^LayoutFrame new topFraction: 0 offset: 0; leftFraction: leftFraction offset: 0; rightFraction: (leftFraction + rightFraction) offset: 0; bottomFraction: 0 offset: height; yourself.! Item was added: + ----- Method: MessageNames>>update: (in category 'updating') ----- + update: aspect + + aspect == #contents + ifTrue: [ + self changed: #labelString. + self doSearch: self searchString]. + + super update: aspect.!

1 0

The Trunk: Morphic-mt.963.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.963.mcz ==================== Summary ==================== Name: Morphic-mt.963 Author: mt Time: 3 May 2015, 12:06:00.724 pm UUID: 094b8452-a15c-6c44-9078-fb9c3b23a44f Ancestors: Morphic-mt.962 Removed hard-coded extent of 16@16 for non-shrinkwrapped buttons when calculating the minimum extent. =============== Diff against Morphic-mt.962 =============== Item was changed: ----- Method: PluggableButtonMorph>>updateMinimumExtent (in category 'layout') ----- updateMinimumExtent | hMin vMin | self label isMorph ifTrue: [^ self minimumExtent: self label minExtent]. + hMin := vMin := 0. - hMin := vMin := 16. self hResizing == #shrinkWrap ifTrue: [hMin := (self font widthOfString: self label) max: self labelShrinkThreshold]. self vResizing == #shrinkWrap ifTrue: [vMin := self font height]. hMin := hMin + (2* self borderStyle width). vMin := vMin + (2* self borderStyle width). self layoutInset isRectangle ifTrue: [ hMin := hMin + self layoutInset left + self layoutInset right. vMin := vMin + self layoutInset top + self layoutInset bottom] ifFalse: [self layoutInset isPoint ifTrue: [ hMin := hMin + (2* self layoutInset x). vMin := vMin + (2* self layoutInset y)] ifFalse: [ hMin := hMin + (2* self layoutInset). vMin := vMin + (2* self layoutInset)]]. self minimumExtent: hMin @ vMin. "Since we have no submorphs, we have to resize here if we want to shrink wrap." self hResizing == #shrinkWrap ifTrue: [self width: hMin]. self vResizing == #shrinkWrap ifTrue: [self height: vMin].!

1 0

The Trunk: ST80-mt.184.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-mt.184.mcz ==================== Summary ==================== Name: ST80-mt.184 Author: mt Time: 3 May 2015, 11:29:52.063 am UUID: 435ddd17-290f-9447-a3fd-bbf5b6d7af81 Ancestors: ST80-mt.183 Added some missing stuff due to changes in Morphic land. =============== Diff against ST80-mt.183 =============== Item was changed: ----- Method: PluggableTextController>>accept (in category 'as yet unclassified') ----- accept view hasUnacceptedEdits ifFalse: [^ view flash]. view hasEditingConflicts ifTrue: [(self confirm: 'Caution!! This method may have been changed elsewhere since you started editing it here. Accept anyway?' translated) ifFalse: [^ self flash]]. + (view setText: paragraph text from: self) == true ifTrue: - (view setText: paragraph text from: self) ifTrue: [initialText := paragraph text copy. view ifNotNil: [view hasUnacceptedEdits: false]] . ! Item was changed: ----- Method: PluggableTextView>>update: (in category 'updating') ----- update: aSymbol "Refer to the comment in View|update:. Do nothing if the given symbol does not match any action. " aSymbol == #wantToChange ifTrue: [self canDiscardEdits ifFalse: [self promptForCancel]. ^ self]. aSymbol == #flash ifTrue: [^ controller flash]. aSymbol == getTextSelector ifTrue: [^ self updateDisplayContents]. aSymbol == getSelectionSelector ifTrue: [^ self setSelection: self getSelection]. aSymbol == #clearUserEdits ifTrue: [^ self hasUnacceptedEdits: false]. (aSymbol == #autoSelect and: [getSelectionSelector ~~ nil]) ifTrue: [ParagraphEditor abandonChangeText. "no replacement!!" ^ controller setSearch: model autoSelectString; againOrSame: true]. aSymbol == #appendEntry ifTrue: [^ controller doOccluded: [controller appendEntry]]. aSymbol == #clearText ifTrue: [^ controller doOccluded: [controller changeText: Text new]]. aSymbol == #bs ifTrue: [^ controller doOccluded: [controller bsText]]. aSymbol == #codeChangedElsewhere ifTrue: [^ self hasEditingConflicts: true]. aSymbol == #saveContents ifTrue: [^self controller saveContentsInFile]. aSymbol == #close ifTrue: + [^self topView controller closeAndUnscheduleNoTerminate]. + aSymbol == #acceptChanges ifTrue: + [^ self controller accept]. + aSymbol == #revertChanges ifTrue: + [^ self controller cancel].! - [^self topView controller closeAndUnscheduleNoTerminate] - - ! Item was added: + ----- Method: View>>balloonText: (in category 'morphic compatibility') ----- + balloonText: aString + "Unfortunately we just ignore this help text because we are not morphic" + ! Item was changed: ----- Method: View>>setBalloonText: (in category 'morphic compatibility') ----- setBalloonText: aString - "Unfortunately we just ignore this help text because we are not morphic" self flag: #deprecated. "mt: Use #balloonText: or just remove."!

1 0

The Trunk: Morphic-mt.962.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.962.mcz ==================== Summary ==================== Name: Morphic-mt.962 Author: mt Time: 3 May 2015, 10:56:28.091 am UUID: 7e9a02a2-169b-9d44-8450-3e0074dead2c Ancestors: Morphic-mt.961 Never share the text instance between text morph and model. Change handling can break otherwise if that text instance will be referenced in the model. =============== Diff against Morphic-mt.961 =============== Item was changed: ----- Method: PluggableTextMorph>>acceptTextInModel (in category 'menu commands') ----- acceptTextInModel "Inform the model that the receiver's textMorph's text should be accepted. Answer true if the model accepted ok, false otherwise" | textToAccept | + textToAccept := textMorph contents copy. - textToAccept := textMorph asText. ^setTextSelector isNil or: [setTextSelector numArgs = 2 ifTrue: [model perform: setTextSelector with: textToAccept with: self] ifFalse: [model perform: setTextSelector with: textToAccept]] !

1 0

The Trunk: Morphic-mt.961.mcz
by commits＠source.squeak.org 03 May '15

03 May '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.961.mcz ==================== Summary ==================== Name: Morphic-mt.961 Author: mt Time: 3 May 2015, 10:37:41.57 am UUID: 9d90662f-0ca8-be4f-955b-15ceef53104b Ancestors: Morphic-mt.960 Fixed shrinkWrap-bug in buttons. =============== Diff against Morphic-mt.960 =============== Item was changed: ----- Method: PluggableButtonMorph>>updateMinimumExtent (in category 'layout') ----- updateMinimumExtent | hMin vMin | self label isMorph ifTrue: [^ self minimumExtent: self label minExtent]. hMin := vMin := 16. self hResizing == #shrinkWrap ifTrue: [hMin := (self font widthOfString: self label) max: self labelShrinkThreshold]. self vResizing == #shrinkWrap ifTrue: [vMin := self font height]. + + hMin := hMin + (2* self borderStyle width). + vMin := vMin + (2* self borderStyle width). self layoutInset isRectangle ifTrue: [ hMin := hMin + self layoutInset left + self layoutInset right. vMin := vMin + self layoutInset top + self layoutInset bottom] ifFalse: [self layoutInset isPoint ifTrue: [ hMin := hMin + (2* self layoutInset x). vMin := vMin + (2* self layoutInset y)] ifFalse: [ hMin := hMin + (2* self layoutInset). vMin := vMin + (2* self layoutInset)]]. + self minimumExtent: hMin @ vMin. + + "Since we have no submorphs, we have to resize here if we want to shrink wrap." + self hResizing == #shrinkWrap ifTrue: [self width: hMin]. + self vResizing == #shrinkWrap ifTrue: [self height: vMin].! - self minimumExtent: hMin @ vMin!

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
62
Older →

Jump to page: