--- a/FileApplicationNoteBook.st	Wed Apr 22 19:54:49 2015 +0200
+++ b/FileApplicationNoteBook.st	Wed Apr 22 20:05:37 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -693,19 +695,17 @@
     anApplication postOpenWith:anApplication builder.
 !
 
-tabStringAdd:aString for:aAppl
-
+tabStringAdd:aString for:anAppl
     | index text stream|
 
-    index := self getIndexFor:aAppl.
+    index := self getIndexFor:anAppl.
     index isNil ifTrue:[ ^ self].
     text := self privateTabList at:index.
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     stream nextPutAll:text.
     stream space.
     stream nextPutAll:aString.
     self privateTabList at:index put:(Text string:(stream contents)).
-    stream close.
 !
 
 tabStringChangeTo:aString for:anAppl
@@ -1962,13 +1962,12 @@
     sel := self selectionHolder value.
     list := self archiveFileList.
     (sel notEmptyOrNil) ifTrue:[
-        stream := WriteStream on:''.
+        stream := CharacterWriteStream new.
         sel do:[: key |
             stream nextPutAll:(key fileName asString).
             stream cr.
         ].
         self window setClipboardText:stream contents.
-        stream close.
     ].
 
     "Modified (format): / 29-11-2011 / 18:57:40 / cg"
@@ -2578,7 +2577,7 @@
     size := sel size.
     size == 0  ifTrue:[^ ''].
 
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     stream nextPutAll:(sel first fileName asFilename baseName asString).
     size == 1 ifTrue:[
         fnName := 'ui_menuitem.xpm'.
@@ -6003,7 +6002,6 @@
 !
 
 updateSameFilesFor:aFilename
-
     | master modifiedApplications stream filename action|
 
     master := self masterApplication.
@@ -6011,8 +6009,7 @@
         modifiedApplications := master getSameFilesModifiedFor:self.
         (modifiedApplications isEmptyOrNil) ifTrue:[^ true ].
         filename := aFilename asString.
-        stream := WriteStream on:''.
-        stream nextPutAll:filename.
+        stream := CharacterWriteStream with:filename.
         stream nextPutAll:' is modified in tab'.
         modifiedApplications size > 1 ifTrue:[
             stream nextPutAll:'s'.
@@ -7173,19 +7170,15 @@
 !FileApplicationNoteBook::XViewApplication methodsFor:'actions'!
 
 changeInformation 
-
-    | stream|
-
-    stream := WriteStream on:''.
-    stream nextPutAll:'XView on: '.
+    |stream|
+
+    stream := CharacterWriteStream with:'XView on: '.
     stream nextPutAll:self fileName baseName.
     masterApplication isNil ifTrue:[
         self window label:stream contents.
-
     ] ifFalse:[
         masterApplication tabStringChangeTo:stream contents for:self.
     ].
-    stream close.
 !
 
 setupXView
@@ -7498,10 +7491,10 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.318 2015-03-01 16:55:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.319 2015-04-22 18:05:37 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.318 2015-03-01 16:55:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.319 2015-04-22 18:05:37 stefan Exp $'
 ! !