hg/stx-libtool2: comparison NewInspectorPanelView.st

equal deleted inserted replaced

-:7b75ce74d9e1
+:03af455029eb
 examples
 "
 example 1
 =========
+[exBegin]
 |top slv|
 top := StandardSystemView new extent:600@400.
 slv := NewInspector::InspectorPanelView origin:0.0@0.0 corner:1.0@1.0 in:top.
 slv inspect:top.
 slv action:[:el|Transcript showCR:el].
 top open.
+[exEnd]
 example 2
 =========
+[exBegin]
 |top slv edt a vvp|
 a := Array new:5.
 a at:4 put:(Array new:6).
 slv action:[:el| Transcript showCR:(el printString)].
 slv inspect:a.
 top open.
+[exEnd]
 "
 ! !
 !InspectorPanelView class methodsFor:'constants'!
 minDepth
-"returns the maximum of views
+"returns the minimum of views assigned to a panel
 "
 ^ 4
 ! !
 !InspectorPanelView methodsFor:'accessing'!
 !InspectorPanelView methodsFor:'accessing selections'!
 inspectedObject
 "returns the current inspected object
 "
-|i el|
+^ self findLastValidListWithSelection inspectedObject
-rightHistory notEmpty ifTrue:[
-el := rightHistory last
-] ifFalse:[
-el := listViews findLast:[:v|v hasSelection].
-el := listViews at:el.
-].
-^ el inspectedObject
 !
 selectedInstanceVar
 "returns the current selected instance var
 "
-|el|
+^ self findLastValidListWithSelection selectedInstanceVar
-rightHistory notEmpty ifTrue:[
-el := rightHistory last
-] ifFalse:[
-el := listViews findLast:[:v|v hasSelection].
-el := listViews at:el
-].
-^ el selectedInstanceVar
 ! !
 !InspectorPanelView methodsFor:'actions'!
 accept:aText notifying:aView
-self doItOrAccept:[:v|v accept:aText notifying:aView]
+"evaluating aText on the last selected instance var. on success the views
+are updated.
+"
+self doItOrAccept:[:aList|aList accept:aText notifying:aView]
 !
 doIt:aCode notifying:aView
-^ self doItOrAccept:[:v|v doIt:aCode notifying:aView]
+"evaluating aCode on the selected instance var; on success the views
+are updated.
+"
+^ self doItOrAccept:[:aList|aList doIt:aCode notifying:aView]
 !
 inspect:anObject
-"change the inspected object
+"change the inspected object and all views
 "
 |view|
 view := listViews first.
 leftHistory  removeAll.
 ! !
 !InspectorPanelView methodsFor:'event handling'!
 handlesKeyPress:key inView:someView
+"all keys are handled by this instance itself
+"
 ^ true
 !
 keyPress:key x:x y:y view:someView
+"handle some special keys
+"
 key == #CursorLeft  ifTrue:[^ self moveContentsRight:1].
 key == #CursorRight ifTrue:[^ self moveContentsLeft:1 ].
 someView keyPress:key x:x y:y.
 !
 singleClickAt:anIndex
-"the view changed its selection caused by a single click
+"the view at an index changed its selection caused by a single click
 "
 |view start sivar|
 rightHistory removeAll.
 view := listViews at:anIndex.
 view hasSelection ifFalse:[^ nil].
 inst := view selectedInstanceVar.
-menu := PopUpMenu labels:#( 'update' '-')
+menu := PopUpMenu labels:#( 'update' )
-selectors:#( #update  nil)
+selectors:#( #update  )
 receiver:self.
 menu actionAt:#update put:[
-view updateList.
+view update.
 listViews from:(anIndex + 1) do:[:v|
 (view selectedInstanceType) ~~ #directory ifTrue:[
 v inspect:nil
 ] ifFalse:[
 ]
 ].
 self update
 ].
+(InspectorList isTraceable:inst) ifFalse:[
+^ menu
+].
 menu  addLabels:#(
+'-'
 'trace'
 'trap'
 'untrace / untrap'
 )
 selectors:#(
+nil
 trace
 trap
 untrace
 ).
 ! !
 !InspectorPanelView methodsFor:'private'!
 doItOrAccept:aBlock
