hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:dc5e958a20dc
+:cf319f2e56d0
 'Hide toolbar. Show again via the "View"-Menu'
 #hideBookmarkBar
 'Hide the bookmark-bar. Show again via the "View"-menu'
+#infoLabelHelp
+'Display info on the just selected method, the clicked on code-fragment or the current activity'
 #redoOperation
 'Redo undone operation'
 #undoOperation
 'Undo operation'
 ).
 (RefactoryChangeManager notNil and:[ RefactoryChangeManager isLoaded ]) ifTrue:[
 manager := RefactoryChangeManager instance.
 name: 'InfoLabel'
 level: -1
 translateLabel: true
 labelChannel: infoLabelHolder
 adjust: left
+activeHelpKey: infoLabelHelp
 )
 (HorizontalPanelViewSpec
 name: 'PackageInfoPanel'
 level: -1
 horizontalLayout: rightSpaceFit
 verticalLayout: fitSpace
 horizontalSpace: 0
 verticalSpace: 0
 elementsChangeSize: true
+activeHelpKey: packageInfoLabel
 component:
 (SpecCollection
 collection: (
 (LabelSpec
 label: 'Package'
 label: 'Sort by Name'
 hideMenuOnActivated: false
 indication: sortVariablesByName
 )
 (MenuItem
+label: 'Group by Inheritance'
+hideMenuOnActivated: false
+indication: groupVariablesByInheritance
+)
+(MenuItem
 label: '-'
 )
 (MenuItem
 enabled: hasClassSelectedHolder
 label: 'Generate'
 |cls|
 cls := Smalltalk classNamed:nm.
 cls isNil ifTrue:[
 "/ class no longer exists (removed?)
-nm colorizeAllWith:(Color gray)
+nm withColor:(Color gray)
 ] ifFalse:[
 cls isJavaClass ifTrue:[
 cls javaName
 ] ifFalse:[
 genShortNameListEntry value:(Smalltalk classNamed:nm)
 selectedMethods4
 ^ self navigationState selectedMethodsArrayAt:4
 !
 selectedMethodsClasses
-^ (self selectedMethodsValue collect:[:m | m mclass] as:Set)
+^ (self selectedMethodsValue
+collect:[:m | m mclass] as:Set)
 select:[:each| each notNil]
 "Created: / 07-08-2006 / 12:13:37 / cg"
 !
 selectorListGenerator
 ^ self navigationState selectorListGenerator
 !
 selectorListGenerator1
+"used for the sender-/implementor-chain's first methodlist"
 ^ self navigationState selectorListGeneratorArrayAt:1
 !
 selectorListGenerator2
+"used for the sender-/implementor-chain's second methodlist"
 ^ self navigationState selectorListGeneratorArrayAt:2
 !
 selectorListGenerator3
+"used for the sender-/implementor-chain's third methodlist"
 ^ self navigationState selectorListGeneratorArrayAt:3
 !
 selectorListGenerator4
+"used for the sender-/implementor-chain's fourth methodlist"
 ^ self navigationState selectorListGeneratorArrayAt:4
 !
 selectorListGenerator5
+"Used for all method's generator of ClassList. "
-"Used for all methods generator of ClassList. "
 ^ self navigationState selectorListGeneratorArrayAt:5
 "Created: / 07-08-2011 / 19:06:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 classListApp unloadedClassesColor:clr.
 "/ classListApp updateList.
 classListApp invalidateList.
 "Modified: / 31.10.2001 / 11:14:50 / cg"
+!
+groupVariablesByInheritance
+^ builder valueAspectFor:#groupVariablesByInheritance initialValue:true
 !
 hidePrivateClasses
 ^ self navigationState hidePrivateClasses
 flyByHelpSpec
 |changeSet spec|
 spec := super flyByHelpSpec.
 changeSet := ChangeSet current.
+"/ (changeSet contains:[:chg | chg isMethodChange and:[chg changeClass notNil]]) ifTrue:[
 (changeSet findLast:[:chg | chg isMethodChange and:[chg changeClass notNil]]) ~~ 0 ifTrue:[
 spec at:#recentChanges put:(spec at:#recentlyChangedMethods).
 ] ifFalse:[
 "/        (changeSet contains:[:chg | chg isClassChange and:[chg changeClass notNil]]) ifTrue:[
 "/            spec at:#recentChanges put:(spec at:#recentlyChangedClasses).
 ^ spec.
 "Modified: / 08-09-2011 / 05:05:06 / cg"
 !
-flyByHelpTextFor:aComponent
+flyByHelpTextFor:aWidget at:aPoint
-"/    (aComponent == builder componentAt:) ifTrue:[
+|action info label|
-"/    ].
-^ super flyByHelpTextFor:aComponent
+aWidget = (navigationState canvas builder componentAt:'InfoLabel') ifTrue:[
+action := aWidget actionAt:aPoint.
+Transcript showCR:action.
+info := action perform:#info ifNotUnderstood:nil.
+info notNil ifTrue:[
+^ info value
+].
+(label := aWidget label) notNil ifTrue:[
+(label widthOn:aWidget) > aWidget width ifTrue:[
+^ label
+]
+]
+].
+^ nil
 ! !
 !NewSystemBrowser methodsFor:'history'!
 addToFindHistory:class selector:selector
 ]
 ].
 ].
 iconifiedOrNot := ''.
 topView isCollapsed ifTrue:[
-iconifiedOrNot := ' iconified' colorizeAllWith:Color blue.
+iconifiedOrNot := ' iconified' withColor:Color blue.
 ].
 busyOrNot notEmptyOrNil ifTrue:[
-busyOrNot := busyOrNot allBold colorizeAllWith:Color red
+busyOrNot := busyOrNot allBold withColor:Color red
 ].
 winLabel := '  ("' , topLabel , '"',busyOrNot,iconifiedOrNot, ')'
 ].
 ] ifFalse:[
 (aProcess isDebugged) ifTrue:[
-winLabel := ' (debug)' allBold colorizeAllWith:Color red
+winLabel := ' (debug)' allBold withColor:Color red
 ].
 ].
 aProcess id printString , ' [' , pName , ']' , winLabel
 ].
 selectorMenuBrowseRepositoryVersionsUsingManager: manager
 |method mclass mselector className mgr revisions previousMethods browser
 lastSource currentSource lastRevision lastDate lastChange lastAuthor thisIsAnExtensionMethod
-packageId directory module|
+packageId directory module currentVersion newestVersion|
 method := self theSingleSelectedMethod.
 method isNil ifTrue:[^ self].
 mclass := method mclass.
 set := ChangeSet forExistingMethods:(Array with:method).
 set := set select:[:c | c isMethodChange].
 lastChange := set first.
 ] value.
