hg/stx-libtool: comparison InspectorView.st

equal deleted inserted replaced

-:7f0b6e10415d
+:096003c27b76
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
 All Rights Reserved
 This software is furnished under a license and may be used
 		suppressPseudoSlots dereferenceValueHolders suppressHeadline
 		headLineLabel sortOrder hideMessages hideHashes
 		holderChangeInterest sortOrderHolder'
 	classVariableNames:'DefaultIcon DefaultIntegerDisplayRadix ExpandArraysInAllLists
 		IdDictionary LastExtent NextSequentialID SortOrderAlphabetical
-		SortOrderInstvarOrder DefaultHideMessages DefaultHideHashes'
+		SortOrderInstvarOrder DefaultHideMessages DefaultHideHashes
+		NoLongerPresentDummyObject'
 	poolDictionaries:''
 	category:'Interface-Inspector'
 !
 !InspectorView class methodsFor:'documentation'!
 !InspectorView class methodsFor:'initialization'!
 initialize
 SortOrderAlphabetical := #alphabetical.
-SortOrderInstvarOrder := #instvarOrder
+SortOrderInstvarOrder := #instvarOrder.
+NoLongerPresentDummyObject := Object new.
 ! !
 !InspectorView class methodsFor:'instance creation'!
 for:anObject
 displayStringForValue:someValue
 "return the value's displayString to be pasted into the workspace."
 |idx sel extraAttributes|
+someValue == NoLongerPresentDummyObject ifTrue:[
+"/ this is returned by collection-inspectors,
+"/ when a field-index for a no-longer-present-index is selected
+"/ (eg. if an OrderedCollection growed to a smaller size in the meantime)
+^ '«element no longer present»' withColor:Color grey.
+].
 idx := self theSingleSelectionIndex.
 idx notNil ifTrue:[
 sel := self listEntryAt:idx.
 sel isNil ifTrue:[^ someValue].
 extraAttributes := self myObjectsInspectorExtraAttributes.
 (extraAttributes includesKey:sel) ifTrue:[
 ^ someValue "(extraAttributes at:sel) value" printString
 ].
-(sel startsWith:'-all inst vars') ifTrue:[
+(sel startsWith:$-) ifTrue:[
-^ self stringWithAllInstVarValues
+(sel startsWith:'-all inst vars') ifTrue:[
-].
+^ self stringWithAllInstVarValues
-(sel startsWith:'-all class vars') ifTrue:[
+].
-^ self stringWithAllClassVarValues
+(sel startsWith:'-all class vars') ifTrue:[
-].
+^ self stringWithAllClassVarValues
-(sel startsWith:'-all indexed vars') ifTrue:[
+].
-^ self stringWithAllIndexedVarValues
+(sel startsWith:'-all indexed vars') ifTrue:[
-].
+^ self stringWithAllIndexedVarValues
-(sel startsWith:'-all messages') ifTrue:[
+].
-^ self stringWithMessages:#all
+(sel startsWith:'-all messages') ifTrue:[
-].
+^ self stringWithMessages:#all
-(sel startsWith:'-local messages') ifTrue:[
+].
-^ self stringWithMessages:#local
+(sel startsWith:'-local messages') ifTrue:[
-].
+^ self stringWithMessages:#local
-(sel startsWith:'-inherited messages') ifTrue:[
+].
-^ self stringWithMessages:#inherited
+(sel startsWith:'-inherited messages') ifTrue:[
+^ self stringWithMessages:#inherited
+].
 ].
 ].
 someValue == nil ifTrue:[^ 'nil'].
 ^ self basicDisplayStringForValue:someValue
 iconForValue:arg
 ^ self class iconForValue:arg
 !
 listEntryForName:nameString value:value
+"generates the fieldListEntry (icon + valueString)"
 |entryString|
 UserPreferences current showTypeIndicatorInInspector ifFalse:[
 ^ nameString
 ].
 |d actionItems valueItems otherItems|
 d := self derivedFields.
 (d isDictionary) ifTrue:[
 actionItems := d keys select:[:k | k first == $!!] as:OrderedCollection .
-valueItems := d keys select:[:k | '-�' includes:k first] as:OrderedCollection.
+valueItems := d keys select:[:k | '-¤' includes:k first] as:OrderedCollection.
-otherItems := d keys select:[:k | ('!!-�' includes: k first) not] as:OrderedCollection.
+otherItems := d keys select:[:k | ('!!-¤' includes: k first) not] as:OrderedCollection.
 ^ ((actionItems sort , valueItems sort) collect:[:k | (k copyTo:1),(k copyFrom:2) allItalic])
 ,
 otherItems sort
 ].
 ^ d collect:[:eachEntry |
 [
 val := self indexedValueAtIndex:idx.
 ] on:Error do:[
 val := ''
 ].
-"/            [
-"/                val := object at:idx.
-"/            ] on:Error do:[
-"/                [
-"/                    val := object basicAt:idx
-"/                ] on:Error do:[
-"/                    val := ''
-"/                ]
-"/            ].
 self listEntryForName:nm value:val
 ].
-"/    ^ list.
 "Modified: / 27-09-2012 / 21:51:58 / cg"
 !
 indexedValueAtIndex:idx
 (self hasSelfEntry
 and:[lineNr == 1 or:[lineNr isNil]]) ifTrue:[
 ^ object
 ].
+"/ one of the special (pseudo) entries?
 ((lineEntry := self listEntryAt:lineNr) startsWith:$-) ifTrue:[
 (lineEntry ~= '-'
 and:[(lineEntry at:2) isSeparator not
 and:[(lineEntry at:2) isDigit not "negative number"]]
 ) ifTrue:[
 ^ self valueForSpecialLine:lineEntry
 ].
 ].
-(lineEntry startsWith:$�) ifTrue:[
+"/ another special (pseudo) entries?
+(lineEntry startsWith:$¤) ifTrue:[
 ^ self valueForSpecialLine:lineEntry
 ].
 "/ a named instVar ?
 idx := self instVarIndexForLine:lineNr.
 idx notNil ifTrue:[
-BreakPointInterrupt catch:[
+"/ avoid endless recursion in case there is a breakPoint on the getter
+BreakPointInterrupt ignoreIn:[
 ^ self namedFieldAt:idx
 ]
 ].
 "/ an extra named field ?
 idx := self extraNamedVarIndexForLine:lineNr.
 idx notNil ifTrue:[
-BreakPointInterrupt catch:[
+"/ avoid endless recursion in case there is a breakPoint on the getter
+BreakPointInterrupt ignoreIn:[
 val := ((self extraNamedFields) at:idx) value.
 val isBlock ifTrue:[ val := val value ].
 ^ val
 ]
 ].
 "/ an indexed instVar ?
 idx := self keyIndexForLine:lineNr.
 idx notNil ifTrue:[
-BreakPointInterrupt catch:[
+"/ avoid endless recursion in case there is a breakPoint on the getter
+BreakPointInterrupt ignoreIn:[
 ^ self indexedValueAtIndex:idx.
 ]
 ].
 "/ nope
 "Created: 28.6.1996 / 15:06:38 / cg"
 "Modified: 18.3.1997 / 18:22:54 / cg"
 !
 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|
 aString isEmptyOrNil ifTrue:[^ self].

changeset 17872	096003c27b76
parent 17823	d68fc84f98a0
child 17938	873e0a718474