hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:f0126e42bbef
+:8b400fde34ef
 "{ NameSpace: Tools }"
 SystemBrowser subclass:#NewSystemBrowser
 	instanceVariableNames:'environment navigationState bufferNameList selectedBuffer buffers
-		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
+bufferUsageOrder browserCanvas immediateUpdate showClassPackages
-		lastMethodCategory lastMethodMoveClass browserCanvasType
+lastMethodCategory lastMethodMoveClass browserCanvasType
-		syntaxColoringProcessRunning syntaxColoringProcess
+syntaxColoringProcessRunning syntaxColoringProcess
-		methodInfoProcess browsletShowHideLabelHolder browserPageCanvas
+methodInfoProcess browsletShowHideLabelHolder browserPageCanvas
-		isEmbedded'
+isEmbedded'
 	classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
-		LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
+LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
-		LastNameSpaceMove LastMethodMoveOrCopyTargetClass
+LastNameSpaceMove LastMethodMoveOrCopyTargetClass
-		LastClassFilterBlockString LastMethodFilterBlockString
+LastClassFilterBlockString LastMethodFilterBlockString
-		LastBreakPointConditionString LastIndividualChecks
+LastBreakPointConditionString LastIndividualChecks
-		LastAcceptPackage LastVariableRenames LastVisitorClassName
+LastAcceptPackage LastVariableRenames LastVisitorClassName
-		LastTemporaryVariableName FindHistory
+LastTemporaryVariableName FindHistory
-		CheckForInstancesWhenRemovingClasses SynchronousUpdate
+CheckForInstancesWhenRemovingClasses SynchronousUpdate
-		DoubleClickIsOpenBrowser ShowMethodTemplateWhenProtocolIsSelected
+DoubleClickIsOpenBrowser ShowMethodTemplateWhenProtocolIsSelected
-		DefaultShowMethodInheritance DefaultEmphasizeUnloadedClasses
+DefaultShowMethodInheritance DefaultEmphasizeUnloadedClasses
-		DefaultImmediateSyntaxColoring DefaultImmediateExplaining
+DefaultImmediateSyntaxColoring DefaultImmediateExplaining
-		DefaultSyntaxColoring DefaultToolBarVisible
+DefaultSyntaxColoring DefaultToolBarVisible
-		DefaultCodeInfoVisible DefaultShortNameInTabs
+DefaultCodeInfoVisible DefaultShortNameInTabs
-		DefaultHideUnloadedClasses DefaultMarkApplications
+DefaultHideUnloadedClasses DefaultMarkApplications
-		DefaultAutoFormat DefaultShowMethodComplexity
+DefaultAutoFormat DefaultShowMethodComplexity
-		DefaultShowMethodTypeIcon DefaultShowSpecialResourceEditors
+DefaultShowMethodTypeIcon DefaultShowSpecialResourceEditors
-		SharedMethodCategoryCache LastMethodProcessingBlockString
+SharedMethodCategoryCache LastMethodProcessingBlockString
-		LastLoadedPackages DefaultShortAllClassesInNameSpaceOrganisation
+LastLoadedPackages DefaultShortAllClassesInNameSpaceOrganisation
-		LastBaseVersionTag DefaultShowPseudoProtocols
+LastBaseVersionTag DefaultShowPseudoProtocols
-		DefaultShowMultitabMode LastRenamedOld LastRenamedNew
+DefaultShowMultitabMode LastRenamedOld LastRenamedNew
-		LastImportedPackage LastLintRules NewNavigationHistory
+LastImportedPackage LastLintRules NewNavigationHistory
-		LastLiteralReplacementType LastLiteralReplacementNewName
+LastLiteralReplacementType LastLiteralReplacementNewName
-		LastLiteralReplacementOldLiteral LastNewProjectType
+LastLiteralReplacementOldLiteral LastNewProjectType
-		LastClassProcessingBlockString RecentlyClosedList
+LastClassProcessingBlockString RecentlyClosedList
-		LastClassSearchBoxShowedFullName CachedTagToRevisionMapping
+LastClassSearchBoxShowedFullName CachedTagToRevisionMapping
-		CachedMethodsImplemented DefaultShowSyntheticMethods'
+CachedMethodsImplemented'
 	poolDictionaries:''
 	category:'Interface-Browsers-New'
 !
 Object subclass:#ClassCompletionEntry
 <resource: #menu>
 ^
 #(Menu
-	(
+(
-	 (MenuItem
+(MenuItem
-	    label: 'Toolbar'
+label: 'Toolbar'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: toolBarVisibleHolder
+indication: toolBarVisibleHolder
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Bookmarks'
+label: 'Bookmarks'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: bookmarkBarVisibleHolder
+indication: bookmarkBarVisibleHolder
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Searchbar'
+label: 'Searchbar'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: stringSearchToolVisibleHolder
+indication: stringSearchToolVisibleHolder
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Info'
+label: 'Info'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: codeInfoVisible
+indication: codeInfoVisible
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: '-'
+label: '-'
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Multitab Mode'
+label: 'Multitab Mode'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: showMultitabMode
+indication: showMultitabMode
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Enable Embedded Resource Editors'
+label: 'Enable Embedded Resource Editors'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: showSpecialResourceEditors
+indication: showSpecialResourceEditors
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Coverage Info'
+label: 'Coverage Info'
-	    translateLabel: true
+translateLabel: true
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: showCoverageInformation
+indication: showCoverageInformation
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Browslet'
+label: 'Browslet'
-	    itemValue: showPlugin:
+itemValue: showPlugin:
-	    translateLabel: true
+translateLabel: true
-	    isVisible: false
+isVisible: false
-	    hideMenuOnActivated: false
+hideMenuOnActivated: false
-	    indication: showPlugin
+indication: showPlugin
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: '-'
+label: '-'
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Class'
+label: 'Class'
-	    translateLabel: true
+translateLabel: true
-	    submenu:
+submenu:
-	   (Menu
+(Menu
-	      (
+(
-	       (MenuItem
+(MenuItem
-		  label: 'Hide Unloaded Classes'
+label: 'Hide Unloaded Classes'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: hideUnloadedClasses
+indication: hideUnloadedClasses
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show All Classes in NameSpace View'
+label: 'Show All Classes in NameSpace View'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showAllClassesInNameSpaceOrganisation
+indication: showAllClassesInNameSpaceOrganisation
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: '-'
+label: '-'
-		)
+)
-	       (MenuItem
+(MenuItem
-		  enabled: showUnloadedClasses
+enabled: showUnloadedClasses
-		  label: 'Emphasize Unloaded Classes'
+label: 'Emphasize Unloaded Classes'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: emphasizeUnloadedClasses
+indication: emphasizeUnloadedClasses
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show Class Type Indicator'
+label: 'Show Class Type Indicator'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: markApplicationsHolder
+indication: markApplicationsHolder
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Short Class Names in Tabs'
+label: 'Short Class Names in Tabs'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: shortNamesInTabs
+indication: shortNamesInTabs
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show Class-Packages'
+label: 'Show Class-Packages'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showClassPackages
+indication: showClassPackages
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: '-'
+label: '-'
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Sort and Indent by Inheritance'
+label: 'Sort and Indent by Inheritance'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: sortByNameAndInheritance
+indication: sortByNameAndInheritance
-		)
+)
-	       )
+)
-	      nil
+nil
-	      nil
+nil
-	    )
+)
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Protocol'
+label: 'Protocol'
-	    translateLabel: true
+translateLabel: true
-	    submenu:
+submenu:
-	   (Menu
+(Menu
-	      (
+(
-	       (MenuItem
+(MenuItem
-		  label: 'Show Pseudo Protocols'
+label: 'Show Pseudo Protocols'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showPseudoProtocols
+indication: showPseudoProtocols
-		)
+)
-	       )
+)
-	      nil
+nil
-	      nil
+nil
-	    )
+)
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Selector'
+label: 'Selector'
-	    translateLabel: true
+translateLabel: true
-	    submenu:
+submenu:
-	   (Menu
+(Menu
-	      (
+(
-	       (MenuItem
+(MenuItem
-		  label: 'Show Inherited Methods'
+label: 'Show Inherited Methods'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  choice: methodVisibilityHolder
+choice: methodVisibilityHolder
-		  choiceValue: all
+choiceValue: all
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show Inherited Methods except Object''s'
+label: 'Show Inherited Methods except Object''s'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  choice: methodVisibilityHolder
+choice: methodVisibilityHolder
-		  choiceValue: allButObject
+choiceValue: allButObject
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Do not Show Inherited Methods'
+label: 'Do not Show Inherited Methods'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  choice: methodVisibilityHolder
+choice: methodVisibilityHolder
-		  choiceValue: class
+choiceValue: class
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: '-'
+label: '-'
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show Synthetic Methods'
+label: 'Show Synthetic Methods'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showSyntheticMethods
+indication: showSyntheticMethods
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: '-'
+label: '-'
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show Method Inheritance Indicator'
+label: 'Show Method Inheritance Indicator'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showMethodInheritance
+indication: showMethodInheritance
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show Method Type Indicator'
+label: 'Show Method Type Indicator'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showMethodTypeIcon
+indication: showMethodTypeIcon
-		)
+)
-	       (MenuItem
+(MenuItem
-		  enabled: hasOOMPackageLoadedHolder
+enabled: hasOOMPackageLoadedHolder
-		  label: 'Show Method-Complexity'
+label: 'Show Method-Complexity'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showMethodComplexity
+indication: showMethodComplexity
-		)
+)
-	       )
+)
-	      nil
+nil
-	      nil
+nil
-	    )
+)
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Code'
+label: 'Code'
-	    translateLabel: true
+translateLabel: true
-	    submenu:
+submenu:
-	   (Menu
+(Menu
-	      (
+(
-	       (MenuItem
+(MenuItem
-		  label: 'Syntax Coloring'
+label: 'Syntax Coloring'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: doSyntaxColoring
+indication: doSyntaxColoring
-		)
+)
-	       (MenuItem
+(MenuItem
-		  enabled: doSyntaxColoring
+enabled: doSyntaxColoring
-		  label: 'Immediate Syntax Coloring'
+label: 'Immediate Syntax Coloring'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: doImmediateSyntaxColoring
+indication: doImmediateSyntaxColoring
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Immediate Explaining'
+label: 'Immediate Explaining'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: doImmediateExplaining
+indication: doImmediateExplaining
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Auto-Format Code'
+label: 'Auto-Format Code'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: doAutoFormat
+indication: doAutoFormat
-		)
+)
-	       (MenuItem
+(MenuItem
-		  label: 'Show MethodTemplate for New Methods'
+label: 'Show MethodTemplate for New Methods'
-		  translateLabel: true
+translateLabel: true
-		  hideMenuOnActivated: false
+hideMenuOnActivated: false
-		  indication: showMethodTemplate
+indication: showMethodTemplate
-		)
+)
-	       )
+)
-	      nil
+nil
-	      nil
+nil
-	    )
+)
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: '-'
+label: '-'
-	  )
+)
-	 (MenuItem
+(MenuItem
-	    label: 'Settings...'
+label: 'Settings...'
-	    itemValue: openSettingsDialog
+itemValue: openSettingsDialog
-	    translateLabel: true
+translateLabel: true
-	  )
+)
-	 )
+)
-	nil
+nil
-	nil
+nil
 )
 !
 viewMenuForChainBrowser
 "This resource specification was automatically generated
 resources := resourcesOrNil ? self classResources.
 showFullNameHolder := (LastClassSearchBoxShowedFullName ? false) asValue.
 doWhat := doWhatByDefault.
 canFind := aBrowserOrNil notNil