+currentVersion := mclass revisionOfManager:manager.
 thisIsAnExtensionMethod := (method isExtension).
 thisIsAnExtensionMethod ifTrue:[
 packageId := method package asPackageId.
 mgr := manager
 ] ifFalse:[
 ].
 directory := packageId directory.
 module := packageId module.
 self withWaitCursorDo:[
-|revisionLog start stop answer t tS list msg first|
+|revisionLog numRevisions stop answer t tS list msg first|
 thisIsAnExtensionMethod ifTrue:[
 revisionLog := mgr
 revisionLogOf:nil
 fromRevision:nil
 ] ifFalse:[
 revisionLog := mgr revisionLogOf:mclass.
 ].
 revisions := revisionLog at:#revisions.
-start := 1.
+stop := numRevisions := revisions size.
-stop := revisions size.
 stop > 20 ifTrue:[
 thisIsAnExtensionMethod ifTrue:[
 t := 500.   "/ fake time
 ] ifFalse:[
 "/ measure the time it takes to checkout a version...
 revSourceStream := mgr getSourceStreamFor:mclass revision:((revisions at:10) at:#revision).
 ChangeSet fromStream:revSourceStream.
 revSourceStream close.
 ].
 ].
+newestVersion := revisions first at:#revision.
 list := revisions collect:[:entry |
 |rev author dateString date msg|
 rev := entry at:#revision.
 entry at:#date put:dateString.
 msg := ((entry at:#logMessage) asStringCollection firstIfEmpty:'') asString.
 rev,' ',author,' ',dateString,' ',msg
 ].
 msg := 'There are %1 revisions to extract from the repository'.
-t := (t * revisions size / 1000) rounded.
+t := (t * numRevisions / 1000) rounded.
 t < 10 ifTrue:[
 msg := msg,'\(this will take a few seconds).'.
 tS := t.
 ] ifFalse:[
-t := t * revisions size // 1000 // 10 * 10.
+t := t * numRevisions // 1000 // 10 * 10.
 tS := (TimeDuration fromSeconds:t) printStringForApproximation.
 msg := msg,'\(this will take roughly %2).'
 ].
 msg := msg,'\\Do you want to see all or only some of the revisions ?'.
 answer := Dialog
-choose:(resources stringWithCRs:msg
+choose:(resources stringWithCRs:msg with:numRevisions with:tS)
-with:revisions size
-with:tS)
 fromList:list values:revisions initialSelection:nil
 buttons:nil
 values:nil
 default:nil
 lines:20
 cancel:[^ self]
 multiple:false
 title:(resources string:'Confirmation')
-postBuildBlock:[:dialog |
+postBuildBlock:
-|b|
+[:dialog |
+|b|
-b := Button label:(resources string:'Browse Newer than Selected').
-b action:[ stop := (dialog componentAt:#ListView) selection. dialog okPressed].
+b := Button label:(resources string:'Browse Newer than Selected').
-b := dialog addButton:b before:dialog okButton.
+b action:[ stop := (dialog componentAt:#ListView) selection. dialog okPressed].
+b := dialog addButton:b before:dialog okButton.
-dialog okButton label:(resources string:'Browse All').
-dialog okButton action:[ stop := revisions size. dialog okPressed].
+dialog okButton label:(resources string:'Browse All').
-].
+dialog okButton action:[ stop := revisions size. dialog okPressed].
+].
 stop isNil ifTrue:[^ self ].
 ].
 t := Time millisecondsToRun:[
 previousMethods := ChangeSet new.
-lastSource := currentSource := method source.
+currentSource := method source.
+currentVersion = newestVersion ifTrue:[
+lastSource := currentSource.
+].
 lastRevision := lastDate := lastAuthor := nil.
 first := true.
+self halt.
-revisions from:start to:stop do:[:eachLogEntry |
+"/ revisions at:1 is now the newest (may be newer than current!!)
+revisions from:1 to:stop do:[:eachLogEntry |
 |revision date author revSourceStream|
 revision := eachLogEntry at:#revision.
 date := eachLogEntry at:#date.
 author := eachLogEntry at:#author ifAbsent:'?'.
 [
 |chg nChg classChangeSet changeSource changeName|
-self activityNotification:('Fetching revision ',revision,'...').
+self activityNotification:(resources string:'Fetching revision %1...' with:revision).
 thisIsAnExtensionMethod ifTrue:[
 revSourceStream := mgr
 streamForClass:nil
 fileName:'extensions.st'
 revision:revision
 cache:true.
 ] ifFalse:[
 revSourceStream := mgr getSourceStreamFor:mclass revision:revision.
 ].
 revSourceStream isNil ifTrue:[
-self warn:'could not load source for ' , mclass name , ' revision ', revision,  ' from repository'.
+self warn:(resources string:'Could not load source for %1 revision %2 from repository' with:mclass name with:revision).
 chg := nil.
 ] ifFalse:[
 classChangeSet := ChangeSet fromStream:revSourceStream.
 chg := classChangeSet
 detect:[:chg | chg isMethodChange
 and:[chg selector = mselector
-and:[chg className = className]]]
+and:[chg fullClassName = className]]]
 ifNone:nil.
+chg isNil ifTrue:[
+"/ maybe the class was renamed!!
+(classChangeSet contains:[:chg | chg isMethodChange and:[chg selector = mselector]]) ifTrue:[
+self halt:'check for renamed class'.
+]
+].
 ].
 chg isNil ifTrue:[
 "the method was created in the next version (previous one processed)"
 ] ifFalse:[
 "/ mhm - was not in the previous version
 ] ifFalse:[
 nChg := lastChange asNamedMethodChange
 ].
 lastRevision isNil ifTrue:[
 (stop = revisions size) ifTrue:[
 changeName := 'current (not in the repository)'.
 ] ifFalse:[
-"/ not showing all - dont really know
+"/ not showing all - don't really know
 changeName := 'current'.
 ].
 ] ifFalse:[
 changeName := lastRevision,' [',lastDate,' by ',lastAuthor,']'.
 first ifTrue:[
-changeName := changeName,' (= current)'.
+(newestVersion compareAsVersionNumberWith:lastRevision) >= 0 ifTrue:[
+changeName := changeName,' (= current)'.
+].
 ]
 ].
 nChg notNil ifTrue:[
 nChg changeName:changeName.
 previousMethods add:nChg.
 ].
 "/ Transcript showCR:('it took %1 seconds' bindWith:(t /1000)printString).
 self activityNotification:nil.
 browser := (UserPreferences current changeSetBrowserClass) openOn:previousMethods.
-browser window label:('Revisions of ' , mclass name , ' ' , mselector).
+browser window label:(resources string:'Revisions of %1  %2' with:mclass name with:mselector).
 browser readOnly:true.
 ].
 "Modified: / 01-07-2011 / 16:34:29 / cg"
 "Created: / 18-11-2011 / 18:19:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 item := menu menuItemWithKey:#SCM.
 (item notNil) ifTrue:[
 manager notNil ifTrue:[
 manager := managers anyOne.
-item label:(resources string:'Repository') , '  ' , (manager managerTypeName asText colorizeAllWith:Color gray).
+item label:(resources string:'Repository') , '  ' , (manager managerTypeName withColor:Color gray).
 ] ifFalse:[
 item label:(resources string:'Repository').
 item enabled: false.
 ].
 ].
 self replaceSourceCodeManagerPlaceholderWith: manager in: menu.
 (layout = 'inline') ifTrue:[
 menu itemsDo:[:item|
 manager notNil ifTrue:[
 item argument == manager name ifTrue:[
-item label: (item label , '  ' , ((resources string: '(default)') asText colorizeAllWith: Color gray)).
+item label: (item label , '  ' , ((resources string: '(default)') withColor: Color gray)).
 ]
 ] ifFalse:[
 item enabled: false
 ].
 ]
 , (classesMatchingCaseless size == 1 ifTrue:['class'] ifFalse:['classes'])
 ,' with a similar name.\\Goto one of them ?'
 with:aMatchString allBold
 with:implementors size
 with:classesMatchingCaseless size)
-fromList:({'Implementors:' colorizeAllWith:Color gray}
+fromList:({'Implementors:' withColor:Color gray}
 ,(implementors collect:[:m | m mclass name])
 ,'-'
-,{'Classes:' colorizeAllWith:Color gray}
+,{'Classes:' withColor:Color gray}
 ,classesMatchingCaseless)
 values:(#(nil),implementors,#(nil nil),classesMatchingCaseless)
 buttons:#('No, Search for a Class' 'Show all Implementors')
 values:{ searchClassToken . browseAllImplementorsToken}
 lines:10 cancel:nil
 numFound == 0 ifTrue:[
 question := resources
 stringWithCRs:label,extraStringMsg
 with:((string ? '')
 allBold
-colorizeAllWith:Color red darkened).
+withColor:Color red darkened).
 question := question , (resources string:' - none found.').
 ((selector == #findImplementors:in:ignoreCase:match:)
 and:[ (arguments first numArgs == 0)
 and:[
 newBrowser windowGroup notNil ifTrue:[
 t > 5 seconds ifTrue:[
 newBrowser methodListApp autoUpdateOnChange: false.
 ].
 ].
+Transcript show:'search time: '; showCR:t.
 ^ newBrowser.
 ].
 ].
 ] valueWithRestart.
 ].
 msg := (msg ? '').
 method isInstrumented ifTrue:[
 msg isEmpty ifTrue:[
-msg := 'Instrumented.' colorizeAllWith:(Color green darkened).
+msg := 'Instrumented.' withColor:(Color green darkened).
 ] ifFalse:[
-msg := ('Instrumented.' colorizeAllWith:(Color green darkened)),' ',msg.
+msg := ('Instrumented.' withColor:(Color green darkened)),' ',msg.
 ].
 self showCoverageInformation value ifFalse:[
 msg := msg , ' (coverage display is turned off - see "view"-menu)'
 ].
 msg := msg , '.'.
 errMsg := ex description asStringCollection first asString.
 "/ Transcript topView raiseDeiconified.
 "/ Transcript showCR:'ParseError: ', ex description.
 "/ self halt.
-self showInfo:(errMsg colorizeAllWith:Color red).
+self showInfo:(errMsg withColor:Color red).
 self navigationState showingParseError:true.
 newCode := nil.
 ] do:[
 |codeAspect|

branch	jv
changeset 16571	cf319f2e56d0
parent 16570	dc5e958a20dc
parent 16533	84fe5d2d72f3
child 16573	2f5cd8950dcf