--- a/AbstractFileApplicationNoteBookComponent.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/AbstractFileApplicationNoteBookComponent.st	Thu Apr 23 06:49:03 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ApplicationModel subclass:#AbstractFileApplicationNoteBookComponent
 	instanceVariableNames:'sameFileIndex item type notifyChannel'
 	classVariableNames:''
@@ -233,13 +237,12 @@
 !
 
 getTabStringEnd
-
-" get the tab string from the application list on the class side "
+    " get the tab string from the application list on the class side "
 
     | stream|
 
     self item notNil ifTrue:[
-        stream := WriteStream on:''.
+        stream := CharacterWriteStream new.
         self type = #directoryDescription ifTrue:[
             stream nextPutAll:self fileName directory baseName.
             stream space.
@@ -345,10 +348,10 @@
 !AbstractFileApplicationNoteBookComponent class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileApplicationNoteBookComponent.st,v 1.25 2014-10-25 11:58:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileApplicationNoteBookComponent.st,v 1.26 2015-04-22 17:21:44 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileApplicationNoteBookComponent.st,v 1.25 2014-10-25 11:58:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileApplicationNoteBookComponent.st,v 1.26 2015-04-22 17:21:44 stefan Exp $'
 ! !
 

--- a/AbstractFileBrowser.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/AbstractFileBrowser.st	Thu Apr 23 06:49:03 2015 +0200
@@ -5827,7 +5827,7 @@
     selectedFiles do:[:each |
         |out diffs|
 
-        out := WriteStream on:(String new:100).
+        out := CharacterWriteStream new:100.
         OperatingSystem 
             executeCommand:'cvs diff -b ',each baseName
             outputTo:out
@@ -5986,7 +5986,7 @@
         cmd := 'cvs'.
     ].
 
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     stream 
         nextPutAll:cmd; 
         nextPutAll:' upd ';
@@ -5998,7 +5998,7 @@
 makeFileNameArgumentString
     |stream|
 
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     self currentSelectedFiles do:[: file |
         stream nextPut:$".
         stream nextPutAll:file baseName.
@@ -6908,7 +6908,7 @@
         ].
     ].
 
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     stream nextPutAllLines:info.
 
     textBox := TextBox new.
@@ -6969,8 +6969,7 @@
         ].
     ].
 
-    stream := WriteStream on:''.
-    stream nextPutLine:'Duplicates:'.
+    stream := CharacterWriteStream with:'Duplicates:'.
     (samePerFile keys asOrderedCollection sort:[:a :b | a asFilename baseName < b asFilename baseName])
     do:[:origFile |
         |sameFiles|
@@ -7120,11 +7119,10 @@
             ^ self.
         ].
     ].
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     stream nextPutAllLines:info.
 
-    titleStream := WriteStream on:''.
-    titleStream nextPutAll:'File duplicates in directory'.
+    titleStream := CharacterWriteStream with:'File duplicates in directory'.
     directories size == 1 ifTrue:[
         titleStream nextPutAll:'y: '; nextPutAll: directories first asString.
     ] ifFalse:[
@@ -7246,7 +7244,7 @@
         ].
     ].
 
