--- a/DebugView.st Wed Nov 30 15:38:24 2016 +0100
+++ b/DebugView.st Wed Nov 30 15:39:57 2016 +0100
@@ -2877,47 +2877,48 @@
interval := pos to:pos.
self
- withNodeValueAtInterval:interval
- do:[:value :description |
- |valueClassOrSizeString valueString|
-
- valueClassOrSizeString := valueString := ''.
-
- "/ some heuristics as when to show the class name (a purely subjective preference)
- value isString ifTrue:[
- value isText ifTrue:[
- valueString := '"',(value contractTo:80),'"'.
- ] ifFalse:[
- valueString := value storeString contractTo:80.
- ].
- ] ifFalse:[
- (value isBoolean
- or:[ value isInteger
- or:[ value isSymbol ]]) ifTrue:[
- valueString := value printString.
- ] ifFalse:[
- valueClassOrSizeString := ' (',value class name,')'.
-
- (value isArray
- or:[ value isOrderedCollection ]) ifTrue:[
- valueClassOrSizeString := ' (size=',value size printString,')'.
- ].
-
- Error handle:[:ex |
- valueString := '??? (',ex description,')'
- ] do:[
- [
- valueString := value printString contractTo:80.
- ] valueWithWatchDog:[ valueString := value classNameWithArticle ] afterMilliseconds:30.
- ]
- ]
- ].
- description isEmptyOrNil ifTrue:[
- s := valueString , valueClassOrSizeString
- ] ifFalse:[
- s := description , ': ', valueString, valueClassOrSizeString
- ].
- ].
+ withNodeValueAtInterval:interval
+ do:[:value :description |
+ |valueClassOrSizeString valueString|
+
+ valueClassOrSizeString := valueString := ''.
+
+ "/ some heuristics as when to show the class name (a purely subjective preference)
+ value isString ifTrue:[
+ value isText ifTrue:[
+ valueString := '"',(value contractTo:80),'"'.
+ ] ifFalse:[
+ valueString := value storeString contractTo:80.
+ ].
+ ] ifFalse:[
+ (value isBoolean
+ or:[ value isInteger
+ or:[ value isSymbol ]]) ifTrue:[
+ valueString := value printString.
+ ] ifFalse:[
+ valueClassOrSizeString := ' (',value class name,')'.
+
+ (value isArray
+ or:[ value isOrderedCollection ]) ifTrue:[
+ valueClassOrSizeString := ' (size=',value size printString,')'.
+ ].
+
+ Error handle:[:ex |
+ valueString := '??? (',ex description,')'
+ ] do:[
+ [
+ valueString := value printString contractTo:80.
+ ] valueWithWatchDog:[ valueString := value class nameWithArticle ] afterMilliseconds:30.
+ "do not use classNameWithArticle - it is missing in ProtoObject!!"
+ ]
+ ]
+ ].
+ description isEmptyOrNil ifTrue:[
+ s := valueString , valueClassOrSizeString
+ ] ifFalse:[
+ s := description , ': ', valueString, valueClassOrSizeString
+ ].
+ ].
"/ Transcript showCR:s.
^ s
@@ -7739,7 +7740,7 @@
] ifFalse:[
alreadyInApplicationCode ifFalse:[
(con receiver isProtoObject not "/ careful to not force futures/lazy values
- and:[con receiver isKindOf:ApplicationModel]) ifTrue:[
+ and:[con receiver isKindOf:ApplicationModel]) ifTrue:[
isStoppedInApplicationAction := true.
]
]
@@ -9005,7 +9006,7 @@
|val|
IsDebuggingQuery answer:true do:[
- val := (receiver instVarAt:i).
+ val := receiver instVarAt:i.
].
val == changedObject ifTrue:[
contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',nm allBold).
@@ -9013,7 +9014,7 @@
]
].
- (receiver isKindOf:ApplicationModel) ifTrue:[
+ (receiver isProtoObject not and:[receiver isKindOf:ApplicationModel]) ifTrue:[
receiver builder notNil ifTrue:[
(receiver builder bindings ? #()) keysAndValuesDo:[:eachAspect :eachValue |
eachValue == changedObject ifTrue:[
@@ -9024,8 +9025,9 @@
]
].
- contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',changedObject classNameWithArticle allBold).
- ^self.
+ "do not use classNameWithArticle - it is missing in ProtoObject!!"
+ contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',changedObject class nameWithArticle allBold).
+ ^ self.
].
contextInfoLabel label:nil.
!
@@ -9396,7 +9398,8 @@
].
receiverInspector inspect:rec.
- receiverInspector fieldListLabel:("'Receiver: ',"rec classNameWithArticle).
+ "do not use classNameWithArticle - it is missing in ProtoObject!!"
+ receiverInspector fieldListLabel:("'Receiver: ',"rec class nameWithArticle).
receiverInspector tryToSelectKeyNamed:lastSelectionInReceiverInspector.
"