-"handle a doIt or accept action
+"handle a doIt or accept action; on success all the folloed views are
-"
+updated
-|index view ivar rslt last stop|
+"
+|index list result instVar|
-last := listViews last.
-self moveContentsLeft:(rightHistory size).
+list    := self findLastValidListWithSelection.
+result  := aBlock value:list.
-last hasSelection ifTrue:[
+instVar := list selectedInstanceVar.
-self moveContentsLeft:1.
+index   := listViews findLast:[:v|v == list].
-index := (listViews size) - 1
-] ifFalse:[
+(index ~~ 0 and:[index ~~ listViews size]) ifTrue:[
-index := listViews findLast:[:v|v hasSelection].
+index := index + 1.
-].
+(list selectedInstanceType) == #directory ifTrue:[
+(listViews at:index) inspect:instVar
+] ifFalse:[
+(listViews at:index) inspect:nil
+].
+self update
+].
+valueChangedAction notNil ifTrue:[
+valueChangedAction value:instVar
+].
+^ result
+!
+findLastValidListWithSelection
+"returns last valid list with a selection; if no selection exists in any
+view, the list assigned to the inspected object is returned
+"
+|index|
+rightHistory notEmpty ifTrue:[
+^ rightHistory first
+].
+index := listViews findLast:[:v| v hasSelection ].
 index ~~ 0 ifTrue:[
-view := listViews at:index.
+^ listViews at:index
-rslt := aBlock value:view.
+].
-stop := listViews size.
-ivar := view selectedInstanceVar.
+leftHistory notEmpty ifTrue:[^ leftHistory last]
+ifFalse:[^ listViews at:1]
-index == stop ifTrue:[
-self moveContentsLeft:1.
-] ifFalse:[
-index := index + 1.
-(view selectedInstanceType) == #directory ifTrue:[
-(listViews at:index) inspect:ivar
-] ifFalse:[
-(listViews at:index) inspect:nil
-].
-self update.
-].
-valueChangedAction notNil ifTrue:[
-valueChangedAction value:ivar
-]
-].
-^ rslt
 !
 update
 "update labels and scrollbar
 "
 !
 createViewWithoutRedraw
-"add a new view at end
+"add a new view at end of the panel
 "
 |view frame label index|
 frame := SimpleView in:hzpView.
 ! !
 !InspectorPanelView methodsFor:'scrolling-basic'!
 moveContentsLeft:nTimes
-"move the contents of each view one position left
+"move the contents of all views one position left
 "
 |fView stop assoc inspObj pView index|
 (nTimes < 1 or:[listViews last isEmpty]) ifTrue:[
 ^ self
 stop  := (listViews size) - 1.
 fView := listViews first.
 pView := listViews at:stop.
-[   leftHistory add:fView listHolder.
+[   leftHistory add:(fView list).
 1 to:stop do:[:i|
-(listViews at:i) updateFromView:(listViews at:(i+1))
+(listViews at:i) list:(listViews at:(i+1))
 ].
 rightHistory notEmpty ifTrue:[
-(listViews last) updateFromList:(rightHistory removeLast)
+(listViews last) list:(rightHistory removeLast)
 ] ifFalse:[
 (listViews last) inspect:(pView selectedInstanceVar)
 ].
 ((index := index - 1) == 0 or:[listViews last isEmpty])
 !
 moveContentsRight:nTimes
-"move the contents of all listViews one position right
+"move the contents of all views one position right
 "
 |view assoc size index lView fView|
 size := leftHistory size.
 lView := listViews last.
 fView := listViews first.
 1 to:index do:[:i|
 lView hasSelection ifTrue:[
-rightHistory add:(lView listHolder)
+rightHistory add:(lView list)
 ].
 size to:2 by:-1 do:[:i|
-(listViews at:i) updateFromView:(listViews at:(i-1))
+(listViews at:i) list:(listViews at:(i-1))
 ].
-fView updateFromList:(leftHistory removeLast)
+fView list:(leftHistory removeLast)
 ].
 self update
 ]
 !
 scrollTo:nPercent
-"set views dependant on scroll bar
+"set views and contents dependant on scroll bar
 "
 |dY no noScr pR|
 noScr := listViews size + leftHistory size + rightHistory size.

changeset 39	03af455029eb
parent 35	6f1565819b63
child 327	0040d47658c6