--- a/ResourcePack.st	Wed Nov 05 16:13:16 2008 +0100
+++ b/ResourcePack.st	Thu Nov 06 12:00:33 2008 +0100
@@ -467,26 +467,26 @@
 processResourceLine:lineString encoding:encodingSymbolOrEncoder file:fileName printErrorWith:printError for:aResourcePack keepUselessTranslations:keepUselessTranslations
     "process a single valid line (i.e. #ifdef & #include has already been processed)"
 
-    |name decodedLine lineStream idx rest macroName value 
+    |name lineStream idx rest macroName value 
      conditional hasError decoder oldValue ignoreTranslation indirect|
 
     encodingSymbolOrEncoder notNil ifTrue:[
         encodingSymbolOrEncoder isSymbol ifTrue:[
             decoder := CharacterEncoder encoderFor:encodingSymbolOrEncoder ifAbsent:nil.
-            decoder isNil ifTrue:[ decoder := CharacterEncoder::NullEncoder ].
+            decoder isNil ifTrue:[ decoder := CharacterEncoder nullEncoderInstance ].
         ] ifFalse:[
             decoder := encodingSymbolOrEncoder
         ].
     ].
 
     decoder notNil ifTrue:[
-        decodedLine := decoder decodeString:lineString.
-        lineStream := ReadStream on:decodedLine.
+        lineStream := (decoder decodeString:lineString) readStream.
     ] ifFalse:[
-        lineStream := ReadStream on:lineString.
+        lineStream := lineString readStream.
     ].
     lineStream signalAtEnd:false.
     lineStream skipSeparators.
+
     lineStream peek == $# ifTrue:[
         name := Array 
                     readFrom:lineStream 
@@ -496,13 +496,12 @@
                             ].
     ] ifFalse:[
         lineStream peek == $' ifTrue:[
-            name := UnicodeString 
+            name := String 
                         readSmalltalkStringFrom:lineStream 
                         onError:[
                                     printError value:('invalid line <' , lineString , '>').
                                     nil
                                 ].
-            name := name asSingleByteStringIfPossible.
         ] ifFalse:[
             name := lineStream upToSeparator.
         ].
@@ -511,7 +510,6 @@
     name isNil ifTrue:[^ self ].
 
     ignoreTranslation := false.
-
     hasError := false.
 
     lineStream skipSeparators.
@@ -570,13 +568,12 @@
         ]
     ] ifFalse:[
         lineStream peek == $' ifTrue:[
-            value := UnicodeString 
+            value := String 
                         readSmalltalkStringFrom:lineStream 
                         onError:[
                                     printError value:('invalid line <' , lineString , '>').
                                     nil
                                 ].
-            value := value asSingleByteStringIfPossible.
         ] ifFalse:[
             rest := lineStream upToEnd.
             value := Compiler evaluate:rest compile:false.
@@ -1315,7 +1312,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.133 2008-10-30 15:52:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.134 2008-11-06 11:00:33 stefan Exp $'
 ! !
 
 ResourcePack initialize!