--- a/InspectorView.st Thu Dec 13 14:31:51 2012 +0000
+++ b/InspectorView.st Mon Jan 14 11:48:37 2013 +0000
@@ -2062,35 +2062,37 @@
].
^ s
] do:[
- integerDisplayRadix ~= 10 ifTrue:[
- "/ not everything can be shown in HEX/Binary
-
- someValue isInteger ifTrue:[
- (someValue < integerDisplayRadix) ifTrue:[
- ^ someValue printString.
+ [
+ integerDisplayRadix ~= 10 ifTrue:[
+ "/ not everything can be shown in HEX/Binary
+
+ someValue isInteger ifTrue:[
+ (someValue < integerDisplayRadix) ifTrue:[
+ ^ someValue printString.
+ ].
+ s := someValue radixPrintStringRadix:integerDisplayRadix.
+ s := s , ' "',(someValue printString),'"'.
+ ^ s
].
- s := someValue radixPrintStringRadix:integerDisplayRadix.
- s := s , ' "',(someValue printString),'"'.
- ^ s
+ (someValue isMemberOf:ByteArray) ifTrue:[
+ s := WriteStream on:(String new:10).
+ s writeLimit:100000.
+ someValue printOn:s base:integerDisplayRadix showRadix:true.
+ ^ s contents
+ ]
].
- (someValue isMemberOf:ByteArray) ifTrue:[
- s := WriteStream on:(String new:10).
- s writeLimit:100000.
- someValue printOn:s base:integerDisplayRadix showRadix:true.
- ^ s contents
- ]
- ].
-
- "/ displayStringMessage := #classNameWithArticle
- "/ displayStringMessage := #displayString
- "/ displayStringMessage := #printString
-
- s := CharacterWriteStream on:(String new:10).
- s writeLimit:100000.
-
- someValue isLazyValue ifTrue:[
- s nextPutAll:someValue class nameWithArticle
- ] ifFalse:[
+
+ "/ displayStringMessage := #classNameWithArticle
+ "/ displayStringMessage := #displayString
+ "/ displayStringMessage := #printString
+
+ someValue isLazyValue ifTrue:[
+ ^ someValue class nameWithArticle
+ ].
+
+ s := CharacterWriteStream on:(String new:10).
+ s writeLimit:1000.
+
"/ mhmh - avoid sending #perform: (bad for proxy objects which pass it to somewhere..)
displayStringMessage == #displayString ifTrue:[
someValue displayOn:s.
@@ -2108,8 +2110,9 @@
].
].
].
- ].
- ^ s contents
+ ^ s contents
+ ] valueWithWatchDog:[^ someValue class nameWithArticle]
+ afterMilliseconds:1000
].
"Modified: / 20-07-2012 / 10:54:05 / cg"
@@ -2220,9 +2223,7 @@
(value isLazyValue not and:[value isColor and:[value red notNil]]) ifTrue:[
entryString := entryString
, ' ' , (' '
- colorizeAllWith:((value brightness < 0.5)
- ifTrue:[ Color white ]
- ifFalse:[ Color black ])
+ colorizeAllWith:(value contrastingBlackOrWhite)
on:value).
].
@@ -3380,13 +3381,13 @@
!InspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.293 2012/11/21 13:35:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.295 2012/12/14 16:21:59 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.293 2012/11/21 13:35:59 cg Exp '
+ ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.295 2012/12/14 16:21:59 cg Exp §'
!
version_SVN
- ^ '$Id: InspectorView.st 8074 2012-11-30 17:23:39Z vranyj1 $'
+ ^ '$Id: InspectorView.st 8083 2013-01-14 11:48:37Z vranyj1 $'
! !