hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:dc5e958a20dc
+:cf319f2e56d0
 "{ Package: 'stx:libtool' }"
 "{ NameSpace: Tools }"
 BrowserList subclass:#VariableList
-	instanceVariableNames:'variableList classHolder showClassVars sortVariablesByName
+	instanceVariableNames:'classHolder groupVariablesByInheritance selectedVariableEntries
-		selectedVariableEntries showWarningAboutMissingEntryInXmlSpec'
+		showClassVars showWarningAboutMissingEntryInXmlSpec
+		sortVariablesByName variableList'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Browsers-New'
 !
 Object subclass:#VariableEntry
 	instanceVariableNames:'label application class name type icon sortingByNameHolder
-		classShown'
+		classShown groupByInheritanceHolder'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:VariableList
 !
 #selectionChangeCondition
 #updateTrigger
 #showClassVarsInVariableList
 #slaveMode
 #sortVariablesByName
+#groupVariablesByInheritance
 ).
 "Modified: / 24-02-2014 / 10:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 defaultSlaveModeValue
 ^ false.
 !
+groupVariablesByInheritance
+"/ groupVariablesByInheritance and sortVariablesByName form a 3-state value
+"/      groupVariablesByInheritance sortVariablesByName
+"/                  T                   T                   - sort within each defining class
+"/                  T                   F                   - by inst-order grouped by defining class
+"/                  F                   T                   - show all of them in one big sorted list
+"/                  F                   F                   - useless - show all of them by inst-order
+groupVariablesByInheritance isNil ifTrue:[
+groupVariablesByInheritance := true asValue.
+groupVariablesByInheritance addDependent:self
+].
+^ groupVariablesByInheritance
+!
+groupVariablesByInheritance:aValueHolder
+"/ self assert:(aValueHolder value isBoolean).
+groupVariablesByInheritance notNil ifTrue:[
+groupVariablesByInheritance removeDependent:self
+].
+groupVariablesByInheritance := aValueHolder.
+groupVariablesByInheritance notNil ifTrue:[
+groupVariablesByInheritance addDependent:self
+].
+!
 selectedVariableEntries
 <resource: #uiAspect>
 "automatically generated by UIPainter ..."
 ^ false
 "/ ^ true
 !
 sortVariablesByName