-	       and:[aBrowserOrNil navigationState notNil and:[ aBrowserOrNil navigationState isFullBrowser ]].
+and:[aBrowserOrNil navigationState notNil and:[ aBrowserOrNil navigationState isFullBrowser ]].
 (doWhat isNil or:[aBrowserOrNil isNil]) ifTrue:[
-	title := ''.
+title := ''.
-	boxLabel := (resources string:'Select a class').
+boxLabel := (resources string:'Select a class').
-	okText := 'OK'.
+okText := 'OK'.
-	okText2 := nil. doWhat2 := nil.
+okText2 := nil. doWhat2 := nil.
-	okText3 := nil. doWhat3 := nil.
+okText3 := nil. doWhat3 := nil.
 ] ifFalse:[
-	title := (singleClass ifTrue:[ 'Class to browse' ] ifFalse:[ 'Class(es) to browse' ]).
+title := (singleClass ifTrue:[ 'Class to browse' ] ifFalse:[ 'Class(es) to browse' ]).
-	boxLabel := (resources string:'Browse or Search').
+boxLabel := (resources string:'Browse or Search').
-	(doWhat isNil and:[canFind not]) ifTrue:[
+(doWhat isNil and:[canFind not]) ifTrue:[
-	    doWhat := #newBuffer.
+doWhat := #newBuffer.
-	].
+].
-	doWhat == #newBrowser ifTrue:[
+doWhat == #newBrowser ifTrue:[
-	    okText := 'Open'.
+okText := 'Open'.
-	    okText2 := 'Add Buffer'. doWhat2 := #newBuffer.
+okText2 := 'Add Buffer'. doWhat2 := #newBuffer.
-	    okText3 := 'Find'.       doWhat3 := nil.
+okText3 := 'Find'.       doWhat3 := nil.
-	] ifFalse:[ doWhat == #newBuffer ifTrue:[
+] ifFalse:[ doWhat == #newBuffer ifTrue:[
-	    okText := 'Add Buffer'.
+okText := 'Add Buffer'.
-	    okText2 := 'Open New'.   doWhat2 := #newBrowser.
+okText2 := 'Open New'.   doWhat2 := #newBrowser.
-	    okText3 := 'Find'.       doWhat3 := nil.
+okText3 := 'Find'.       doWhat3 := nil.
-	] ifFalse:[
+] ifFalse:[
-	    title := (singleClass ifTrue:[ 'Class to find' ] ifFalse:[ 'Class(es) to find' ]).
+title := (singleClass ifTrue:[ 'Class to find' ] ifFalse:[ 'Class(es) to find' ]).
-	    okText := 'Find'.
+okText := 'Find'.
-	    okText2 := 'Open New'.   doWhat2 := #newBrowser.
+okText2 := 'Open New'.   doWhat2 := #newBrowser.
-	    okText3 := 'Add Buffer'. doWhat3 := #newBuffer.
+okText3 := 'Add Buffer'. doWhat3 := #newBuffer.
-	]].
+]].
 ].
 genShortNameListEntry :=
-	[:cls |
+[:cls |
-	    |ns|
+|ns|
-	    cls isNil ifTrue:[
+cls isNil ifTrue:[
-		nil
+nil
-	    ] ifFalse:[
+] ifFalse:[
-		ns := cls topNameSpace name.
+ns := cls topNameSpace name.
-		ns = 'Smalltalk'
+ns = 'Smalltalk'
-		    ifTrue:[ ns := '' ]
+ifTrue:[ ns := '' ]
-		    ifFalse:[ns := ' (in ',ns,')'].
+ifFalse:[ns := ' (in ',ns,')'].
-		cls nameWithoutNameSpacePrefix,ns
+cls nameWithoutNameSpacePrefix,ns
-	    ].
+].
-	].
+].
 classNamesInChangeSet := ChangeSet current changedClasses
-				select: (filterOrNil ? [:cls | true])
+select: (filterOrNil ? [:cls | true])
-				thenCollect:[:each | each theNonMetaclass name].
+thenCollect:[:each | each theNonMetaclass name].
 initialFullNames := self visitedClassNamesHistory.
 (filterOrNil notNil) ifTrue:[
-	initialFullNames := initialFullNames select:[:nm | filterOrNil value:(Smalltalk at:nm)].
+initialFullNames := initialFullNames select:[:nm | filterOrNil value:(Smalltalk at:nm)].
 ].
 initialFullNames := initialFullNames select:[:nm | nm notNil].
 initialShortNames := initialFullNames collect:[:nm |
-			    |cls|
+|cls|
-			    cls := Smalltalk at:nm.
+cls := Smalltalk at:nm.
-			    cls isNil ifTrue:[
+cls isNil ifTrue:[
-				"/ class no longer exists (removed?)
+"/ class no longer exists (removed?)
-				nm colorizeAllWith:(Color grey)
+nm colorizeAllWith:(Color grey)
-			    ] ifFalse:[
+] ifFalse:[
-				genShortNameListEntry value:(Smalltalk at:nm)
+genShortNameListEntry value:(Smalltalk at:nm)
-			    ].
+].
-			].
+].
 colorizedFullNames := initialFullNames collect:[:clsName |
-				(classNamesInChangeSet includes:clsName) ifTrue:[
+(classNamesInChangeSet includes:clsName) ifTrue:[
-				    clsName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+clsName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
-				] ifFalse:[
+] ifFalse:[
-				    clsName
+clsName
-				].
+].
-			    ].
+].
 colorizedShortNames := initialShortNames with:initialFullNames collect:[:shortName :clsName |
-				(classNamesInChangeSet includes:clsName) ifTrue:[
+(classNamesInChangeSet includes:clsName) ifTrue:[
-				    shortName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+shortName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
-				] ifFalse:[
+] ifFalse:[
-				    shortName
+shortName
-				].
+].
-			    ].
+].
 title := (resources string:title) , msgTail , '.\' , (resources string:'(TAB to complete; matchPattern allowed - "*" for all):').
 box := self
-		enterBoxForClassWithCodeSelectionTitle:title withCRs
+enterBoxForClassWithCodeSelectionTitle:title withCRs
-		withList:(showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames])
+withList:(showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames])
-		okText:okText
+okText:okText
-		forBrowser:aBrowserOrNil.
+forBrowser:aBrowserOrNil.
 box label:boxLabel.
 doWhat notNil ifTrue:[
-	button2 := Button label:(resources string:okText2).
+button2 := Button label:(resources string:okText2).
-	(aBrowserOrNil notNil and:[aBrowserOrNil navigationState isFullBrowser]) "singleClass" ifTrue:[
+(aBrowserOrNil notNil and:[aBrowserOrNil navigationState isFullBrowser]) "singleClass" ifTrue:[
-	    button3 := Button label:(resources string:okText3)
+button3 := Button label:(resources string:okText3)
-	].
+].
-	box addButton:button2 after:(box okButton).
+box addButton:button2 after:(box okButton).
-	button3 notNil ifTrue:[box addButton:button3 after:button2].
+button3 notNil ifTrue:[box addButton:button3 after:button2].
-	button2 action:[
+button2 action:[
-	   doWhat := doWhat2.
+doWhat := doWhat2.
-	   box doAccept.
+box doAccept.
-	   box okPressed.
+box okPressed.
-	].
+].
-	button3 notNil ifTrue:[
+button3 notNil ifTrue:[
-	    button3 action:[
+button3 action:[
-	       doWhat := doWhat3.
+doWhat := doWhat3.
-	       box doAccept.
+box doAccept.
-	       box okPressed.
+box okPressed.
-	    ].
+].
-	].
+].
 ].
 allClasses := Smalltalk allClasses copyAsOrderedCollection.
 filterOrNil notNil ifTrue:[
-	allClasses := allClasses select: filterOrNil
+allClasses := allClasses select: filterOrNil
 ].
 allNames := (allClasses
-		    collect:[:cls |
+collect:[:cls |
-			|ns nm|
+|ns nm|
-			ns := cls topNameSpace name.
+ns := cls topNameSpace name.
-			ns = 'Smalltalk'
+ns = 'Smalltalk'
-			    ifTrue:[ ns := '' ]
+ifTrue:[ ns := '' ]
-			    ifFalse:[ns := ' (in ',ns,')'].
+ifFalse:[ns := ' (in ',ns,')'].
-			cls isNameSpace ifTrue:[
+cls isNameSpace ifTrue:[
-			    nm := cls nameWithoutNameSpacePrefix,ns,' (Namespace)'
+nm := cls nameWithoutNameSpacePrefix,ns,' (Namespace)'
-			] ifFalse:[
+] ifFalse:[
-			    nm := cls nameWithoutNameSpacePrefix,ns
+nm := cls nameWithoutNameSpacePrefix,ns
-			].
+].
-			(classNamesInChangeSet includes:cls name) ifTrue:[
+(classNamesInChangeSet includes:cls name) ifTrue:[
-			    nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
-			] ifFalse:[
+] ifFalse:[
-			    nm
+nm
-			].
+].
-		    ]) sortWith:allClasses; yourself.
+]) sortWith:allClasses; yourself.
 allFullNames := (allClasses
-		    collect:[:cls |
+collect:[:cls |
-			|nm|
+|nm|
-			nm := cls name.
+nm := cls name.
-			(classNamesInChangeSet includes:cls name) ifTrue:[
+(classNamesInChangeSet includes:cls name) ifTrue:[
-			    nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
-			] ifFalse:[
+] ifFalse:[
-			    nm
+nm
-			].
+].
-		    ]) sortWith:allClasses; yourself.
+]) sortWith:allClasses; yourself.
 updateList := [
-	    |nameToSearch list namesStarting namesIncluding lcName nameList|
+|nameToSearch list namesStarting namesIncluding lcName nameList|
-	    (nameToSearch := classNameHolder value withoutSeparators) isEmpty ifTrue:[
+(nameToSearch := classNameHolder value withoutSeparators) isEmpty ifTrue:[
-		showingWhatLabel label:(resources string:'Recently visited:').
+showingWhatLabel label:(resources string:'Recently visited:').
-		list := (showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames]).
+list := (showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames]).
-	    ] ifFalse:[
+] ifFalse:[
-		showingWhatLabel label:(resources string:'Matching classes:').
+showingWhatLabel label:(resources string:'Matching classes:').
-		nameList := showFullNameHolder value
+nameList := showFullNameHolder value
-				ifTrue:[ allFullNames ]
+ifTrue:[ allFullNames ]
-				ifFalse:[ allNames ].
+ifFalse:[ allNames ].
-		lcName := nameToSearch asLowercase.
+lcName := nameToSearch asLowercase.
-		(lcName includesString:'::') ifTrue:[
+(lcName includesString:'::') ifTrue:[
-		    list := OrderedCollection new.
+list := OrderedCollection new.
-		    allClasses doWithIndex:[:cls :idx |
+allClasses doWithIndex:[:cls :idx |
-			|isIncluded|
+|isIncluded|
-			(nameToSearch includesMatchCharacters) ifTrue:[
+(nameToSearch includesMatchCharacters) ifTrue:[
-			    isIncluded := (lcName match:cls name asLowercase)
+isIncluded := (lcName match:cls name asLowercase)
-			] ifFalse:[
+] ifFalse:[
-			    isIncluded := (cls name includesString:lcName caseSensitive:false)
+isIncluded := (cls name includesString:lcName caseSensitive:false)
-			].
+].
-			isIncluded ifTrue:[
+isIncluded ifTrue:[
-			    list add:(nameList at:idx)
+list add:(nameList at:idx)
-			].
+].
-		    ].
+].
-		] ifFalse:[
+] ifFalse:[
-		    (nameToSearch includesMatchCharacters) ifTrue:[
+(nameToSearch includesMatchCharacters) ifTrue:[
-			list := nameList select:[:nm | lcName match:nm asLowercase]
+list := nameList select:[:nm | lcName match:nm asLowercase]
-		    ] ifFalse:[
+] ifFalse:[
-			namesIncluding := nameList
+namesIncluding := nameList
-					    select:[:nm |
+select:[:nm |
-						"/ nm asLowercase startsWith:lcName
+"/ nm asLowercase startsWith:lcName
-						nm asLowercase includesString:lcName caseSensitive:false
+nm asLowercase includesString:lcName caseSensitive:false
-					    ].
+].
-			namesStarting := namesIncluding select:[:nm | nm asLowercase startsWith:lcName].
+namesStarting := namesIncluding select:[:nm | nm asLowercase startsWith:lcName].
-			list := namesStarting , {nil} , (namesIncluding \ namesStarting).
+list := namesStarting , {nil} , (namesIncluding \ namesStarting).
-		    ]
+]
-		]
+]
-	    ].
+].
-	    box listView
+box listView
-		list:list;
+list:list;
-		scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
+scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
-	].
+].
 classNameHolder := '' asValue.
 box enterField
