--- a/FileApplicationNoteBook.st	Wed Jun 11 10:33:08 2003 +0200
+++ b/FileApplicationNoteBook.st	Thu Jun 12 13:08:04 2003 +0200
@@ -1254,7 +1254,7 @@
          #(#MenuItem
             #enabled: #canDelete
             #label: 'Delete from Archive'
-            #itemValue: #removeFilesFromArchiv
+            #itemValue: #removeFilesFromArchive
             #translateLabel: true
             #shortcutKey: #Delete
           )
@@ -1819,58 +1819,13 @@
 !
 
 getOutBlock
-
-    |firstLineNotReaded key|
-
-    firstLineNotReaded := true.
+    |archiveOutputParser|
+
+    archiveOutputParser := archiver listFilesReader.
+
     ^ [: line |
-        | words ownerGroup item archiverColumns index itemWordCount|
-
-        (firstLineNotReaded and:[archiver class hasTitleLine]) ifTrue:[
-            firstLineNotReaded := false.
-        ]ifFalse:[
-            words := line asCollectionOfWords.
-            archiverColumns := archiver class columns.
-            item := ArchivItem new.
-            index := 1.
-            archiverColumns do:[:colDescr |
-                | itemStream itemFieldSelector itemWriter |
-
-                itemWordCount := colDescr second.
-                itemFieldSelector := colDescr first.
-                itemFieldSelector notNil ifTrue:[
-                    itemWriter := (itemFieldSelector , ':') asSymbol.
-                ].
-                itemStream := WriteStream on:''.
-                itemWordCount == #rest ifTrue:[
-                    index to:(words size) do:[:i|
-                        itemStream nextPutAll:(words at:i).
-                        itemStream space.
-                    ].
-                ] ifFalse:[
-                    index to:(index + itemWordCount - 1) do:[:i|
-                        itemStream nextPutAll:(words at:i).
-                        itemStream space.
-                    ].
-                    index := index + itemWordCount.
-                ].
-                itemWriter notNil ifTrue:[
-                    item perform:itemWriter with:(itemStream contents).
-                ].
-                itemStream close.
-            ].
-            ((archiverColumns collect:[:el| el first]) includes:#permissions) ifTrue:[
-                (item permissions startsWith:$d) ifTrue:[
-                    key := #directory.
-                    item isDirectory:true.
-                ] ifFalse:[
-                    key := MIMETypes mimeTypeForFilename:(item fileName asFilename baseName).
-                    item isDirectory:false.
-                ].
-            ] ifFalse:[
-                key := MIMETypes mimeTypeForFilename:(item fileName asFilename baseName).
-            ].
-            item icon:(FileBrowser iconForKeyMatching:key).
+        item := archiveOutputParser parseLine:line forItemClass:ArchivItem.
+        item notNil ifTrue:[
             self archiveFileList value add:item
         ].
     ]
@@ -1917,7 +1872,7 @@
 
     | newColumns archiverColumns allColumns iconColumn|
 
-    archiverColumns := archiver class columns collect:[:el| el  first].
+    archiverColumns := archiver columns collect:[:el| el  first].
     allColumns := OrderedCollection new.
     newColumns := OrderedCollection new.
     self class tableColumns do:[:el|
@@ -2016,9 +1971,13 @@
         errorStream:(self getErrorStream)
         synchron:true.
 
-    self 
-        makeProcessFor:[ self archiver addFilesToArchive:colOfFiles ]
-        with:'Adding files to archive'.
+"/    self 
+"/        makeProcessFor:[ 
+"/            self archiver addFilesToArchive:colOfFiles.
+"/        ]
+"/        with:'Adding files to archive'.
+    "/ synchronous - otherwise list below fails
+    self archiver addFilesToArchive:colOfFiles.
 
     "/ ugly code alarm.
     (self archiver class == Archiver zipArchive) ifTrue:[
@@ -3620,7 +3579,7 @@
     self notify:'shell in ' , self fileName asString, ' finished'.
     terminalView cr.
 
-    text := '>> shell closed' asText allBold.
+    text := '>> shell closed' allBold.
     text colorizeAllWith:Color red.
     terminalView nextPutAll:text.
 !
@@ -4951,5 +4910,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.85 2003-06-10 12:14:09 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.86 2003-06-12 11:08:04 cg Exp $'
 ! !

--- a/NewSystemBrowser.st	Wed Jun 11 10:33:08 2003 +0200
+++ b/NewSystemBrowser.st	Thu Jun 12 13:08:04 2003 +0200
@@ -16445,7 +16445,7 @@
     packages := self selectedClasses value collect:[:each | each package].
     packages size == 1 ifTrue:[
         msg := resources string:'Move class(es) from ''%1'' to which project:'
-                           with:packages first asText allBold.
+                           with:packages first allBold.
     ] ifFalse:[
         msg := resources string:'Move class(es) to which project:'
     ].
@@ -56248,7 +56248,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.591 2003-06-06 17:56:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.592 2003-06-12 11:07:16 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!

--- a/Tools__NewSystemBrowser.st	Wed Jun 11 10:33:08 2003 +0200
+++ b/Tools__NewSystemBrowser.st	Thu Jun 12 13:08:04 2003 +0200
@@ -16445,7 +16445,7 @@
     packages := self selectedClasses value collect:[:each | each package].
     packages size == 1 ifTrue:[
         msg := resources string:'Move class(es) from ''%1'' to which project:'
-                           with:packages first asText allBold.
+                           with:packages first allBold.
     ] ifFalse:[
         msg := resources string:'Move class(es) to which project:'
     ].
@@ -56248,7 +56248,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.591 2003-06-06 17:56:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.592 2003-06-12 11:07:16 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!