--- a/CharacterEncoder.st Thu Apr 05 11:59:44 2012 +0200
+++ b/CharacterEncoder.st Thu Apr 05 12:00:23 2012 +0200
@@ -1100,15 +1100,13 @@
(which is usually the first few bytes of a textFile).
If thats not found, use heuristics (in CharacterArray) to guess."
- |s buffer n "{Class: SmallInteger }"
- binary enc|
+ |s buffer n "{Class: SmallInteger }" enc|
s := aFilename asFilename readStreamOrNil.
s isNil ifTrue:[^ nil].
buffer := String new:64.
- n := buffer size.
- n := s nextBytes:n into:buffer.
+ n := s nextBytes:buffer size into:buffer.
s close.
enc := self guessEncodingOfBuffer:buffer.
@@ -1147,8 +1145,9 @@
^ nil
"
- self guessEncodingOfFile:'../../libview2/resources/ApplicationModel_de.rs' asFilename
- self guessEncodingOfFile:'../../libview2/resources/ApplicationModel_ru.rs' asFilename
+ self guessEncodingOfFile:'../../libview/resources/de.rs' asFilename
+ self guessEncodingOfFile:'../../libview/resources/ru.rs' asFilename
+ self guessEncodingOfFile:'../../libview/resources/th.rs' asFilename
"
"Modified: / 31-05-2011 / 15:45:19 / cg"
@@ -1166,8 +1165,7 @@
buffer := String new:64.
oldPosition := aStream position.
- n := buffer size.
- n := aStream nextBytes:n into:buffer.
+ n := aStream nextBytes:buffer size into:buffer.
aStream position:oldPosition.
^ self guessEncodingOfBuffer:buffer
@@ -1627,11 +1625,11 @@
!CharacterEncoder class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.111 2011-05-31 14:06:40 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.112 2012-04-05 10:00:23 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.111 2011-05-31 14:06:40 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.112 2012-04-05 10:00:23 stefan Exp $'
! !
CharacterEncoder initialize!