-	model:classNameHolder;
+model:classNameHolder;
-	immediateAccept:true.
+immediateAccept:true.
 classNameHolder onChangeEvaluate:updateList.
 box entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
 box action:[:aString | className := aString].
 box panelView
-	addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left) before:nil;
+addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left) before:nil;
-	addSubView:(check := CheckBox label:(resources string:'Show Full Name (do not strip off Namespace)') model:showFullNameHolder) before:nil.
+addSubView:(check := CheckBox label:(resources string:'Show Full Name (do not strip off Namespace)') model:showFullNameHolder) before:nil.
 showFullNameHolder onChangeEvaluate:updateList.
 box enterField origin:(0 @ check corner y).
-box enterField onKey:#CursorDown leaveWith:[ box listView requestFocus.
+box enterField
-						 box listView hasSelection ifFalse:[
+onKey:#CursorDown
-						    box listView selectFirst
+leaveWith:[
-						 ]
+box listView windowGroup focusView:box listView byTab:true.
-					       ].
+box listView hasSelection ifFalse:[
+box listView selectFirst
+] ifTrue:[
+box listView selectNext
+].
+].
 box listView origin:(0 @ check corner y).
 box extent:(400 @ 350).
 box open.
 className isEmptyOrNil ifTrue:[^ nil "cancel"].
 LastClassSearchBoxShowedFullName := showFullNameHolder value.
 (className endsWith:$) ) ifTrue:[
-	(className indexOfSubCollection:'(in ') == 0 ifTrue:[
+(className indexOfSubCollection:'(in ') == 0 ifTrue:[
-	    "/ a namespace
+"/ a namespace
-	    className := (className copyTo:(className indexOfSubCollection:'(Name')-1) withoutSeparators
+className := (className copyTo:(className indexOfSubCollection:'(Name')-1) withoutSeparators
-	] ifFalse:[
+] ifFalse:[
-	    className := ((className copyFrom:(className indexOfSubCollection:'(in ')+4)
+className := ((className copyFrom:(className indexOfSubCollection:'(in ')+4)
-			    copyButLast:1)
+copyButLast:1)
-			 , '::' , className asCollectionOfWords first
+, '::' , className asCollectionOfWords first
-	].
+].
 ].
 (doWhat isNil or:[aBrowserOrNil isNil]) ifTrue:[
-	aBlock notNil ifTrue:[aBlock value:className optionalArgument:singleClass and:doWhat].
+aBlock notNil ifTrue:[aBlock value:className optionalArgument:singleClass and:doWhat].
-	^ className
+^ className
 ].
 aBrowserOrNil withSearchCursorDo:[
-	aBlock value:className value:singleClass value:doWhat.
+aBlock value:className value:singleClass value:doWhat.
 ].
 ^ className
 "Modified: / 29-08-2013 / 12:24:28 / cg"
 "Modified: / 04-09-2013 / 17:48:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 variableFilter
 ^ self navigationState variableFilter
 "Created: / 24.2.2000 / 23:28:06 / cg"
 ! !
 !NewSystemBrowser methodsFor:'aspects-organization'!
 categoryMenuVisible
 |holder|
 useSearchBarInBrowser
 ^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
 ! !
 !NewSystemBrowser methodsFor:'change & update'!
 categorySelectionChanged
 "category selection changed by user interaction"
 |highest highestString nrString nr fileNamePrefix fileNameMiddle
 changedClassesAndMetaclasses changedClasses fileName changedOwningClasses generatedPatchFilename tempStream changeSet|
 "/ find the highest numbered patchfile
 'stxPatches' asFilename directoryContentsDo:[:fn |
-	(fn includes:$_) ifTrue:[
+(fn includes:$_) ifTrue:[
-	    nrString := fn upTo:$_.
+nrString := fn upTo:$_.
-	    nr := Integer readFrom:nrString onError:nil.
+nr := Integer readFrom:nrString onError:nil.
-	    nr notNil ifTrue:[
+nr notNil ifTrue:[
-		nr > (highest ? -1) ifTrue:[
+nr > (highest ? -1) ifTrue:[
-		    highest := nr.
+highest := nr.
-		    highestString := nrString.
+highestString := nrString.
-		]
+]
-	    ].
+].
-	].
+].
 ].
 highest isNil ifTrue:[
-	fileNamePrefix := '01'
+fileNamePrefix := '01'
 ] ifFalse:[
-	fileNamePrefix := (highest+1) printStringLeftPaddedTo:(highestString size) with:$0.
+fileNamePrefix := (highest+1) printStringLeftPaddedTo:(highestString size) with:$0.
 ].
 changedClassesAndMetaclasses := diffSet changedClasses.
 changedClasses := changedClassesAndMetaclasses collect:[:clsOrMeta | clsOrMeta theNonMetaclass].
 changedOwningClasses := changedClasses collect:[:each | each isPrivate
-								ifTrue:[ each owningClass ]
+ifTrue:[ each owningClass ]
-								ifFalse:[ each ]] as:Set.
+ifFalse:[ each ]] as:Set.
 changedOwningClasses := changedOwningClasses asOrderedCollection.
 changedOwningClasses size == 1 ifTrue:[
-	fileNameMiddle := changedOwningClasses first nameWithoutPrefix
+fileNameMiddle := changedOwningClasses first nameWithoutPrefix
 ] ifFalse:[
-	fileNameMiddle := 'patches'
+fileNameMiddle := 'patches'
 ].
 fileNameMiddle := fileNameMiddle asFilename makeLegalFilename name.
 fileName := (fileNamePrefix,'_',fileNameMiddle,'.st') asFilename.
 tempStream := FileStream newTemporaryIn:'stxPatches'.
 tempStream nextPutLine:('"/ patches to bring %1 to version %2' bindWith:changedClasses first name with:thisRevString).
 tempStream nextPutLine:('"/').
 tempStream nextPutLine:('"/ first, a guard, to ignore the patch if the library already contains an up-to-date class:').
 tempStream nextPutLine:('"/').
 changedOwningClasses do:[:eachClass |
-	tempStream nextPutLine:('(AbstractSourceCodeManager isRevision:(%2 revision) sameOrAfter:''%1'') ifTrue:[ AbortSignal raise ].'
+tempStream nextPutLine:('(AbstractSourceCodeManager isRevision:(%2 revision) sameOrAfter:''%1'') ifTrue:[ AbortSignal raiseErrorString:''patch is for older version'' ].'
-			    bindWith:eachClass revision
+bindWith:eachClass revision
-			    with:eachClass name).
+with:eachClass name).
 ].
 tempStream nextPutChunkSeparator; cr; cr.
 changeSet := ChangeSet fromDiffSet:diffSet.
 changeSet fileOutOn:tempStream.
 tempStream syncData; close.
 generatedPatchFilename := ('stxPatches' asFilename construct:fileName).
 tempStream fileName renameTo:generatedPatchFilename.
 (Dialog
-	confirm:('Created new patchFile as: "%1"' bindWith:generatedPatchFilename name)
+confirm:('Created new patchFile as: "%1"' bindWith:generatedPatchFilename name)
-	yesLabel:'Show' noLabel:'OK')
+yesLabel:'Show' noLabel:'OK')
 ifTrue:[
-	UserPreferences fileBrowserClass openOn:generatedPatchFilename
+UserPreferences fileBrowserClass openOn:generatedPatchFilename
 ].
 "Created: / 26-09-2012 / 15:13:07 / cg"
 !
 !
 openSTXDocumentation
 HTMLDocumentView openFullOnDocumentationFile:'TOP.html'
 ! !
 !NewSystemBrowser methodsFor:'menu actions-inheritance'!
 inheritanceMenuNavigateToClass
 self switchToClass:(navigationState inheritanceView scrolledView selectionHolder value)
 mclass := method mclass.
 mselector := method selector.
 className := mclass name.
 [
-	|set|
+|set|
-	set := ChangeSet forExistingMethods:(Array with:method).
+set := ChangeSet forExistingMethods:(Array with:method).
-	set := set select:[:c | c isMethodChange].
+set := set select:[:c | c isMethodChange].
-	lastChange := set first.
+lastChange := set first.
 ] value.
 thisIsAnExtensionMethod := (method isExtension).
 thisIsAnExtensionMethod ifTrue:[
-	packageId := method package asPackageId.
+packageId := method package asPackageId.
-	mgr := manager
+mgr := manager
 ] ifFalse:[
-	packageId := mclass package asPackageId.
+packageId := mclass package asPackageId.
-	"/ mgr := packageId projectDefinitionClass sourceCodeManager.
+"/ mgr := packageId projectDefinitionClass sourceCodeManager.
-	mgr := manager.
+mgr := manager.
-	"/self assert:(mgr = packageId projectDefinitionClass sourceCodeManager).
+"/self assert:(mgr = packageId projectDefinitionClass sourceCodeManager).
 ].
 directory := packageId directory.
 module := packageId module.
 self withWaitCursorDo:[
-	|revisionLog start stop answer t tS list msg first|
+|revisionLog start stop answer t tS list msg first|
-	thisIsAnExtensionMethod ifTrue:[
+thisIsAnExtensionMethod ifTrue:[
-	    revisionLog := mgr
+revisionLog := mgr
-		revisionLogOf:nil
+revisionLogOf:nil
-		fromRevision:nil
+fromRevision:nil
-		toRevision:nil
+toRevision:nil
-		numberOfRevisions:nil
+numberOfRevisions:nil
-		fileName:'extensions.st'
+fileName:'extensions.st'
-		directory:directory
+directory:directory
-		module:module.
+module:module.
-	] ifFalse:[
+] ifFalse:[
-	    revisionLog := mgr revisionLogOf:mclass.
+revisionLog := mgr revisionLogOf:mclass.
-	].
+].
-	revisions := revisionLog at:#revisions.
+revisions := revisionLog at:#revisions.
-	start := 1.
+start := 1.
-	stop := revisions size.
+stop := revisions size.
-	stop > 20 ifTrue:[
+stop > 20 ifTrue:[
-	    thisIsAnExtensionMethod ifTrue:[
+thisIsAnExtensionMethod ifTrue:[
-		t := 500.   "/ fake time
+t := 500.   "/ fake time
-	    ] ifFalse:[
+] ifFalse:[
-		"/ measure the time it takes to checkout a version...
+"/ measure the time it takes to checkout a version...
-		t := Time millisecondsToRun:[
+t := Time millisecondsToRun:[
-		    |revSourceStream|
+|revSourceStream|
-		    revSourceStream := mgr getSourceStreamFor:mclass revision:((revisions at:10) at:#revision).
+revSourceStream := mgr getSourceStreamFor:mclass revision:((revisions at:10) at:#revision).
-		    ChangeSet fromStream:revSourceStream.
+ChangeSet fromStream:revSourceStream.
-		    revSourceStream close.
+revSourceStream close.
-		].
+].
-	    ].
+].
-	    list := revisions collect:[:entry |
+list := revisions collect:[:entry |
-					|rev author dateString date msg|
+|rev author dateString date msg|
-					rev := entry at:#revision.
+rev := entry at:#revision.
-					author := entry at:#author.
+author := entry at:#author.
-					dateString := entry at:#date.
+dateString := entry at:#date.
-					date := Timestamp readGeneralizedFrom:dateString.
+date := Timestamp readGeneralizedFrom:dateString.
-					dateString := date printStringFormat:'%(year)-%(mon)-%(day) %h:%m:%s'.
+dateString := date printStringFormat:'%(year)-%(mon)-%(day) %h:%m:%s'.
-					entry at:#date put:dateString.
+entry at:#date put:dateString.
-					msg := (entry at:#logMessage) asStringCollection first asString.
+msg := ((entry at:#logMessage) asStringCollection firstIfEmpty:'') asString.
-					rev,' ',author,' ',dateString,' ',msg
+rev,' ',author,' ',dateString,' ',msg
-				      ].
+].
-	    msg := 'There are %1 revisions to extract from the repository'.
+msg := 'There are %1 revisions to extract from the repository'.
-	    t := (t * revisions size / 1000) rounded.
+t := (t * revisions size / 1000) rounded.
-	    t < 10 ifTrue:[
+t < 10 ifTrue:[
-		msg := msg,'\(this will take a few seconds).'.
+msg := msg,'\(this will take a few seconds).'.
-		tS := t.
+tS := t.
-	    ] ifFalse:[
+] ifFalse:[
-		t := t * revisions size // 1000 // 10 * 10.
+t := t * revisions size // 1000 // 10 * 10.
-		tS := (TimeDuration fromSeconds:t) printStringForApproximation.
+tS := (TimeDuration fromSeconds:t) printStringForApproximation.
-		msg := msg,'\(this will take roughly %2).'
+msg := msg,'\(this will take roughly %2).'
-	    ].
+].
-	    msg := msg,'\\Do you want to see all or only some of the revisions ?'.
+msg := msg,'\\Do you want to see all or only some of the revisions ?'.
-	    answer := Dialog
+answer := Dialog
-		choose:(resources stringWithCRs:msg
+choose:(resources stringWithCRs:msg
-				    with:revisions size
+with:revisions size
-				    with:tS)
+with:tS)
-		fromList:list values:revisions initialSelection:nil
+fromList:list values:revisions initialSelection:nil
-		buttons:nil
+buttons:nil
-		values:nil
+values:nil
-		default:nil
+default:nil
-		lines:20
+lines:20
-		cancel:[^ self]
+cancel:[^ self]
-		multiple:false
+multiple:false
-		title:(resources string:'Confirmation')
+title:(resources string:'Confirmation')
-		postBuildBlock:[:dialog |
+postBuildBlock:[:dialog |
-			    |b|
+|b|
-			    b := Button label:(resources string:'Browse Newer than Selected').
+b := Button label:(resources string:'Browse Newer than Selected').
-			    b action:[ stop := (dialog componentAt:#ListView) selection. dialog okPressed].
+b action:[ stop := (dialog componentAt:#ListView) selection. dialog okPressed].
-			    b := dialog addButton:b before:dialog okButton.
+b := dialog addButton:b before:dialog okButton.
-			    dialog okButton label:(resources string:'Browse All').
+dialog okButton label:(resources string:'Browse All').
-			    dialog okButton action:[ stop := revisions size. dialog okPressed].
+dialog okButton action:[ stop := revisions size. dialog okPressed].
-			].
+].
-	    stop isNil ifTrue:[^ self ].
+stop isNil ifTrue:[^ self ].
-	].
+].
 t := Time millisecondsToRun:[
-	previousMethods := ChangeSet new.
+previousMethods := ChangeSet new.
-	lastSource := currentSource := method source.
+lastSource := currentSource := method source.
-	lastRevision := lastDate := nil.
+lastRevision := lastDate := nil.
-	first := true.
+first := true.
-	revisions from:start to:stop do:[:eachLogEntry |
+revisions from:start to:stop do:[:eachLogEntry |
-	    |revision date revSourceStream|
+|revision date revSourceStream|
-	    revision := eachLogEntry at:#revision.
+revision := eachLogEntry at:#revision.
-	    date := eachLogEntry at:#date.
+date := eachLogEntry at:#date.
-	    [
+[
-		|chg nChg classChangeSet changeSource changeName|
+|chg nChg classChangeSet changeSource changeName|
-		self activityNotification:('Fetching revision ',revision,'...').
+self activityNotification:('Fetching revision ',revision,'...').
-		thisIsAnExtensionMethod ifTrue:[
+thisIsAnExtensionMethod ifTrue:[
-		    revSourceStream := mgr
+revSourceStream := mgr
-					    streamForClass:nil
+streamForClass:nil
-					    fileName:'extensions.st'
+fileName:'extensions.st'
-					    revision:revision
+revision:revision
-					    directory:directory
+directory:directory
-					    module:module
+module:module
-					    cache:true.
+cache:true.
-		] ifFalse:[
+] ifFalse:[
-		    revSourceStream := mgr getSourceStreamFor:mclass revision:revision.
+revSourceStream := mgr getSourceStreamFor:mclass revision:revision.
-		].
+].
-		revSourceStream isNil ifTrue:[
+revSourceStream isNil ifTrue:[
-		    self warn:'could not load source for ' , mclass name , ' revision ', revision,  ' from repository'.
+self warn:'could not load source for ' , mclass name , ' revision ', revision,  ' from repository'.
-		    chg := nil.
+chg := nil.
-		] ifFalse:[
+] ifFalse:[
-		    classChangeSet := ChangeSet fromStream:revSourceStream.
+classChangeSet := ChangeSet fromStream:revSourceStream.
-		    chg := classChangeSet
+chg := classChangeSet
-				detect:[:chg | chg isMethodChange
+detect:[:chg | chg isMethodChange
-					       and:[chg selector = mselector
+and:[chg selector = mselector
-					       and:[chg className = className]]]
+and:[chg className = className]]]
-				ifNone:nil.
+ifNone:nil.
-		].
+].
-		chg isNil ifTrue:[
+chg isNil ifTrue:[
-		    "the method was created in the next version (previous one processed)"
+"the method was created in the next version (previous one processed)"
-		] ifFalse:[
+] ifFalse:[
-		    changeSource := chg source.
+changeSource := chg source.
-		].
+].
-		((changeSource isNil and:[lastSource isNil])
+((changeSource isNil and:[lastSource isNil])
-		or:[ changeSource asString = lastSource asString ]) ifTrue:[
+or:[ changeSource asString = lastSource asString ]) ifTrue:[
-		] ifFalse:[
+] ifFalse:[
-		    lastChange isNil ifTrue:[
+lastChange isNil ifTrue:[
-			"/ mhm - was not in the previous version
+"/ mhm - was not in the previous version
-		    ] ifFalse:[
+] ifFalse:[
-			nChg := lastChange asNamedMethodChange
+nChg := lastChange asNamedMethodChange
-		    ].
+].
-		    lastRevision isNil ifTrue:[
+lastRevision isNil ifTrue:[
-			(stop = revisions size) ifTrue:[
+(stop = revisions size) ifTrue:[
-			    changeName := 'current (not in the repository)'.
+changeName := 'current (not in the repository)'.
-			] ifFalse:[
+] ifFalse:[
-			    "/ not showing all - dont really know
+"/ not showing all - dont really know
-			    changeName := 'current'.
+changeName := 'current'.
-			].
+].
-		    ] ifFalse:[
+] ifFalse:[
-			changeName := lastRevision,' [',lastDate,']'.
+changeName := lastRevision,' [',lastDate,']'.
-			first ifTrue:[
+first ifTrue:[
-			    changeName := changeName,' (= current)'.
+changeName := changeName,' (= current)'.
-			]
+]
-		    ].
+].
-		    nChg notNil ifTrue:[
+nChg notNil ifTrue:[
-			nChg changeName:changeName.
+nChg changeName:changeName.
-			previousMethods add:nChg.
+previousMethods add:nChg.
-		    ].
+].
-		    lastSource := changeSource.
+lastSource := changeSource.
-		    lastChange := chg.
+lastChange := chg.
-		    first := false.
+first := false.
-		].
+].
-		lastRevision := revision.
+lastRevision := revision.
-		lastDate := date.
+lastDate := date.
-	    ] ensure:[
+] ensure:[
-		revSourceStream notNil ifTrue:[revSourceStream close].
+revSourceStream notNil ifTrue:[revSourceStream close].
-	    ].
+].
-	].
+].
 ].
 "/ Transcript showCR:('it took %1 seconds' bindWith:(t /1000)printString).
-	self activityNotification:nil.
+self activityNotification:nil.
-	browser := (UserPreferences current changeSetBrowserClass) openOn:previousMethods.
+browser := (UserPreferences current changeSetBrowserClass) openOn:previousMethods.
-	browser window label:('Revisions of ' , mclass name , ' ' , mselector).
+browser window label:('Revisions of ' , mclass name , ' ' , mselector).
-	browser readOnly:true.
+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>"
 "Created: / 21-12-2011 / 20:29:42 / cg"
 	open
 "Modified: / 25-06-2010 / 10:08:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 28-02-2012 / 16:48:38 / cg"
 ! !
 !NewSystemBrowser methodsFor:'menu actions-variables'!
 browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
 "show an enterbox for instVar/classVar to search for.
 "add more functionality to the codeView's text-editor-menu.
 Get here via the menuHolder-plug in codeView."
 <resource: #programMenu>
-|shiftedMenu codeView menu sensor refactorItem menuOthers|
+|shiftedMenu codeView menu sensor menuOthers|
 shiftedMenu := self class shiftedCodeViewPopUpMenu decodeAsLiteralArray.
 shiftedMenu receiver:self.
 shiftedMenu findGuiResourcesIn:self.
 codeView := self codeView.
 sensor := codeView sensor.
 sensor shiftDown ifTrue:[
-	sensor ctrlDown ifFalse:[
+sensor ctrlDown ifFalse:[
-	    ^ shiftedMenu
+^ shiftedMenu
-	].
+].
 ].
 menu := codeView editMenu.
 "/    sensor ctrlDown ifTrue:[
 "/        ] ifFalse:[
 "/            "/ an oldStyle popUpMenu
 "/            menuOthers := menu.
 "/        ]
 "/    ] ifFalse:[
-	(menu isKindOf:Menu) ifTrue:[
+(menu isKindOf:Menu) ifTrue:[
-	    "/ a newStyle menuPanel
+"/ a newStyle menuPanel
-	    "/ (menu atNameKey:'refactor') "atMenuItemLabeled:'Refactor'" putSubmenu:shiftedMenu visible:true.
+"/ (menu atNameKey:'refactor') "atMenuItemLabeled:'Refactor'" putSubmenu:shiftedMenu visible:true.
-	    menu atMenuItemLabeled:(resources string:'Refactor') putSubmenu:shiftedMenu visible:true.
+(menu menuItemLabeled:(resources string:'Refactor')) notNil ifTrue:[
-	] ifFalse:[
+menu atMenuItemLabeled:(resources string:'Refactor') putSubmenu:shiftedMenu visible:true.
-	    "/ an oldStyle popUpMenu
+].
-	    "/ this is a kludge...
+] ifFalse:[
-	    shiftedMenu := shiftedMenu asOldStylePopUpMenuFor:self.
+"/ an oldStyle popUpMenu
-	    "/ would like to add the shifted-menu here
+"/ this is a kludge...
-	    menu menuView
+shiftedMenu := shiftedMenu asOldStylePopUpMenuFor:self.
-		addLabels:(Array with:'-' with:(resources string:'Refactor'))
+"/ would like to add the shifted-menu here
-		selectors:#( nil refactorings)
+menu menuView
-		accelerators:#(nil 'Shift')
+addLabels:(Array with:'-' with:(resources string:'Refactor'))
-		after:#accept.
+selectors:#( nil refactorings)
-	    menu subMenuAt:#refactorings put:shiftedMenu.
+accelerators:#(nil 'Shift')
+after:#accept.
-	    menuOthers := menu subMenuAt:#others.
+menu subMenuAt:#refactorings put:shiftedMenu.
-	].
+menuOthers := menu subMenuAt:#others.
+].
 "/    ].
 "/    sensor shiftDown ifFalse:[
 "/        menuOthers notNil ifTrue:[
 "/            menuOthers menuView
 "/    ].
 ^ menu
 "Modified: / 18-10-2008 / 18:52:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
-"Modified: / 01-03-2012 / 20:04:50 / cg"
+"Modified: / 10-09-2013 / 14:40:13 / cg"
 !
 compareClassWithSmallTeamVersionMenu
 <resource: #programMenu >
 mthd := self theSingleSelectedMethod.
 (mthd notNil and:[ (mSel := mthd selector) notNil]) ifTrue:[
-	"/ JV: Following code should be language-specific. For Smalltalk, use the old code.
+"/ JV: Following code should be language-specific. For Smalltalk, use the old code.
-	"/ For the rest, delegate to the language's toolbox (if any)
+"/ For the rest, delegate to the language's toolbox (if any)
-	mthd programmingLanguage isSmalltalk ifFalse:[
+mthd programmingLanguage isSmalltalk ifFalse:[
-	    | toolbox |
+| toolbox |
-	    toolbox := mthd programmingLanguage toolbox.
+toolbox := mthd programmingLanguage toolbox.
-	    toolbox isNil ifTrue:[
+toolbox isNil ifTrue:[
-		m addItem:((MenuItem label: (resources string: 'Not supported for %1 (no toolbox)'with: mthd programmingLanguage name))
+m addItem:((MenuItem label: (resources string: 'Not supported for %1 (no toolbox)'with: mthd programmingLanguage name))
-			    enabled: false).
+enabled: false).
-		^ m.
+^ m.
-	    ].
+].
-	    toolbox browser: self.
+toolbox browser: self.
-	    ^ toolbox messagesMenuFor:actionSelector
+toolbox environment: environment.
-			withMethods: (Array with: mthd)
+^ toolbox messagesMenuFor:actionSelector
-			withMethodSelectors:withCurrentSelector
+withMethods: (Array with: mthd)
-			withSentSelectors: true
+withMethodSelectors:withCurrentSelector
-			withSelfSelectorsOnly: selfSendsOnly
+withSentSelectors: true
-	].
+withSelfSelectorsOnly: selfSendsOnly
+].
-	needSep := false.
+needSep := false.
-	contractedSelector := mSel contractTo:80.
+contractedSelector := mSel contractTo:80.
-	withCurrentSelector ifTrue:[
-	    item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
+withCurrentSelector ifTrue:[
-	    item itemValue:actionSelector argument:mSel.
+item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
-	    m addItem:item.
+item itemValue:actionSelector argument:mSel.
-	    needSep := true.
+m addItem:item.
-	].
+needSep := true.
+].
 "/            true "withInstanceProtocolOnly" ifTrue:[
 "/                item := MenuItem label:(resources string:' %1 - Instance Protocol Only' with:contractedSelector).
 "/                item value:actionSelector.
 "/                item argument:(#instanceProtocolOnly -> mSel).
 "/                m addItem:item.
 "/                item value:actionSelector.
 "/                item argument:(#classProtocolOnly -> mSel).
 "/                m addItem:item.
 "/            ].
-	(withLocalSenders or:[ withSenderChain or:[ withLocalImplementors or:[ withImplementorChain]]]) ifTrue:[
+(withLocalSenders or:[ withSenderChain or:[ withLocalImplementors or:[ withImplementorChain]]]) ifTrue:[
-	    needSep ifTrue:[ m addSeparator ].
+needSep ifTrue:[ m addSeparator ].
-	    needSep := false.
+needSep := false.
-	].
+].
-	withLocalSenders ifTrue:[
+withLocalSenders ifTrue:[
-	    "/ item := MenuItem label:(resources string:' %1 - Local Senders' with:contractedSelector).
+"/ item := MenuItem label:(resources string:' %1 - Local Senders' with:contractedSelector).
-	    item := MenuItem label:(resources string:'Local Senders of %1' with:contractedSelector).
+item := MenuItem label:(resources string:'Local Senders of %1' with:contractedSelector).
-	    item itemValue:#spawnLocalSendersBuffer.
+item itemValue:#spawnLocalSendersBuffer.
-	    m addItem:item. needSep := true
+m addItem:item. needSep := true
-	].
+].
-	withSenderChain ifTrue:[
+withSenderChain ifTrue:[
-	    "/ item := MenuItem label:(resources string:' %1 - Sender Chain' with:contractedSelector).
+"/ item := MenuItem label:(resources string:' %1 - Sender Chain' with:contractedSelector).
-	    item := MenuItem label:(resources string:'Sender Chain of %1' with:contractedSelector).
+item := MenuItem label:(resources string:'Sender Chain of %1' with:contractedSelector).
-	    item itemValue:#spawnSenderChainBuffer.
+item itemValue:#spawnSenderChainBuffer.
-	    m addItem:item. needSep := true
+m addItem:item. needSep := true
-	].
+].
-	(withCallersOfThisMethod and:[mthd isInstrumented]) ifTrue:[
+(withCallersOfThisMethod and:[mthd isInstrumented]) ifTrue:[
-	    item := MenuItem label:(resources string:'Callers of this %1' with:contractedSelector).
+item := MenuItem label:(resources string:'Callers of this %1' with:contractedSelector).
-	    item itemValue:#spawnCallersBuffer.
+item itemValue:#spawnCallersBuffer.
-	    m addItem:item. needSep := true
+m addItem:item. needSep := true
-	].
+].
-	withLocalImplementors ifTrue:[
+withLocalImplementors ifTrue:[
-	    item := MenuItem label:(resources string:'Local Implementors of %1' with:contractedSelector).
+item := MenuItem label:(resources string:'Local Implementors of %1' with:contractedSelector).
-	    item itemValue:#spawnLocalImplementorsBuffer.
+item itemValue:#spawnLocalImplementorsBuffer.
-	    m addItem:item. needSep := true
+m addItem:item. needSep := true
-	].
+].
-	withImplementorChain ifTrue:[
+withImplementorChain ifTrue:[
-	    item := MenuItem label:(resources string:'Implementor Chain of %1' with:contractedSelector).
+item := MenuItem label:(resources string:'Implementor Chain of %1' with:contractedSelector).
-	    item itemValue:#spawnImplementorChainBuffer.
+item itemValue:#spawnImplementorChainBuffer.
-	    m addItem:item. needSep := true
+m addItem:item. needSep := true
-	].
+].
-	withMethodsCalledByThisMethod ifTrue:[
+withMethodsCalledByThisMethod ifTrue:[
-	    item := MenuItem label:(resources string:'Methods Called by %1' with:contractedSelector).
+item := MenuItem label:(resources string:'Methods Called by %1' with:contractedSelector).
-	    item itemValue:#spawnMethodsCalledByBuffer.
+item itemValue:#spawnMethodsCalledByBuffer.
-	    m addItem:item. needSep := true
+m addItem:item. needSep := true
-	].
+].
-	selfSendsOnly ifTrue:[
+selfSendsOnly ifTrue:[
-	    l := mthd messagesSentToSelf.
+l := mthd messagesSentToSelf.
-	    l := l , (mthd messagesSentToSuper asArray collect:[:each | { each . mthd mclass superclass }]).
+l := l , (mthd messagesSentToSuper asArray collect:[:each | { each . mthd mclass superclass }]).
-	    l := l , ((mthd messagesPossiblySent
+l := l , ((mthd messagesPossiblySent
-			  select:[:sel | mthd mclass canUnderstand:sel])
+select:[:sel | mthd mclass canUnderstand:sel])
-			    asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
+asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
-	] ifFalse:[
+] ifFalse:[
-	    l := mthd messagesSent asArray.
+l := mthd messagesSent asArray.
-	    l := l , (mthd messagesPossiblySent asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
+l := l , (mthd messagesPossiblySent asArray collect:[:each | each colorizeAllWith:Color darkGrey]).
-	].
+].
-	l size > 0 ifTrue:[
+l size > 0 ifTrue:[
-	    l := l asOrderedCollection sort:[:a :b |
+l := l asOrderedCollection sort:[:a :b |
-						|sA sB|
+|sA sB|
-						sA := a isArray ifTrue:[a first] ifFalse:[a string].
+sA := a isArray ifTrue:[a first] ifFalse:[a string].
-						sB := b isArray ifTrue:[b first] ifFalse:[b string].
+sB := b isArray ifTrue:[b first] ifFalse:[b string].
-						sA < sB].
+sA < sB].
-	    needSep ifTrue:[ m addSeparator ].
+needSep ifTrue:[ m addSeparator ].
 "/            (l size > 30) ifTrue:[
 "/                l removeAllFoundIn:#(ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue:
 "/                                     whileTrue: whileFalse:
 "/                                     isNil notNil
 "/            ].
 "/            (cut := l size > 30) ifTrue:[
 "/                l := l copyTo:30
 "/            ].
-	    l do:[:eachMessageOrPair |
+l do:[:eachMessageOrPair |
-		|selector class label arg|
+|selector class label arg|
-		eachMessageOrPair isArray ifTrue:[
+eachMessageOrPair isArray ifTrue:[
-		    selector := eachMessageOrPair first.
+selector := eachMessageOrPair first.
-		    class := eachMessageOrPair second.
+class := eachMessageOrPair second.
-		    arg := eachMessageOrPair.
+arg := eachMessageOrPair.
-		] ifFalse:[
+] ifFalse:[
-		    selector := eachMessageOrPair.
+selector := eachMessageOrPair.
-		    arg := eachMessageOrPair string asSymbol.
+arg := eachMessageOrPair string asSymbol.
-		].
+].
-		label := (selector contractTo:100).
+label := (selector contractTo:100).
-		class notNil ifTrue:[
+class notNil ifTrue:[
-		    label := label , ' (super)'.
+label := label , ' (super)'.
-		].
+].
-		item := MenuItem label:(' ' , label, ' ').  "/ ' ' is a kludge - to allow '-' selector (i.e. not confuse with separator)
+item := MenuItem label:(' ' , label, ' ').  "/ ' ' is a kludge - to allow '-' selector (i.e. not confuse with separator)
-		item itemValue:actionSelector argument:arg.
+item itemValue:actionSelector argument:arg.
-		m addItem:item.
+m addItem:item.
-	    ].
+].
 "/            cut ifTrue:[
 "/                m addItem:(MenuItem label:'-').
 "/                m addItem:(MenuItem label:'<< more items ignored >>').
 "/            ]
-	]
+]
 ] ifFalse:[
-	| methodsPerLanguage |
+| methodsPerLanguage |
-	allMessagesSent := Set new.
+allMessagesSent := Set new.
-	"/ not exactly one method selected;
+"/ not exactly one method selected;
-	"/ generate a menu for all selected method's implementors and sent messages.
+"/ generate a menu for all selected method's implementors and sent messages.
-	methods := self selectedMethodsValue.
+methods := self selectedMethodsValue.
-	methods isEmptyOrNil ifTrue:[
+methods isEmptyOrNil ifTrue:[
-	    methods := OrderedCollection new.
+methods := OrderedCollection new.
-	    self selectedClassesDo:[:cls |
+self selectedClassesDo:[:cls |
-		cls methodsDo:[:eachMethod | methods add:eachMethod].
+cls methodsDo:[:eachMethod | methods add:eachMethod].
-	    ].
+].
-	].
+].
-	methodsPerLanguage := Dictionary new.
+methodsPerLanguage := Dictionary new.
-	methods do:[:each |
+methods do:[:each |
-	    (methodsPerLanguage at: each programmingLanguage ifAbsentPut:[Set new]) add: each.
+(methodsPerLanguage at: each programmingLanguage ifAbsentPut:[Set new]) add: each.
-	].
+].
-	methodsPerLanguage keysAndValuesDo:[:language :methods |
+methodsPerLanguage keysAndValuesDo:[:language :methods |
-	    language isSmalltalk ifTrue:[
+language isSmalltalk ifTrue:[
-		"/ Do it as before...
+"/ Do it as before...
-		methods do:[:eachMethod |
+methods do:[:eachMethod |
-		    mSel := eachMethod selector ? '?'.
+mSel := eachMethod selector ? '?'.
-		    contractedSelector := mSel contractTo:80.
+contractedSelector := mSel contractTo:80.
-		    item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
+item := MenuItem label:(' ' , contractedSelector , ' ').   "/ ' ' is a kludge - to allow '-' selector
-		    item itemValue:actionSelector argument:mSel.
+item itemValue:actionSelector argument:mSel.
-		    m addItem:item.
+m addItem:item.
-		    selfSendsOnly ifTrue:[
+selfSendsOnly ifTrue:[
-			allMessagesSent addAll:(eachMethod messagesSentToSelf).
+allMessagesSent addAll:(eachMethod messagesSentToSelf).
-		    ] ifFalse:[
+] ifFalse:[
-			allMessagesSent addAll:(eachMethod messagesSent).
+allMessagesSent addAll:(eachMethod messagesSent).
-		    ].
+].
-		].
+].
-	    ] ifFalse:[
+] ifFalse:[
-		"/ Not a Smalltalk, must ask toolbox
+"/ Not a Smalltalk, must ask toolbox
-		| toolbox |
+| toolbox |
-		toolbox := language toolbox.
+toolbox := language toolbox.
-		toolbox notNil ifTrue:[
+toolbox environment: environment.
-		    m addItemsFrom:
+toolbox notNil ifTrue:[
-			(toolbox messagesMenuFor:actionSelector
+m addItemsFrom:
-				    withMethods: methods
+(toolbox messagesMenuFor:actionSelector
-				    withMethodSelectors:true
+withMethods: methods
-				    withSentSelectors: false
+withMethodSelectors:true
-				    withSelfSelectorsOnly: selfSendsOnly)
+withSentSelectors: false
-		].
+withSelfSelectorsOnly: selfSendsOnly)
-	    ].
+].
-	].
+].
+].
-	needSep := true.
-	methodsPerLanguage keysAndValuesDo:[:language :methods |
+needSep := true.
-	    language isSmalltalk ifTrue:[
+methodsPerLanguage keysAndValuesDo:[:language :methods |
-		"/ Do it as before...
+language isSmalltalk ifTrue:[
-		allMessagesSent := allMessagesSent asSortedCollection.
+"/ Do it as before...
-		allMessagesSent size > 0 ifTrue:[
+allMessagesSent := allMessagesSent asSortedCollection.
-		    needSep ifTrue:[
+allMessagesSent size > 0 ifTrue:[
-			m addSeparator.
+needSep ifTrue:[
-			needSep := false.
+m addSeparator.
-		    ].
+needSep := false.
-		    allMessagesSent do:[:eachMessage |
+].
-			item := MenuItem label:(' ' , (eachMessage contractTo:100), ' ').  "/ ' ' is a kludge - to allow '-' selector
+allMessagesSent do:[:eachMessage |
-			item itemValue:actionSelector argument:eachMessage asSymbol.
+item := MenuItem label:(' ' , (eachMessage contractTo:100), ' ').  "/ ' ' is a kludge - to allow '-' selector
-			m addItem:item.
+item itemValue:actionSelector argument:eachMessage asSymbol.
-		    ].
+m addItem:item.
-		].
+].
-	    ] ifFalse:[
+].
-		"/ Not a Smalltalk, must ask toolbox
+] ifFalse:[
-		| toolbox |
+"/ Not a Smalltalk, must ask toolbox
+| toolbox |
-		toolbox := language toolbox.
-		toolbox notNil ifTrue:[
+toolbox := language toolbox.
-		    | lm |
+toolbox notNil ifTrue:[
+| lm |
-		    lm := toolbox messagesMenuFor:actionSelector
-				withMethods: methods
+lm := toolbox messagesMenuFor:actionSelector
-				withMethodSelectors:false
+withMethods: methods
-				withSentSelectors: true
+withMethodSelectors:false
-				withSelfSelectorsOnly: selfSendsOnly.
+withSentSelectors: true
-		    (lm items notEmptyOrNil and:[needSep]) ifTrue:[
+withSelfSelectorsOnly: selfSendsOnly.
-			m addSeparator.
+(lm items notEmptyOrNil and:[needSep]) ifTrue:[
-			needSep := false.
+m addSeparator.
-		    ].
+needSep := false.
-		    m addItemsFrom: lm.
+].
-		].
+m addItemsFrom: lm.
-	    ].
+].
-	].
+].
+].
 ].
 ^ m
 "Created: / 27-04-2010 / 15:05:52 / cg"
 "Modified: / 30-07-2013 / 15:53:58 / cg"
-"Modified: / 01-09-2013 / 18:25:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 06-09-2013 / 19:37:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 messagesMenuFor:actionSelector withSenderChain:withSenderChain withImplementorChain:withImplementorChain
 ^ self
 	messagesMenuFor:actionSelector
 "Created: / 19-04-2011 / 14:29:47 / cg"
 "Created: / 12-10-2011 / 20:54:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 19-10-2011 / 16:48:31 / cg"
 ! !
 !NewSystemBrowser methodsFor:'menus-dynamic-popup'!
 categoryPopUpMenu
 "return the popUpMenu for the class-category-list view"
 |orgMode cls namespaces nsName cat pkg holder newValue doSwitchMeta mthd answer
 ns classes|
 aClass isNil ifTrue:[
-	^ self
+^ self
 ].
 aSelector notNil ifTrue:[
-	mthd := aClass compiledMethodAt:aSelector.
+mthd := aClass compiledMethodAt:aSelector.
 ].
 (navigationState isMethodListBrowser
 or:[navigationState isMethodBrowser]) ifTrue:[
-	"/ must check if that method is in the list ...
+"/ must check if that method is in the list ...
-	mthd isNil ifTrue:[
+mthd isNil ifTrue:[
 "/            (self confirm:'Add a buffer for the class ?' withCRs) ifFalse:[
 "/                ^ self
 "/            ].
-	    self spawnFullBrowserInClass:aClass selector:nil in:#newBuffer.
+self spawnFullBrowserInClass:aClass selector:nil in:#newBuffer.
-	    ^ self
+^ self
-	].
+].
-	navigationState methodListApplication isNil ifTrue:[
+navigationState methodListApplication isNil ifTrue:[
-	    self spawnFullBrowserInClass:aClass selector:aSelector in:#newBuffer.
+self spawnFullBrowserInClass:aClass selector:aSelector in:#newBuffer.
-	    ^ self
+^ self
-	].
+].
-	(navigationState methodList includesIdentical:mthd) ifFalse:[
+(navigationState methodList includesIdentical:mthd) ifFalse:[
-	    answer := OptionBox request:'Method not in list.\\Add a buffer for it ?' withCRs
+answer := OptionBox request:'Method not in list.\\Add a buffer for it ?' withCRs
-			label:'New Browser ?'
+label:'New Browser ?'
-			image:(WarningBox iconBitmap)
+image:(WarningBox iconBitmap)
-			buttonLabels:(resources array:#('New Browser' 'Add Buffer' 'Cancel'))
+buttonLabels:(resources array:#('New Browser' 'Add Buffer' 'Cancel'))
-			values:#(#newBrowser #newBuffer nil)
+values:#(#newBrowser #newBuffer nil)
-			default:#newBuffer
+default:#newBuffer
-			onCancel:nil.
+onCancel:nil.
-	    answer notNil ifTrue:[
+answer notNil ifTrue:[
-		self spawnFullBrowserInClass:aClass selector:aSelector in:answer.
+self spawnFullBrowserInClass:aClass selector:aSelector in:answer.
-	    ].
+].
-	    ^ self
+^ self
-	].
+].
-	self selectedMethods value:(OrderedCollection with:mthd).
+self selectedMethods value:(OrderedCollection with:mthd).
-	^ self
+^ self
 ].
+mthd isNil ifTrue:[
+self selectedMethods value:(OrderedCollection new).
+] ifFalse:[
+self selectedMethods value:(OrderedCollection with:mthd).
+].
 (navigationState isClassBrowser) ifTrue:[
-	"/ must check if that class is in the list ...
+"/ must check if that class is in the list ...
-	((navigationState classList value ? #()) includesIdentical:aClass) ifFalse:[
+((navigationState classList value ? #()) includesIdentical:aClass) ifFalse:[
-	    navigationState isSingleClassBrowser ifTrue:[
+navigationState isSingleClassBrowser ifTrue:[
-		navigationState classList value:(Array with:aClass).
+navigationState classList value:(Array with:aClass).
-	    ] ifFalse:[
+] ifFalse:[
-		(self confirm:'Class not in list.\\Add a buffer for it ?' withCRs) ifTrue:[
+(self confirm:'Class not in list.\\Add a buffer for it ?' withCRs) ifTrue:[
-		    self spawnFullBrowserInClass:aClass selector:aSelector in:#newBuffer.
+self spawnFullBrowserInClass:aClass selector:aSelector in:#newBuffer.
-		].
+].
-		^ self
+^ self
-	    ].
+].
-	].
+].
-	self selectedClasses value:(OrderedCollection with:aClass).
+self selectedClasses value:(OrderedCollection with:aClass).
-	^ self
+^ self
 ].
 (navigationState isProtocolBrowser) ifTrue:[
-	(self confirm:'Add a buffer for it ?' withCRs) ifTrue:[
+(self confirm:'Add a buffer for it ?' withCRs) ifTrue:[
-	    self spawnFullBrowserInClass:aClass selector:aSelector in:#newBuffer.
+self spawnFullBrowserInClass:aClass selector:aSelector in:#newBuffer.
-	].
+].
-	^ self
+^ self
 ].
 orgMode := self organizerMode value.
 "/ if the class is a namespace, ask if mode should be changed
 (aClass isNameSpace and:[aClass ~~ Smalltalk]) ifTrue:[
-	orgMode ~~ OrganizerCanvas organizerModeNamespace ifTrue:[
+orgMode ~~ OrganizerCanvas organizerModeNamespace ifTrue:[
-	    answer := self
+answer := self
-			confirmWithCancel:(resources string:'Browser: %1 is a namespace - switch organizers display mode ?' with:aClass name)
+confirmWithCancel:(resources string:'Browser: %1 is a namespace - switch organizers display mode ?' with:aClass name)
-			defaultAnswer:false.
+defaultAnswer:false.
-	    answer isNil ifTrue:[
+answer isNil ifTrue:[
-		AbortOperationRequest raise.
+AbortOperationRequest raise.
-		^ self
+^ self
-	    ].
+].
-	    answer ifTrue:[
+answer ifTrue:[
-		self organizerMode value:(OrganizerCanvas organizerModeNamespace).
+self organizerMode value:(OrganizerCanvas organizerModeNamespace).
-		orgMode := self organizerMode value.
+orgMode := self organizerMode value.
-	    ] ifFalse:[
+] ifFalse:[
-		((self selectedClassesValue) contains:[:cls | cls nameSpace == aClass]) ifTrue:[^ self ].
+((self selectedClassesValue) contains:[:cls | cls nameSpace == aClass]) ifTrue:[^ self ].
-		"/ select the first class of that namespace
+"/ select the first class of that namespace
-		classes := aClass allClasses.
+classes := aClass allClasses.
-		classes notEmpty ifTrue:[
+classes notEmpty ifTrue:[
-		    self switchToClass:(classes first) selector:nil.
+self switchToClass:(classes first) selector:nil.
-		    ^ self.
+^ self.
-		]
+]
-	    ]
+]
-	].
+].
 ].
 "/ if the class is unloaded, turn hideUnloaded off
 (aClass isLoaded not
 and:[self hideUnloadedClasses value == true]) ifTrue:[
-	self hideUnloadedClasses value:false
+self hideUnloadedClasses value:false
 ].
 doSwitchMeta := true.
 "/ FIX bug in protocol-list; will not update selection otherwise ...
 self immediateUpdate value:true.
 namespaces := self selectedNamespaces value ? #().
 ns := aClass topNameSpace.
 ns notNil ifTrue:[nsName := ns name].
 (namespaces includes:nsName) ifFalse:[
-	(namespaces includes:(NavigatorModel nameListEntryForALL)) ifFalse:[
+(namespaces includes:(NavigatorModel nameListEntryForALL)) ifFalse:[
-	    self selectedNamespaces value:(OrderedCollection with: NavigatorModel nameListEntryForALL)
+self selectedNamespaces value:(OrderedCollection with: NavigatorModel nameListEntryForALL)
-	]
+]
 ].
 "/    namespaces := self nameSpaceFilter value ? #().
 "/    (namespaces includes:aClass nameSpace name) ifFalse:[
 "/        (namespaces includes:(NavigatorModel nameListEntryForALL)) ifFalse:[
 "/            self nameSpaceFilter value:(OrderedCollection with: NavigatorModel nameListEntryForALL)
 "/        ]
 "/    ].
 orgMode == OrganizerCanvas organizerModeCategory ifTrue:[
-	cat := aClass category ? '* no category *'.
+cat := aClass category ? '* no category *'.
-	(self selectedCategoriesValue includes:cat) ifFalse:[
+(self selectedCategoriesValue includes:cat) ifFalse:[
-	    self selectedCategories value:(OrderedCollection with:cat).
+self selectedCategories value:(OrderedCollection with:cat).
-	]
+]
 ] ifFalse:[ orgMode == OrganizerCanvas organizerModeNamespace ifTrue:[
-	aClass isNameSpace ifTrue:[
+aClass isNameSpace ifTrue:[
-	    nsName := aClass name.
+nsName := aClass name.
-	] ifFalse:[
+] ifFalse:[
-	    nsName := aClass nameSpace name.
+nsName := aClass nameSpace name.
-	].
+].
-	(self selectedNamespacesValue includes:nsName) ifFalse:[
+(self selectedNamespacesValue includes:nsName) ifFalse:[
-	    self selectedNamespaces value:(OrderedCollection with:nsName).
+self selectedNamespaces value:(OrderedCollection with:nsName).
-	]
+]
 ] ifFalse:[ orgMode == OrganizerCanvas organizerModeProject ifTrue:[
-	pkg := aClass package.
+pkg := aClass package.
-	holder := self selectedProjects.
+holder := self selectedProjects.
-	newValue := holder value ? #().
+newValue := holder value ? #().
-	(newValue includes:pkg) ifFalse:[
+(newValue includes:pkg) ifFalse:[
-	    newValue := OrderedCollection with:pkg.
+newValue := OrderedCollection with:pkg.
-	].
+].
-	mthd notNil ifTrue:[
+mthd notNil ifTrue:[
-	    "/ careful - the method could be in an extension ...
+"/ careful - the method could be in an extension ...
-	    mthd package ~= pkg ifTrue:[
+mthd package ~= pkg ifTrue:[
-		(newValue includes:mthd package) ifFalse:[
+(newValue includes:mthd package) ifFalse:[
-		    newValue := newValue asOrderedCollection.
+newValue := newValue asOrderedCollection.
-		    newValue add:mthd package.
+newValue add:mthd package.
-		].
+].
-	    ].
+].
-	].
+].
-	newValue ~= holder value ifTrue:[
+newValue ~= holder value ifTrue:[
-	    holder value:newValue.
+holder value:newValue.
-	].
+].
 ] ifFalse:[ (orgMode == OrganizerCanvas organizerModeClassHierarchy
-		 or:[orgMode == OrganizerCanvas organizerModeClassInheritance]) ifTrue:[
+or:[orgMode == OrganizerCanvas organizerModeClassInheritance]) ifTrue:[
-	"/ make sure, that the class is in the hierarchy;
+"/ make sure, that the class is in the hierarchy;
-	"/ if required, update the hierarchy.
+"/ if required, update the hierarchy.
-	holder := self classHierarchyTopClass.
+holder := self classHierarchyTopClass.
-	cls := holder value.
+cls := holder value.
-	(cls isNil or:[(cls withAllSuperclasses includesIdentical:aClass) not]) ifTrue:[
+(cls isNil or:[(cls withAllSuperclasses includesIdentical:aClass) not]) ifTrue:[
-	    holder value:aClass.
+holder value:aClass.
-	].
+].
-	doSwitchMeta := false.
+doSwitchMeta := false.
 ]]]].
 doSwitchMeta ifTrue:[
-	self meta value:(aClass isMeta).
+self meta value:(aClass isMeta).
 ].
 (self selectedClassesValue includesIdentical:aClass) ifFalse:[
-	self selectedClasses value:(OrderedCollection with:aClass).
+self selectedClasses value:(OrderedCollection with:aClass).
 ].
 mthd notNil ifTrue:[
-	(self selectedProtocolsValue contains:[:cat | cat string = mthd category]) ifFalse:[
-	    self selectProtocols:(OrderedCollection with:mthd category).
+(self selectedProtocolsValue contains:[:cat | (cat isNil and:[mthd category isNil]) or:[cat string = mthd category]]) ifFalse:[
-	].
+self selectProtocols:(OrderedCollection with:mthd category).
-	self switchToMethod:mthd.
+].
+self switchToMethod:mthd.
 ] ifFalse:[
-	self switchToSelector:aSelector.
+self switchToSelector:aSelector.
 ].
 self immediateUpdate value:false.
 updateHistory ifTrue:[
-	self addToHistory:aClass selector:aSelector
+self addToHistory:aClass selector:aSelector
 ].
 self normalLabel.
 "/ self selectedMethods value:nil.
 self enqueueDelayedClassSelectionChange.
 "Created: / 22-02-2008 / 09:05:51 / janfrog"
 "Modified: / 27-02-2008 / 16:45:21 / janfrog"
 "Modified: / 28-02-2012 / 16:53:17 / cg"
+"Modified: / 10-09-2013 / 14:59:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 switchToClassNameMatching:aMatchString
 |className class|
 switchToSelector:aSelector
 |mthd cls orgMode pkg holder|
 aSelector notNil ifTrue:[
-	(cls := self theSingleSelectedClass) notNil ifTrue:[
+(cls := self theSingleSelectedClass) notNil ifTrue:[
-	    mthd := cls compiledMethodAt:aSelector asSymbol.
+mthd := cls compiledMethodAt:aSelector asSymbol.
-	    mthd notNil ifTrue:[
+mthd notNil ifTrue:[
-		"/ care for method being in another package
+"/ care for method being in another package
-		orgMode := self organizerMode value.
+orgMode := self organizerMode value.
-		orgMode == OrganizerCanvas organizerModeProject ifTrue:[
+orgMode == OrganizerCanvas organizerModeProject ifTrue:[
-		    pkg := mthd package.
+pkg := mthd package.
-		    holder := self selectedProjects.
+holder := self selectedProjects.
-		    ((holder value ? #()) includes:pkg) ifFalse:[
+((holder value ? #()) includes:pkg) ifFalse:[
-			holder value:(Array with:pkg).
+holder value:(Array with:pkg).
-		    ]
+]
-		].
+].
-		(self selectedProtocolsValue contains:[:p | p string = mthd category]) ifFalse:[
+(self selectedProtocolsValue contains:[:p | (p isNil and:[mthd category isNil]) or:[p string = mthd category]]) ifFalse:[
-		    (self selectedProtocolsValue includes:BrowserList nameListEntryForALL) ifFalse:[
+(self selectedProtocolsValue includes:BrowserList nameListEntryForALL) ifFalse:[
-			self selectProtocols:(Array with:mthd category).
+self selectProtocols:(Array with:mthd category).
-		    ]
+]
-		].
+].
-		self theSingleSelectedMethod ~~ mthd ifTrue:[
+self theSingleSelectedMethod ~~ mthd ifTrue:[
-		    self selectedMethods value:(Array with:mthd).
+self selectedMethods value:(Array with:mthd).
-		]
+]
-	    ]
+]
-	]
+]
 ].
-"Created: / 4.2.2000 / 23:20:34 / cg"
+"Created: / 04-02-2000 / 23:20:34 / cg"
-"Modified: / 5.2.2000 / 23:07:10 / cg"
+"Modified: / 05-02-2000 / 23:07:10 / cg"
+"Modified: / 10-09-2013 / 14:58:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !NewSystemBrowser methodsFor:'private-buffers'!
 removeBuffer:nr
 |s|
 s := '' writeStream.
 (aClass isRealNameSpace) ifTrue:[
-	aClass fileOutDefinitionOn:s
+aClass fileOutDefinitionOn:s
 ] ifFalse:[
-	aClass theNonMetaclass isJavaClass ifTrue:[
+aClass theNonMetaclass isJavaClass ifTrue:[
-	    | src |
+| src |
-	    src := aClass theNonMetaclass source.
+src := aClass theNonMetaclass source.
-	    src notNil ifTrue:[ ^ src ].
+src notNil ifTrue:[ ^ src ].
-	    s nextPutLine: '// *** WARNING ***'.
+s nextPutLine: '// *** WARNING ***'.
-	    s nextPutLine: '// Following code has been decompiled from loaded class'.
+s nextPutLine: '// Following code has been decompiled from loaded class'.
-	    s nextPutLine: '// *** WARNING ***'.
+s nextPutLine: '// *** WARNING ***'.
-	    s cr.
+s cr.
-	    aClass fileOutDefinitionOn:s
+aClass theNonMetaclass fileOutDefinitionOn:s
-	] ifFalse:[
+] ifFalse:[
-	    aClass isMeta ifTrue:[
+aClass isMeta ifTrue:[
-		aClass
+aClass
-		    fileOutClassInstVarDefinitionOn:s
+fileOutClassInstVarDefinitionOn:s
-		    withNameSpace:true.
+withNameSpace:true.
-	    ] ifFalse:[
+] ifFalse:[
-		"/
+"/
-		"/ here, show it with a nameSpace pragma
+"/ here, show it with a nameSpace pragma
-		"/ and prefer short names.
+"/ and prefer short names.
-		"/
+"/
-		aClass
+aClass
-		    basicFileOutDefinitionOn:s
+basicFileOutDefinitionOn:s
-		    withNameSpace:true
+withNameSpace:true
-		    withPackage:false
+withPackage:false
-	    ].
+].
-	].
+].
 ].
 ^ s contents withTabsExpanded.
 "Modified: / 10-11-2006 / 17:13:54 / cg"
-"Modified: / 30-03-2012 / 20:08:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-09-2013 / 01:31:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 commentOrDocumentationStringFromClass:aClass
 "the classes documentation-method's comment, or nil"
 "
 add documentation as a comment, if there is any
 "
 info := self commentOrDocumentationStringFromClass:aClass.
-text := definition.
 info notNil ifTrue:[
-text := text,(Character cr),info.
+text := definition,(Character cr),info.
 ].
 self codeHolder setValue:text.
 self codeView notNil ifTrue:[
 self codeView setContents:text
 ].
 ].
 self updatePackageInfoForClass:aClass.
 "Modified: / 27-07-2012 / 22:26:12 / cg"
-"Modified: / 05-07-2012 / 21:41:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-09-2013 / 01:34:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified (format): / 10-09-2013 / 01:34:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 showClassDocumentation
 |cls text|
 self showInfo:text.
 !
 showCode:aString
-"No, do not scroll to the top if the code is already displayed!!"
+"/Do not scroll to the top if the code is already displayed!!"
 self showCode:aString scrollToTop:(self codeView contents string ~= aString)
 "Modified: / 01-03-2000 / 11:38:33 / cg"
-"Modified: / 04-08-2013 / 11:44:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-09-2013 / 01:33:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 showCode:codeString scrollToTop:doScrollToTop
 |codeView code shownCode prevCode|
 showMethodsCode:mthd scrollToTop:doScrollToTop
 |code codeView doAutoFormat doSyntaxColoring doUpdateCode prevMthd doShowFullClassSource |
 doAutoFormat := self doAutoFormat value and:[RBFormatter notNil].
-doShowFullClassSource := self navigationState isFullClassSourceBrowser or:[mthd isJavaMethod and:[JavaMethod showFullSource]].
+doShowFullClassSource := self navigationState isFullClassSourceBrowser
+or:[mthd isJavaMethod].
 doUpdateCode := true.
 codeView := self codeView.
 self assert:codeView notNil.
 code := self sourceOfMethod:mthd.
 code isText ifTrue:[
+"/Already done...
 doSyntaxColoring := false.
 ] ifFalse:[
 "/Do no coloring here if CodeView2 is used,
 "/since CodeView2 itself cares about the coloring!!
 "/Not working correctly -> do the coloring until fixed in CodeView2
-"JV: Enable is, otherwise I won't notice that it does not work
+"/JV: Then make a bug report because otherwise it won't be
-correctly!!"
+"/    ever fixed.
-(UserPreferences current useCodeView2In: #Browser) ifTrue:[
+"(UserPreferences current useCodeView2In: #Browser)"false ifTrue:[
 doSyntaxColoring := code size < 2000
 ] ifFalse:[
 doSyntaxColoring := self doSyntaxColoring value == true.
 ].
 ].
 mthd isSynthetic not ifTrue:[
 prevMthd := navigationState lastMethodShownInCodeView.
 prevMthd notNil ifTrue:[
 doUpdateCode := prevMthd isSynthetic or:[mthd mclass ~~ prevMthd mclass]
 ].
 ].
 ].
 doUpdateCode ifTrue:[
 doSyntaxColoring ifTrue:[
 "/ immediate coloring, if code is not too large;
 ].
 ].
 navigationState lastMethodShownInCodeView: mthd.
 "/ scroll, for file-based classes (java, ruby, etc.)
-mthd sourceLineNumber ~~ 1 ifTrue:[
+doShowFullClassSource ifTrue:[
-doScrollToTop ifTrue:[
+mthd sourceLineNumber ~~ 1 ifTrue:[
-codeView scrollToLine:mthd sourceLineNumber.
+doScrollToTop "ifTrue:" ifFalse:[
+codeView scrollToLine:mthd sourceLineNumber
+]
 ].
 ].
 self codeAspect:(code ifNil:[nil] ifNotNil:[SyntaxHighlighter codeAspectMethod]).
 self normalLabel.
 self updatePackageInfoForMethod:mthd.
 "Created: / 01-03-2000 / 11:38:57 / cg"
 "Modified: / 27-07-2012 / 22:18:18 / cg"
-"Modified: / 14-09-2013 / 13:22:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-09-2013 / 01:29:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 showNothing
 self setAcceptActionForNothing.
 self showCode:nil.
 	].
 	(what at:2) size ~~ 1 ifTrue:[
 	    self builder window beep
 	].
 ].
+box enterField
+onKey:#CursorDown
+leaveWith:[
+box listView windowGroup focusView:box listView byTab:true.
+box listView hasSelection ifFalse:[
+box listView selectFirst
+] ifTrue:[
+box listView selectNext
+]
+].
 box open.
 ^ retVal
 "Created: / 29.2.2000 / 10:53:09 / cg"
 !
 projectListApp
 ^ navigationState projectListApplication
 ! !
 !NewSystemBrowser methodsFor:'private-history'!
 lastSearchPatterns
 ^ self class lastSearchPatterns
 !
 !
 explainInCode:code short:short withTimeout:withTimeout
 "explain the selection or, if there is none, the node under the cursor"
-|explanation explainTookTooLong|
+|explanation explainTookTooLong html|
 explainTookTooLong := false.
 withTimeout ifTrue:[
-	explanation :=
+explanation :=
-	    [ self explanationForCode:code short:short ]
+[ self explanationForCode:code short:short ]
-		    valueWithWatchDog:[explainTookTooLong := true]
+valueWithWatchDog:[explainTookTooLong := true]
-		    afterMilliseconds:200.
+afterMilliseconds:200.
 ] ifFalse:[
-	explanation := self explanationForCode:code short:short
+explanation := self explanationForCode:code short:short
 ].
 self activityNotification:nil.
 explainTookTooLong ifTrue:[
-	self showInfo:'Explain took too long - cancelled.'.
+self showInfo:'Explain took too long - cancelled.'.
-	^ self.
+^ self.
 ].
 explanation notEmptyOrNil ifTrue:[
-	short ifTrue:[
+short ifTrue:[
-	    self showInfo:explanation
+self showInfo:explanation
-	] ifFalse:[
+] ifFalse:[
-	    self information:explanation
+explanation isArray ifTrue:[
-	].
+html := explanation detect:[:entry | entry key == #html] ifNone:nil.
-	builder window flush
+html notNil ifTrue:[
+"/ todo: need a stripped down viewer (small, popup, modal)
+HTMLDocumentView openFullOnText:(html value).
+^ self.
+].
+explanation := explanation first value.
+].
+self information:explanation
+].
+builder window flush
 ].
 "Created: / 05-09-2006 / 10:37:04 / cg"
 !
 ! !
 !NewSystemBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1975 2013-09-05 22:48:24 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1984 2013-09-16 15:12:57 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1975 2013-09-05 22:48:24 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1984 2013-09-16 15:12:57 cg Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'
 !
 version_SVN
-^ '$Id: Tools__NewSystemBrowser.st,v 1.1975 2013-09-05 22:48:24 cg Exp $'
+^ '$Id: Tools__NewSystemBrowser.st,v 1.1984 2013-09-16 15:12:57 cg Exp $'
 ! !
 NewSystemBrowser initialize!

branch	jv
changeset 13609	8b400fde34ef
parent 13607	b9f60b13662a
parent 13555	11cfb7fdaee7
child 13610	c9b5724788bc