--- a/InspectorView.st	Mon Oct 12 18:06:21 2009 +0200
+++ b/InspectorView.st	Mon Oct 12 18:52:54 2009 +0200
@@ -12,14 +12,14 @@
 "{ Package: 'stx:libtool' }"
 
 SimpleView subclass:#InspectorView
-        instanceVariableNames:'listView labelView workspace inspectedObject selectedLine nShown
-                hasMore monitorProcess hideReceiver showHex inspectHistory
-                allowFollow isStandaloneInspector selectionIndex object
-                inspectedObjectHolder displayStringMessage suppressPseudoSlots
-                dereferenceValueHolders'
-        classVariableNames:'DefaultIcon IdDictionary NextSequentialID LastExtent'
-        poolDictionaries:''
-        category:'Interface-Inspector'
+	instanceVariableNames:'listView labelView workspace inspectedObject selectedLine nShown
+		hasMore monitorProcess hideReceiver showHex inspectHistory
+		allowFollow isStandaloneInspector selectionIndex object
+		inspectedObjectHolder displayStringMessage suppressPseudoSlots
+		dereferenceValueHolders'
+	classVariableNames:'DefaultIcon IdDictionary NextSequentialID LastExtent'
+	poolDictionaries:''
+	category:'Interface-Inspector'
 !
 
 !InspectorView class methodsFor:'documentation'!
@@ -888,7 +888,7 @@
     deps do:[:each | 
         |implClass|
 
-        implClass := each class whichClassImplements:#'update:with:from:'.
+        implClass := each class whichClassIncludesSelector:#'update:with:from:'.
         implClass notNil ifTrue:[
             methods add:(implClass compiledMethodAt:#'update:with:from:')
         ]
@@ -1197,7 +1197,8 @@
 derivedFields
     "the check below is not sufficient - if someone catches messages, for example.
      Therefore, we do a manual lookup here:"
-    (object class whichClassImplements:#inspectorExtraAttributes) isNil ifTrue:[
+
+    (object class whichClassIncludesSelector:#inspectorExtraAttributes) isNil ifTrue:[
         ^ #()
     ].
     ^ [object inspectorExtraAttributes]
@@ -1228,7 +1229,8 @@
 
     "the check below is not sufficient - if someone catches messages, for example.
      Therefore, we do a manual lookup here:"
-    (object class whichClassImplements:#inspectorExtraNamedFields) isNil ifTrue:[
+
+    (object class whichClassIncludesSelector:#inspectorExtraNamedFields) isNil ifTrue:[
         ^ #()
     ].
     ^ [object inspectorExtraNamedFields]
@@ -1427,7 +1429,7 @@
     nNamedInstvarsShown := cls instSize.
     "/ only the namedInstvars below baseInspectedObjectClass
     "/ are shown ...
-    (cls == baseCls or:[cls isSubclassOf:baseCls]) ifTrue:[
+    (cls includesBehavior:baseCls) ifTrue:[
         nNamedInstvarsShown := nNamedInstvarsShown - baseCls instSize.
     ].
 
@@ -1471,7 +1473,7 @@
     nNamedInstvarsShown := cls instSize.
     "/ only the namedInstvars below baseInspectedObjectClass
     "/ are shown ...
-    (cls == baseCls or:[cls isSubclassOf:baseCls]) ifTrue:[
+    (cls includesBehavior:baseCls) ifTrue:[
         nNamedInstvarsShown := nNamedInstvarsShown - baseCls instSize.
     ].
     nExtraNamedInstvarsShown := self extraNamedFields size.
@@ -1495,7 +1497,7 @@
     aList := OrderedCollection new.
 
     aList addAll:(cls allInstVarNames).
-    (cls == baseCls or:[cls isSubclassOf:baseCls]) ifTrue:[
+    (cls includesBehavior:baseCls) ifTrue:[
         "/ hide some stuff
         aList := aList copyFrom:(self baseInspectedObjectClass instSize + 1).
     ].
@@ -2169,9 +2171,9 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.197 2009-10-08 14:02:19 mb Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.198 2009-10-12 16:52:54 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.197 2009-10-08 14:02:19 mb Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.198 2009-10-12 16:52:54 cg Exp $'
 ! !