+"/ groupVariablesByInheritance and sortVariablesByName form a 3-state value
+"/      groupVariablesByInheritance sortVariablesByName
+"/                  T                   T                   - sort within each defining class
+"/                  T                   F                   - by inst-order grouped by defining class
+"/                  F                   T                   - show all of them in one big sorted list
+"/                  F                   F                   - useless - show all of them by inst-order
 sortVariablesByName isNil ifTrue:[
-	sortVariablesByName := false asValue.
+sortVariablesByName := false asValue.
-	sortVariablesByName addDependent:self
+sortVariablesByName addDependent:self
 ].
 ^ sortVariablesByName
 !
 sortVariablesByName:aValueHolder
 changedObject == showClassVars ifTrue:[
 self invalidateList.
 ^ self.
 ].
 changedObject == sortVariablesByName ifTrue:[
+self invalidateList.
+^ self.
+].
+changedObject == groupVariablesByInheritance ifTrue:[
 self invalidateList.
 ^ self.
 ].
 changedObject == environment ifTrue:[
 (something == #projectOrganization) ifTrue:[^ self].
 "Modified: / 15-07-2011 / 18:32:47 / cg"
 "Modified: / 22-06-2012 / 13:17:28 / sr"
 !
 listEntryForClass: cls name:name
+^ self listEntryForClass: cls name:name info:nil
-"  (showWarningAboutMissingEntryInXmlSpec not
+!
-and:[Expecco::ExpeccoXMLDecoder notNil
-and:[cls canUnderstand: #xmlSpecFor:]]) ifTrue:
+listEntryForClass: cls name:name info: classInfoOrNil
-[| hasSpecEntry |
+| entry |
-hasSpecEntry := false.
-(Expecco::ExpeccoXMLDecoder xmlSpecForObject:cls basicNew)
+entry := Tools::VariableList::VariableEntry application: self class: cls name: name.
-do:[:spec|spec getter = name ifTrue:
-[
-hasSpecEntry := true]].
-showWarningAboutMissingEntryInXmlSpec := hasSpecEntry not].    "
-|entry|
-entry := VariableEntry application: self class: cls name: name.
 entry sortingByNameHolder:sortVariablesByName.
-^ entry
+entry groupByInheritanceHolder:groupVariablesByInheritance.
+classInfoOrNil notNil ifTrue:[
-"Created: / 12-04-2011 / 15:41:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+entry type: (classInfoOrNil infoForInstvarOrNil: name).
-"Modified: / 12-04-2011 / 21:36:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-listEntryForClass: cls name:name info: classInfo
-| nm entry |
-nm := name.
-entry := Tools::VariableList::VariableEntry application: self class: cls name: nm.
-entry sortingByNameHolder:sortVariablesByName.
-classInfo notNil ifTrue:[
-entry type: (classInfo infoForInstvarOrNil: name).
 ].
 ^entry
 "Created: / 27-11-2011 / 17:17:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 07-10-2013 / 08:28:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listOfVariables
 |nameList numClasses classes class commonSubclass showingClassVars
-sortByName classesAlreadyProcessed hasSmallSense smallSenseManager info |
+sortByName groupByInheritance classesAlreadyProcessed hasSmallSense smallSenseManager info |
 classHolder isNil ifTrue:[
 "/ testing
 ^ #()
 ].
 smallSenseManager := (Smalltalk at: #'SmallSense::Manager') instance.
 ].
 showingClassVars := self showClassVarsInVariableList value == true.
 sortByName := self sortVariablesByName value.
-"/ self assert:(sortByName isBoolean).
+groupByInheritance := self groupVariablesByInheritance value.
+self assert:(sortByName isBoolean).
+self assert:(groupByInheritance isBoolean).
 classes := classHolder value.
 (numClasses := classes size) == 0 ifTrue:[^ #() ].
 numClasses > 1 ifTrue:[
 "/ multiple classes - see if there is a common subclass ...
 (hasSmallSense and:[showingClassVars not]) ifTrue:[
 info := smallSenseManager infoForClassOrNil: cls.
 ].
 varNames := showingClassVars ifTrue:[ cls classVarNames ] ifFalse:[ cls instVarNames ].
 classShown := (cls ~~ class). "/ only append the class in the shown name, if the var is inherited
+sortByName ifTrue:[
+varNames sort.
+].
 varNames reversed do:[:varName|
 |entry|
 nameList addFirst: (entry := self listEntryForClass: cls name: varName info: info).
 classShown ifFalse:[ entry classShown:classShown ].
 ].
-sortByName ifFalse:[
+groupByInheritance ifTrue:[
-nameList addFirst:(("'----- ' , "cls nameInBrowser" , ' -----'") asText colorizeAllWith: Color gray).
+nameList addFirst:(("'----- ' , "cls nameInBrowser" , ' -----'") withColor: Color gray).
 ]
 ].
 ].
 ].
 ].
-(numClasses > 1 or:[sortByName]) ifTrue:[
+(numClasses > 1 or:[sortByName and:[groupByInheritance not]]) ifTrue:[
 nameList := nameList asSortedCollection:[:a :b|a name < b name].
 ].
 ^ nameList
 "Created: / 05-02-2000 / 13:42:11 / cg"
 classShown:aBoolean
 classShown := aBoolean.
 !
+groupByInheritanceHolder:aValueHolder
+"/ is there a need for a valueHolder?
+groupByInheritanceHolder := aValueHolder.
+!
 icon
 icon isNil ifTrue:[
 icon := application iconInBrowserForVariable: name in: class.
 icon isNil ifTrue:[icon := #NOICON].
 ].
 label
 label isNil ifTrue:[
 label := name.
 type notNil ifTrue:[
-label := (label , ' ' ,  (type displayString colorizeAllWith: Color brown))
+label := (label , ' ' ,  (type displayString withColor: Color brown))
 ] ifFalse:[
 "/ Hack for Java classes to display field type
 class theNonMetaclass isJavaClass ifTrue:[
 | field |
 field := class theNonMetaclass lookupFieldFor:name static: (class isMetaclass) onlyPublic: false.
 field notNil ifTrue:[
 label := label asText ,
 ' ' ,
 (('< ' , (JavaMethod fieldTypeFromStream: (field descriptor readStream) in: class theNonMetaclass javaPackage) , ' >')
-asText colorizeAllWith: Color brown).
+withColor: Color brown).
 ].
 ].
 ].
 ].
 ^label
 labelWithClass
 |l|
 l := self label.
 class notNil ifTrue:[
-^ label,' (' ,(class nameWithoutPrefix colorizeAllWith: Color gray),')'
+^ label,' (' ,(class nameWithoutPrefix withColor: Color gray),')'
 ].
 ^label
 !
 name
 name:aString
 name := aString.
 !
-sortingByNameHolder:something
+sortingByNameHolder:aValueHolder
-sortingByNameHolder := something.
+"/ is there a need for a valueHolder?
+sortingByNameHolder := aValueHolder.
 !
 string
 ^name
 icn := self icon.
 icn ~~ #NOICON ifTrue:[
 icn displayOn:aGC x:x + 1 y:y - icn height.
 ].
-shownLabel := ((classShown ? true) and:[sortingByNameHolder value])
+shownLabel := ((classShown ? true) and:[sortingByNameHolder value and:[groupByInheritanceHolder value not]])
 ifTrue:[ self labelWithClass ]
 ifFalse: [ self label ].
 shownLabel displayOn:aGC x:x + 20 y:y opaque: opaque

branch	jv
changeset 16571	cf319f2e56d0
parent 16213	f667b5b42a11
parent 16537	bfe8be86fde5
child 16709	ff5b5c8d8549