InspectorView.st
changeset 11565 7ad4468defb7
parent 11551 5d6cd56f9dcf
child 11576 e5361052ab2f
--- a/InspectorView.st	Wed Jun 06 11:46:59 2012 +0200
+++ b/InspectorView.st	Wed Jun 06 12:02:32 2012 +0200
@@ -2594,30 +2594,9 @@
     "return a list of names to show in the selectionList.
      Leave hasMore as true, if a '...' entry should be added."
 
-    |list cls|
-
-    cls := object class.
-
-    list := OrderedCollection new.
-    list add:'-' , 'self' allItalic.
-    list add:'-' , 'local messages' allItalic.
-    "/ list add:'-' , 'inherited messages' allItalic.
-    list add:'-' , 'all messages' allItalic.
-    list add:'-' , 'hash' allItalic.
-    list add:'-' , 'identityHash' allItalic.
-
-    cls hasImmediateInstances ifFalse:[
-        object dependents notEmptyOrNil ifTrue:[
-            list add:'-' , 'dependents' allItalic.
-        ].
-    ].
-    cls instSize > 0 ifTrue:[
-        list add:'-' , 'all inst vars' allItalic.
-    ].
-    ((cls isVariable) and:[self showAllIndexedVarsInFieldList]) ifTrue:[
-        list add:'-' , 'all indexed vars' allItalic.
-    ].
-    ^ list
+    ^ self pseudoFieldNamesWithIndexed: object class isVariable
+
+    "Modified: / 06-06-2012 / 11:56:56 / cg"
 !
 
 pseudoFieldNamesWithIndexed:withIndexed
@@ -2636,6 +2615,15 @@
     list add:'-' , 'hash' allItalic.
     list add:'-' , 'identityHash' allItalic.
 
+    withIndexed ifTrue:[
+        list add:'-' , 'basicSize' allItalic.
+    ].
+    object isCollection ifTrue:[
+        (cls whichClassImplements:#size) == (cls whichClassImplements:#basicSize) ifFalse:[
+            list add:'-' , 'size' allItalic.
+        ]
+    ].
+
     cls hasImmediateInstances ifFalse:[
         object dependents notEmptyOrNil ifTrue:[
             list add:'-' , 'dependents' allItalic.
@@ -2648,6 +2636,8 @@
         list add:'-' , 'all indexed vars' allItalic.
     ].
     ^ list
+
+    "Modified: / 06-06-2012 / 11:59:10 / cg"
 !
 
 setAcceptAction
@@ -2672,6 +2662,12 @@
         (sel startsWith:'-hash') ifTrue:[
             acceptAction := nil.
         ].
+        (sel startsWith:'-basicSize') ifTrue:[
+            acceptAction := nil.
+        ].
+        (sel startsWith:'-size') ifTrue:[
+            acceptAction := nil.
+        ].
         (sel startsWith:'-identityHash') ifTrue:[
             acceptAction := nil.
         ].
@@ -2685,7 +2681,7 @@
 
     workspace acceptAction:acceptAction.
 
-    "Modified: / 16-05-2012 / 17:54:16 / cg"
+    "Modified: / 06-06-2012 / 11:57:27 / cg"
 !
 
 setDoItAction
@@ -2850,6 +2846,9 @@
     (line startsWith:'-self') ifTrue:[
         ^ object
     ].
+    (line startsWith:'-basicSize') ifTrue:[
+        ^ object basicSize
+    ].
     (line startsWith:'-size') ifTrue:[
         ^ object size
     ].
@@ -2878,7 +2877,7 @@
     self error:'unknown special line'.
 
     "Created: / 31-10-2001 / 09:17:45 / cg"
-    "Modified: / 13-03-2012 / 08:25:52 / cg"
+    "Modified: / 06-06-2012 / 11:57:54 / cg"
 ! !
 
 !InspectorView methodsFor:'queries'!
@@ -3194,9 +3193,9 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.257 2012-06-04 16:17:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.258 2012-06-06 10:02:32 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.257 2012-06-04 16:17:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.258 2012-06-06 10:02:32 cg Exp $'
 ! !