fix doTrap
authorca
Sat, 04 Jan 1997 13:45:38 +0100
changeset 901 56fe927e0734
parent 900 6fd4cb8c03e9
child 902 6aa43ef227c3
fix doTrap
InspView.st
InspectorView.st
--- a/InspView.st	Sat Jan 04 13:39:25 1997 +0100
+++ b/InspView.st	Sat Jan 04 13:45:38 1997 +0100
@@ -525,19 +525,21 @@
     |string selector|
 
     string := Dialog request:'Selector to trap on:' onCancel:nil.
-    selector isNil ifTrue:[^ self].
 
     string notNil ifTrue:[
         selector := string asSymbolIfInterned.
-    ].
-    selector isNil ifTrue:[
-        self warn:'no such selector'
-    ] ifFalse:[
-        self topView withWaitCursorDo:[MessageTracer trap:inspectedObject 
-                                                     selector:selector]
+
+        selector isNil ifTrue:[
+            self warn:'no such selector'
+        ] ifFalse:[
+            self topView withWaitCursorDo:[MessageTracer trap:inspectedObject 
+                                                         selector:selector]
+        ]
     ]
 
     "Modified: 12.4.1996 / 14:07:01 / cg"
+
+
 !
 
 doTrapAll
@@ -614,34 +616,15 @@
         aList add:instVarName
     ].
 
-"/ no longer needed - Behavior does it now
-"/
-"/    cls isClass ifTrue:[
-"/        cls allInstVarNames do:[:instVarName |
-"/            aList add:instVarName
-"/        ].
-"/    ] ifFalse:[
-"/        1 to:cls instSize do:[:index |
-"/            aList add:('instvar' , index printString)
-"/        ]
-"/    ].
-
     cls isVariable ifTrue:[
         n := inspectedObject basicSize.
         (n > nShown) ifTrue:[
             n := nShown.
             hasMore := true.
         ].
-"/        (inspectedObject respondsTo:#keys) ifTrue:[
-"/            s := ReadStream on:(inspectedObject keys).
-"/            1 to:n do:[:index |
-"/                aList add:(s next printString)
-"/            ]
-"/        ] ifFalse:[
-            1 to:n do:[:index |
-                aList add:(index printString)
-            ].
-"/        ].
+        1 to:n do:[:index |
+            aList add:(index printString)
+        ].
     ].
     ^ aList
 
@@ -862,5 +845,5 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.57 1996-12-19 13:39:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.58 1997-01-04 12:45:38 ca Exp $'
 ! !
--- a/InspectorView.st	Sat Jan 04 13:39:25 1997 +0100
+++ b/InspectorView.st	Sat Jan 04 13:45:38 1997 +0100
@@ -525,19 +525,21 @@
     |string selector|
 
     string := Dialog request:'Selector to trap on:' onCancel:nil.
-    selector isNil ifTrue:[^ self].
 
     string notNil ifTrue:[
         selector := string asSymbolIfInterned.
-    ].
-    selector isNil ifTrue:[
-        self warn:'no such selector'
-    ] ifFalse:[
-        self topView withWaitCursorDo:[MessageTracer trap:inspectedObject 
-                                                     selector:selector]
+
+        selector isNil ifTrue:[
+            self warn:'no such selector'
+        ] ifFalse:[
+            self topView withWaitCursorDo:[MessageTracer trap:inspectedObject 
+                                                         selector:selector]
+        ]
     ]
 
     "Modified: 12.4.1996 / 14:07:01 / cg"
+
+
 !
 
 doTrapAll
@@ -614,34 +616,15 @@
         aList add:instVarName
     ].
 
-"/ no longer needed - Behavior does it now
-"/
-"/    cls isClass ifTrue:[
-"/        cls allInstVarNames do:[:instVarName |
-"/            aList add:instVarName
-"/        ].
-"/    ] ifFalse:[
-"/        1 to:cls instSize do:[:index |
-"/            aList add:('instvar' , index printString)
-"/        ]
-"/    ].
-
     cls isVariable ifTrue:[
         n := inspectedObject basicSize.
         (n > nShown) ifTrue:[
             n := nShown.
             hasMore := true.
         ].
-"/        (inspectedObject respondsTo:#keys) ifTrue:[
-"/            s := ReadStream on:(inspectedObject keys).
-"/            1 to:n do:[:index |
-"/                aList add:(s next printString)
-"/            ]
-"/        ] ifFalse:[
-            1 to:n do:[:index |
-                aList add:(index printString)
-            ].
-"/        ].
+        1 to:n do:[:index |
+            aList add:(index printString)
+        ].
     ].
     ^ aList
 
@@ -862,5 +845,5 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.57 1996-12-19 13:39:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.58 1997-01-04 12:45:38 ca Exp $'
 ! !