Merge jv
authorMerge Script
Thu, 18 Aug 2016 06:53:35 +0200
branchjv
changeset 16805 d9fc8a187ec2
parent 16803 e4ac430c7cd9 (current diff)
parent 16804 52a7f72328f2 (diff)
child 16808 1b3b701e1c58
Merge
InspectorView.st
--- a/InspectorView.st	Tue Aug 16 06:52:08 2016 +0200
+++ b/InspectorView.st	Thu Aug 18 06:53:35 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -1257,7 +1255,7 @@
     ].
     (aClass includesBehavior:Integer) ifTrue:[
         ^ self imageFor_integers
-    ].                 
+    ].
     (aClass includesBehavior:Fraction) ifTrue:[
         ^ self imageFor_fractions
     ].
@@ -1815,7 +1813,7 @@
 !
 
 release
-    "release inpected object. This is normally not needed,
+    "release inspected object. This is normally not needed,
      since the garbage collector will find this memory alone.
      However, if some applications keeps invisible inspectors around
      (for example, the debugger does this), the inspected object
@@ -2827,7 +2825,7 @@
         aStream nextPutAll:(' ' paddedTo:padding with:$.).
         aStream nextPutAll:(' [',(idx printString leftPaddedTo:2),']').
         aStream nextPutAll:' : '.
-        elValString := self basicDisplayStringForValue:el.                
+        elValString := self basicDisplayStringForValue:el.
         aStream nextPutAll:elValString.
         aStream cr.
         "/ s nextPutAll:(self stringWithAllInstVarValuesFor:el level:lvl+4)
@@ -3594,7 +3592,7 @@
 namedFieldAt:idx
     |val|
 
-    IsDebuggingQuery answer:true do:[    
+    IsDebuggingQuery answer:true do:[
         val := object instVarAt:idx
     ].
     ^ val
@@ -3604,7 +3602,7 @@
     ^ object instVarAt:idx put:newValue
 !
 
-namedFieldList 
+namedFieldList
     "return a list of instVar names to show in the selectionList."
 
     |aList cls baseCls offset|
@@ -3621,7 +3619,7 @@
         offset := self baseInspectedObjectClass instSize.
         aList := aList copyFrom:(offset + 1).
     ].
-    aList := aList 
+    aList := aList
                 keysAndValuesCollect:[:idx :nm |
                     |val|
 
@@ -3716,7 +3714,7 @@
 
     idx := self theSingleSelectionIndex.
 
-    (idx isNil 
+    (idx isNil
     or:[ object class hasImmediateInstances])
     ifTrue:[
         acceptAction := nil.
@@ -3757,18 +3755,18 @@
 setDoItAction
     "set the codeViews doit action"
 
-    workspace 
+    workspace
         doItAction:[:theCode |
             |evaluator|
 
             (evaluator := object class evaluatorClass)
             notNil ifTrue:[
                 evaluator
-                    evaluate:theCode 
-                    in:nil 
-                    receiver:object 
-                    notifying:workspace 
-                    logged:true 
+                    evaluate:theCode
+                    in:nil
+                    receiver:object
+                    notifying:workspace
+                    logged:true
                     ifFail:nil
             ] ifFalse:[
                 'object''s class provides no evaluator'
@@ -4002,7 +4000,7 @@
     "used by the debugger, to fetch the selected instVar/pseudoVar name,
      so it can be reselected after the next single step
      (using tryToSelect..)"
-     
+
     |sel|
 
     selectionIndex notNil ifTrue:[
@@ -4013,7 +4011,7 @@
             (sel startsWith:'-') ifFalse:[
                 "/ clip off the value-info string
                 sel := sel copyUpTo:(Character space).
-            ].    
+            ].
             ^ sel
         ].
     ].
@@ -4059,7 +4057,7 @@
     "Modified: / 03-08-2006 / 14:26:22 / cg"
 !
 
-showValue:someValue 
+showValue:someValue
     "user clicked on an entry - show value in workspace"
 
     |s|
@@ -4083,7 +4081,7 @@
 
 doAccept:theText
     "the selected text is evaluated and stored into the selected field"
-    
+
     |sel newValue fieldNameList|
 
     sel := self listEntryAt:(self theSingleSelectionIndex).
@@ -4095,9 +4093,9 @@
     Error handle:[:ex |
         workspace flash
     ] do:[
-        newValue := object class evaluatorClass 
+        newValue := object class evaluatorClass
                        evaluate:theText
-                       receiver:object 
+                       receiver:object
                        notifying:workspace.
 
         self dereferenceValueHolders ifTrue:[
@@ -4106,7 +4104,7 @@
             self valueAtLine:selectionIndex put:newValue.
         ].
         "/ update the fieldList...
-        fieldNameList := self fieldList.                               
+        fieldNameList := self fieldList.
         hasMore ifTrue:[
             fieldNameList add:' ... '
         ].
@@ -4218,7 +4216,7 @@
 !
 
 tryToSelectKeyNamed:aString
-    "called from the debugger to try to select the previousöy selected
+    "called from the debugger to try to select the previousöy selected
      field (by name)"
      
     |list idx aStringWithSpace|
@@ -4229,8 +4227,8 @@
 
     list := listView list.
     list notNil ifTrue:[
-        idx := list findFirst:[:line | 
-                        line = aString 
+        idx := list findFirst:[:line |
+                        line = aString
                         or:[line string startsWith:aStringWithSpace]].
         idx ~~ 0 ifTrue:[
             listView selection:idx