--- a/Tools__VariableList.st	Mon Jul 15 13:16:46 2013 +0100
+++ b/Tools__VariableList.st	Tue Jul 16 17:18:09 2013 +0100
@@ -13,7 +13,7 @@
 
 "{ NameSpace: Tools }"
 
-Tools::BrowserList subclass:#VariableList
+BrowserList subclass:#VariableList
 	instanceVariableNames:'variableList classHolder showClassVars sortVariablesByName
 		selectedVariableEntries showWarningAboutMissingEntryInXmlSpec'
 	classVariableNames:''
@@ -50,7 +50,6 @@
 "
 ! !
 
-
 !VariableList class methodsFor:'interface specs'!
 
 windowSpec
@@ -102,7 +101,6 @@
       )
 ! !
 
-
 !VariableList class methodsFor:'plugIn spec'!
 
 aspectSelectors
@@ -134,7 +132,6 @@
       ).
 ! !
 
-
 !VariableList methodsFor:'aspects'!
 
 classHolder
@@ -245,7 +242,6 @@
 
 ! !
 
-
 !VariableList methodsFor:'change & update'!
 
 delayedUpdate:something with:aParameter from:changedObject
@@ -419,7 +415,6 @@
     "Modified: / 20-07-2011 / 18:52:44 / cg"
 ! !
 
-
 !VariableList methodsFor:'generators'!
 
 makeGenerator
@@ -428,7 +423,6 @@
 
 ! !
 
-
 !VariableList methodsFor:'private'!
 
 commonPostBuild
@@ -533,7 +527,7 @@
 
 listOfVariables
 
-    |nameList numClasses classes class commonSubclass showingClassVars
+    |nameList numClasses classes class commonSubclass commonSuperclass showingClassVars
      sortByName classesAlreadyProcessed hasSmallSense smallSenseManager info |
 
     classHolder isNil ifTrue:[
@@ -560,6 +554,12 @@
             classes := Array with:(commonSubclass).
             numClasses := 1.
         ].
+"/        commonSuperclass := Behavior commonSuperclassOf:classes.
+"/        commonSuperclass notNil ifTrue:[
+"/            "/ yes - treat like a single class
+"/            classes := Array with:(commonSuperclass).
+"/            numClasses := 1.
+"/        ].
     ].
 
     numClasses > 1 ifTrue:[
@@ -567,7 +567,14 @@
         "/ unless there is a common subclass ...
         nameList := Set new.
         classesAlreadyProcessed := IdentitySet new.
-        classes do:[:class |
+        classes do:[:eachClass |
+            |class|
+
+           class := eachClass.
+"/            showingClassVars ifTrue:[
+"/                class := class theNonMetaclass 
+"/            ].
+
             hasSmallSense ifTrue:[
                 info := smallSenseManager infoForClassOrNil: class.
             ].                            
@@ -593,7 +600,7 @@
                     class withAllSuperclassesDo:[:cls|
                         (classesAlreadyProcessed includes:cls) ifFalse:[
                             nameList addAll:
-                                    (cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm info: info ]).                            
+                                    (cls instVarNames collect:[:nm|self listEntryForClass: cls name: nm info: info ]).                            
                             classesAlreadyProcessed add:cls.
                         ]
                     ]
@@ -708,7 +715,6 @@
     "Modified: / 23-03-2012 / 15:55:47 / cg"
 ! !
 
-
 !VariableList::VariableEntry class methodsFor:'instance creation'!
 
 application: app class: aClass name: aString
@@ -725,7 +731,6 @@
     "Created: / 12-04-2011 / 15:39:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !VariableList::VariableEntry methodsFor:'accessing'!
 
 application: anObject
@@ -808,7 +813,6 @@
     "Modified (format): / 16-12-2011 / 00:41:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !VariableList::VariableEntry methodsFor:'displaying'!
 
 displayOn:aGC x:x y:y opaque: opaque
@@ -823,7 +827,6 @@
     "Created: / 12-04-2011 / 15:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !VariableList::VariableEntry methodsFor:'queries'!
 
 widthOn:aGC
@@ -834,11 +837,10 @@
     "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.20 2013-03-10 14:18:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.21 2013-07-10 12:04:18 cg Exp $'
 !
 
 version_HG