*** empty log message ***
authorca
Mon, 15 Mar 2004 13:59:21 +0100
changeset 5718 a16c274a18ef
parent 5717 f2ec29a73239
child 5719 56551053942f
*** empty log message ***
FileApplicationNoteBook.st
--- a/FileApplicationNoteBook.st	Mon Mar 15 13:05:14 2004 +0100
+++ b/FileApplicationNoteBook.st	Mon Mar 15 13:59:21 2004 +0100
@@ -4344,10 +4344,10 @@
      that symbol, and #decodeString: should be able to convert it into unicode.
      Always returns a unicode string."
 
-    |text line fileEncoding encoder firstDecoderError|
+    |text line fileEncoding decoder firstDecoderError|
 
     fileEncoding := fileEncodingArg ? #'iso8859-1'.
-    encoder := CharacterEncoder encoderToEncodeFrom:fileEncoding into:#'unicode'.
+    decoder := CharacterEncoder encoderFor:fileEncoding.
 
     text := StringCollection new.
 
@@ -4380,13 +4380,13 @@
             ] do:[
                 [aStream atEnd] whileFalse:[
                     line := aStream nextLine withTabsExpanded.
-                    text add:(encoder encodeString:line)
+                    text add:(decoder decodeString:line)
                 ].
             ].
         ] ifFalse:[
             [aStream atEnd] whileFalse:[
                 line := (aStream upTo:aCharacter) withTabsExpanded.
-                text add:(encoder encodeString:line)
+                text add:(decoder decodeString:line)
             ].
         ].
     ].
@@ -5457,5 +5457,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.163 2004-03-15 12:05:14 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.164 2004-03-15 12:59:21 ca Exp $'
 ! !