-    stream := WriteStream on:''.
+    stream := CharacterWriteStream new.
     alreadyPrinted := Set new.
 
     imageFiles do:[:eachFile |
@@ -9656,10 +9654,10 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.589 2015-04-09 12:24:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.590 2015-04-22 17:24:51 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.589 2015-04-09 12:24:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.590 2015-04-22 17:24:51 stefan Exp $'
 ! !
 

--- a/AbstractFileFinderApplicationComponent.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/AbstractFileFinderApplicationComponent.st	Thu Apr 23 06:49:03 2015 +0200
@@ -92,13 +92,12 @@
     sel := self selectionHolder value.
     list := self shownList.
     (sel notEmptyOrNil) ifTrue:[
-        stream := WriteStream on:''.
+        stream := CharacterWriteStream new.
         sel do:[: key |
             stream nextPutAll:(list at:key).
             stream cr.
         ].
         self window setClipboardText:stream contents.
-        stream close.
     ].
 !
 
@@ -327,8 +326,7 @@
     size := sel size.
     size == 0  ifTrue:[^ ''].
 
-    stream := WriteStream on:''.
-    stream nextPutAll:((resultList at:sel first) asFilename baseName asString).
+    stream := CharacterWriteStream with:((resultList at:sel first) asFilename baseName asString).
     size == 1 ifTrue:[
         fnName := 'ui_menuitem.xpm'.
     ] ifFalse:[
@@ -490,10 +488,10 @@
 !AbstractFileFinderApplicationComponent class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.16 2015-02-27 23:11:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.17 2015-04-22 17:25:52 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.16 2015-02-27 23:11:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileFinderApplicationComponent.st,v 1.17 2015-04-22 17:25:52 stefan Exp $'
 ! !
 

--- a/ContextInspectorView.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/ContextInspectorView.st	Thu Apr 23 06:49:03 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 InspectorView subclass:#ContextInspectorView
 	instanceVariableNames:'inspectedContext names showingTemporaries argsOnly contextSize
 		workspaceVariableNamesInDoIts'
@@ -554,36 +558,34 @@
 stringWithAllNames:names andValues:values
     "helper for '-all local vars' and '-all workspace vars'"
 
-    |s  maxLen varString|
+    |outStream  maxLen varString|
 
-    s := '' writeStream.
+    outStream := CharacterWriteStream new.
     maxLen := (names collect:[:eachName | eachName size]) max.
 
     names with:values do:[:eachName :eachValue |
-        s nextPutAll:((eachName , ' ') paddedTo:maxLen+1 with:$.).
-        s nextPutAll:' : '.
+        outStream nextPutAll:((eachName , ' ') paddedTo:maxLen+1 with:$.).
+        outStream nextPutAll:' : '.
 
         [
             |s|
 
-            s := WriteStream on:(String new:10).
+            s := CharacterWriteStream new.
             s writeLimit:100000.
             eachValue displayOn:s.
             varString := s contents.
-"/            varString := (self valueAtIndex:varIdx) displayString.
         ] on:Error do:[:ex |
             varString := ('*** Error in displayString (%1)***' bindWith:ex description)
         ].
-        varString := varString ? ''.
 
         (varString includes:Character cr) ifTrue:[
             varString := varString copyTo:(varString indexOf:Character cr)-1.
             varString := varString , '...'.
         ].
-        s nextPutAll:varString.
-        s cr.
+        outStream nextPutAll:varString.
+        outStream cr.
     ].
-    ^ s contents
+    ^ outStream contents
 !
 
 stringWithAllWorkspaceValues
@@ -747,10 +749,10 @@
 !ContextInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.97 2014-07-08 21:53:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.98 2015-04-22 17:50:00 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.97 2014-07-08 21:53:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.98 2015-04-22 17:50:00 stefan Exp $'
 ! !
 

--- a/DirectoryContentsBrowser.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/DirectoryContentsBrowser.st	Thu Apr 23 06:49:03 2015 +0200
@@ -1793,8 +1793,7 @@
     selectedItems := self selectedFiles.
     selectedItems isEmpty ifTrue:[ ^ ''].
 
-    stream := WriteStream on:''.
-    stream nextPutAll:(selectedItems first baseName).
+    stream := CharacterWriteStream with:(selectedItems first baseName).
     selectedItems size == 1 ifTrue:[
         fnName := 'ui_menuitem.xpm'.
     ] ifFalse:[
@@ -3526,10 +3525,10 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.270 2015-02-27 23:12:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.271 2015-04-22 17:53:25 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.270 2015-02-27 23:12:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.271 2015-04-22 17:53:25 stefan Exp $'
 ! !
 

--- a/DirectoryTreeBrowser.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/DirectoryTreeBrowser.st	Thu Apr 23 06:49:03 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractDirectoryBrowser subclass:#DirectoryTreeBrowser
 	instanceVariableNames:'oldDropItem expandItemTimedBlock updateTreeSelection
 		doubleClickAction newVisibilityHolder allowFileOperations
@@ -1012,8 +1016,7 @@
     selectedItems := self selectedItems.
     selectedItems isEmpty ifTrue:[ ^ ''].
 
-    stream := WriteStream on:''.
-    stream nextPutAll:(selectedItems first baseName).
+    stream := CharacterWriteStream with:(selectedItems first baseName).
     selectedItems size == 1 ifTrue:[
         fnName := 'ui_menuitem.xpm'.
     ] ifFalse:[
@@ -1404,10 +1407,10 @@
 !DirectoryTreeBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.130 2014-07-04 10:22:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.131 2015-04-22 17:54:49 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.130 2014-07-04 10:22:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.131 2015-04-22 17:54:49 stefan Exp $'
 ! !
 

--- a/FileApplicationNoteBook.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/FileApplicationNoteBook.st	Thu Apr 23 06:49:03 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 $'
 ! !
 

--- a/Tools__NewSystemBrowser.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/Tools__NewSystemBrowser.st	Thu Apr 23 06:49:03 2015 +0200
@@ -36661,7 +36661,7 @@
 
             self busyLabel:'extracting history ...' with:nil.
 
-            aStream := WriteStream on:(String new:200).
+            aStream := CharacterWriteStream new:200.
             Processor activeProcess
                 withPriority:Processor activePriority-1 to:Processor activePriority
             do:[
@@ -36728,7 +36728,7 @@
 
     |codeView aStream|
 
-    aStream := WriteStream on:(String new:200).
+    aStream := CharacterWriteStream new:200.
 
     Processor activeProcess
         withPriority:Processor activePriority-1 to:Processor activePriority
@@ -62518,11 +62518,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2216 2015-04-17 14:11:05 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2217 2015-04-22 18:08:52 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2216 2015-04-17 14:11:05 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2217 2015-04-22 18:08:52 stefan Exp $'
 !
 
 version_HG
@@ -62531,7 +62531,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__NewSystemBrowser.st,v 1.2216 2015-04-17 14:11:05 stefan Exp $'
+    ^ '$Id: Tools__NewSystemBrowser.st,v 1.2217 2015-04-22 18:08:52 stefan Exp $'
 ! !
 
 

--- a/extensions.st	Wed Apr 22 06:47:55 2015 +0200
+++ b/extensions.st	Thu Apr 23 06:49:03 2015 +0200
@@ -1693,9 +1693,9 @@
 !Object methodsFor:'debugging'!
 
 newInspector2Tab
+    "return an extra tab to be used inside an inspector"
 
     "Use Smalltalk>>at: to trick the dependency detector"
-
     "/ why do we need this hack - the Tools::Inspector2Tab class and this
     "/ extension are in the same package anyway?!!
     ^(Smalltalk at: #'Tools::Inspector2Tab') 
@@ -2724,7 +2724,7 @@
 !stx_libtool class methodsFor:'documentation'!
 
 extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.153 2015-03-26 10:22:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.154 2015-04-22 13:58:53 cg Exp $'
 ! !
 
 !stx_libtool class methodsFor:'documentation'!