--- a/CharacterWriteStream.st Thu Jul 16 18:31:28 2015 +0200
+++ b/CharacterWriteStream.st Thu Jul 16 18:33:09 2015 +0200
@@ -104,7 +104,7 @@
|sz newSz bitsPerCharacter|
- bitsPerCharacter := aCharacterOrString bitsPerCharacter.
+ bitsPerCharacter := aCharacterOrString bitsPerCharacterInString.
currentCharacterSize < bitsPerCharacter ifTrue:[
sz := collection size.
position + additionalSize >= sz ifTrue:[
@@ -121,19 +121,16 @@
!CharacterWriteStream methodsFor:'private-accessing'!
on:aCollection
-
currentCharacterSize := aCollection bitsPerCharacter.
^ super on:aCollection.
!
on:aCollection from:start to:stop
-
currentCharacterSize := aCollection bitsPerCharacter.
^ super on:aCollection from:start to:stop.
!
with:aCollection
-
currentCharacterSize := aCollection bitsPerCharacter.
^ super with:aCollection.
! !
@@ -145,7 +142,7 @@
Redefined to avoid count grows of the underlying collection -
instead a single grow on the final size is performed."
- aCharacter bitsPerCharacter > currentCharacterSize ifTrue:[
+ aCharacter bitsPerCharacterInString > currentCharacterSize ifTrue:[
self characterSizeChanged:aCharacter size:count.
].
super next:count put:aCharacter
@@ -228,7 +225,7 @@
(writeLimit isNil
or:[(position + 1) <= writeLimit]) ifTrue:[
- currentCharacterSize < aCharacter bitsPerCharacter ifTrue:[
+ currentCharacterSize < aCharacter bitsPerCharacterInString ifTrue:[
self characterSizeChanged:aCharacter size:1.
].
(position >= collection size) ifTrue:[self growCollection].
@@ -245,14 +242,14 @@
"append aCollection to the receiver.
Redefined to convert to a string of the needed charcter size."
- aCollection bitsPerCharacter > currentCharacterSize ifTrue:[
+ aCollection bitsPerCharacterInString > currentCharacterSize ifTrue:[
self characterSizeChanged:aCollection size:aCollection size.
].
super nextPutAll:aCollection
!
nextPutAll:aCollection startingAt:start to:stop
- aCollection bitsPerCharacter > currentCharacterSize ifTrue:[
+ aCollection bitsPerCharacterInString > currentCharacterSize ifTrue:[
self characterSizeChanged:aCollection size:stop-start+1.
].
^ super nextPutAll:aCollection startingAt:start to:stop
@@ -269,10 +266,10 @@
!CharacterWriteStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/CharacterWriteStream.st,v 1.15 2015-04-24 12:11:13 stefan Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/CharacterWriteStream.st,v 1.15 2015-04-24 12:11:13 stefan Exp $'
+ ^ '$Header$'
! !