--- a/AbstractFileApplicationNoteBookComponent.st	Fri Nov 27 23:08:58 2015 +0000
+++ b/AbstractFileApplicationNoteBookComponent.st	Tue Dec 01 06:37:38 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -220,22 +218,22 @@
 getTabString
     "get the tab string from the application"
 
-    ^ (Unicode16String 
-        streamContents:[:stream |
-            |formatString valueString|
+    |formatString valueString stream|
+
+    stream := CharacterWriteStream on:''.
 
-            valueString := self getTabValueString.
-            valueString isNil ifTrue:[
-                valueString := resources string:'<unnamed>'
-            ].
+    valueString := self getTabValueString.
+    valueString isNil ifTrue:[
+        valueString := resources string:'<unnamed>'
+    ].
+    formatString := self class tabStringFor:type.
+    formatString isNil ifTrue:[
+        "/ default: take the class name
+        formatString := self className.
+    ].
+    stream nextPutAll:(resources string:formatString with:valueString).
 
-            formatString := self class tabStringFor:type.
-            formatString isNil ifTrue:[
-                "/ default: take the class name
-                formatString := self className.
-            ].
-            stream nextPutAll:(resources string:formatString with:valueString).
-        ]) asSingleByteStringIfPossible
+    ^ stream contents.
 
     "Modified: / 01-03-2007 / 21:45:02 / cg"
 !
@@ -268,28 +266,29 @@
 getTabValueString
     "the item shown in a tab (not language translated)"
 
+    |stream fn baseName|
+
     self item isNil ifTrue:[^ nil].
 
-    ^ (Unicode16String 
-        streamContents:[:stream |
-            |fn baseName|
+    stream := CharacterWriteStream on:''.
 
-            fn := self fileName.
-            baseName := fn baseName.
-            self type = #directoryDescription ifTrue:[
-                stream nextPutAll:(fn directory baseName).
-                stream space.
-                stream nextPut:$[.
-                stream nextPutAll:baseName.
-                stream nextPut:$].
-            ] ifFalse:[
-                stream nextPutAll:baseName.
-                stream space.
-                self sameFileIndex notNil ifTrue:[
-                    stream nextPutAll:self sameFileIndex asString.
-                ].
-            ].
-        ]) asSingleByteStringIfPossible.
+    fn := self fileName.
+    baseName := fn baseName.
+    self type = #directoryDescription ifTrue:[
+        stream nextPutAll:(fn directory baseName).
+        stream space.
+        stream nextPut:$[.
+        stream nextPutAll:baseName.
+        stream nextPut:$].
+    ] ifFalse:[
+        stream nextPutAll:baseName.
+        stream space.
+        self sameFileIndex notNil ifTrue:[
+            stream nextPutAll:self sameFileIndex asString.
+        ].
+    ].
+
+    ^ stream contents
 
     "Created: / 01-03-2007 / 21:40:03 / cg"
 !