--- a/Tools__VariableList.st Fri Jan 27 22:18:53 2012 +0100
+++ b/Tools__VariableList.st Sun Jan 29 12:53:39 2012 +0000
@@ -22,7 +22,7 @@
!
Object subclass:#VariableEntry
- instanceVariableNames:'label application class name type icon'
+ instanceVariableNames:'application class name icon'
classVariableNames:''
poolDictionaries:''
privateIn:VariableList
@@ -492,35 +492,15 @@
"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.
- classInfo notNil ifTrue:[
- entry type: (classInfo infoForInstvarOrNil: name).
- ].
- ^entry
-
- "Created: / 27-11-2011 / 17:17:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
listOfVariables
-
|nameList numClasses classes class commonSubclass showingClassVars
- sortByName classesAlreadyProcessed hasSmallSense smallSenseManager info |
+ sortByName classesAlreadyProcessed|
classHolder isNil ifTrue:[
"/ testing
^ #()
].
- hasSmallSense := ConfigurableFeatures includesFeature:'SmallSenseEnabled'.
- hasSmallSense ifTrue:[
- smallSenseManager := (Smalltalk at: #SmallSenseManager) instance.
- ].
-
showingClassVars := self showClassVarsInVariableList value == true.
sortByName := self sortVariablesByName value.
"/ self assert:(sortByName isBoolean).
@@ -543,32 +523,25 @@
nameList := Set new.
classesAlreadyProcessed := IdentitySet new.
classes do:[:class |
- hasSmallSense ifTrue:[
- info := smallSenseManager infoForClassOrNil: class.
- ].
-
(classesAlreadyProcessed includes:class) ifFalse:[
showingClassVars ifTrue:[
self showingInheritedClassVars ifTrue:[
class theNonMetaclass withAllSuperclassesDo:[:cls|
- hasSmallSense ifTrue:[
- info := smallSenseManager infoForClassOrNil: cls.
- ].
(classesAlreadyProcessed includes:cls) ifFalse:[
nameList addAll:
- (cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm info: info]).
+ (cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm]).
classesAlreadyProcessed add:cls.
]
]
] ifFalse:[
nameList addAll:
- (class classVarNames collect:[:nm|self listEntryForClass: class name: nm info: info ])
+ (class classVarNames collect:[:nm|self listEntryForClass: class name: nm])
]
] ifFalse:[
class withAllSuperclassesDo:[:cls|
(classesAlreadyProcessed includes:cls) ifFalse:[
nameList addAll:
- (cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm info: info ]).
+ (cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm]).
classesAlreadyProcessed add:cls.
]
]
@@ -588,12 +561,9 @@
class withAllSuperclassesDo:[:cls|
|varNames|
- (hasSmallSense and:[showingClassVars not]) ifTrue:[
- info := smallSenseManager infoForClassOrNil: cls.
- ].
varNames := showingClassVars ifTrue:[ cls classVarNames ] ifFalse:[ cls instVarNames ].
varNames copy reverse do:[:varName|
- nameList addFirst: (self listEntryForClass: cls name: varName info: info).
+ nameList addFirst: (self listEntryForClass: cls name: varName).
].
sortByName ifFalse:[
nameList addFirst:(("'----- ' , "cls nameInBrowser" , ' -----'") asText colorizeAllWith: Color gray).
@@ -608,9 +578,8 @@
^ nameList
"Created: / 05-02-2000 / 13:42:11 / cg"
+ "Modified: / 28-04-2011 / 13:18:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 08-08-2011 / 16:20:58 / cg"
- "Modified: / 27-11-2011 / 17:29:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 16-12-2011 / 01:27:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
postBuildWith:aBuilder
@@ -713,15 +682,13 @@
!
icon
- icon isNil ifTrue:[
- icon := application iconInBrowserForVariable: name in: class.
- icon isNil ifTrue:[icon := #NOICON].
- ].
+
+ icon ifNil:[icon := application iconInBrowserForVariable: name in: class].
+ icon ifNil:[icon := #NOICON].
^icon
"Created: / 12-04-2011 / 15:54:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 12-04-2011 / 19:58:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-11-2011 / 15:05:18 / cg"
!
klass
@@ -730,19 +697,6 @@
"Created: / 12-04-2011 / 19:54:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-label
-
- label isNil ifTrue:[
- label := name.
- type notNil ifTrue:[
- label := (label , ' ' , (type displayString colorizeAllWith: Color brown))
- ]
- ].
- ^label
-
- "Created: / 16-12-2011 / 00:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
name
^ name
!
@@ -756,22 +710,6 @@
^name
"Created: / 12-04-2011 / 15:45:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-type
- "Return a SmallSense inferred type"
-
- ^ type
-
- "Modified (format): / 16-12-2011 / 00:41:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-type:aSmallSenseType
- "Sets a SmallSense inferred type"
-
- type := aSmallSenseType.
-
- "Modified (format): / 16-12-2011 / 00:41:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!VariableList::VariableEntry methodsFor:'displaying'!
@@ -783,23 +721,13 @@
icn ~~ #NOICON ifTrue:[
icn displayOn:aGC x:x + 1 y:y - icn height.
].
- ^self label displayOn:aGC x:x + 20 y:y opaque: opaque
+ ^name displayOn:aGC x:x + 20 y:y opaque: opaque
"Created: / 12-04-2011 / 15:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!VariableList::VariableEntry methodsFor:'queries'!
-
-widthOn:aGC
-
- ^20"space for icon, see displayOn:..."
- + (self label widthOn:aGC)
-
- "Created: / 16-12-2011 / 01:04:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
!VariableList class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.14 2011-12-16 00:29:24 vrany Exp $'
-! !
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.12 2011/08/08 16:28:30 cg Exp §'
+! !
\ No newline at end of file