--- a/TextCollector.st Sat Jul 06 19:25:01 2013 +0200
+++ b/TextCollector.st Sun Jul 07 13:43:31 2013 +0200
@@ -413,7 +413,7 @@
recreate access-semaphore; image could have been save (theoretically)
with the semaphore locked - in this case, we had a deadlock"
- flushPending := false.
+ flushPending := inFlush := false.
access := RecursionLock new. "/ Semaphore forMutualExclusion.
super reinitialize.
@@ -573,11 +573,13 @@
addLine:line
"append a line to the outstanding lines buffer"
+self ~~ Transcript ifTrue:[ ^ self taddLine:line].
+
access critical:[
outstandingLine size ~~ 0 ifTrue:[
outstandingLine := outstandingLine , line
] ifFalse:[
- TimestampMessages == true ifTrue:[
+ (TimestampMessages == true and:[self == Transcript]) ifTrue:[
outstandingLine := Timestamp now printString,' ',line
] ifFalse:[
outstandingLine := line
@@ -613,12 +615,13 @@
cr
"output a carriage return, finishing the current line"
+self ~~ Transcript ifTrue:[ ^ self tcr].
access critical:[
|line|
collecting ifTrue:[
line := outstandingLine.
- TimestampMessages == true ifTrue:[
+ (TimestampMessages == true and:[self == Transcript]) ifTrue:[
outstandingLine size == 0 ifTrue:[
line := Timestamp now printString
].
@@ -733,6 +736,7 @@
|printString lines|
+self ~~ Transcript ifTrue:[ ^ self tshow:anObject].
printString := anObject printString.
(self == Transcript) ifTrue:[
@@ -793,6 +797,7 @@
|printString lines|
+self ~~ Transcript ifTrue:[ ^ self tshow:anObject].
printString := anObject printString.
printString size == 0 ifTrue:[
self cr.
@@ -960,6 +965,7 @@
|nLines lines|
+self ~~ Transcript ifTrue:[ ^ self tendEntry].
shown ifFalse:[
"/ when iconified or not yet shown, keep
"/ collecting. But not too much ...
@@ -1044,11 +1050,11 @@
!TextCollector class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/TextCollector.st,v 1.120 2013-07-06 17:25:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/TextCollector.st,v 1.121 2013-07-07 11:43:31 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/TextCollector.st,v 1.120 2013-07-06 17:25:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/TextCollector.st,v 1.121 2013-07-07 11:43:31 cg Exp $'
! !