FileBrowser.st
branchjv
changeset 13170 c9b815af5777
parent 12807 ba8c5416aa28
parent 12843 481f4ad06396
child 13173 e9da2324940d
--- a/FileBrowser.st	Tue Jun 04 16:21:31 2013 +0100
+++ b/FileBrowser.st	Wed Jun 12 16:47:06 2013 +0100
@@ -1757,11 +1757,12 @@
 hasZipFileSelected
     |sel fileName suff|
 
-    sel := fileListView selection.
+    sel := fileListView selectionValue.
     sel size == 1 ifFalse:[^ false].
 
     fileName := sel first.
     fileName isNil ifTrue:[^ false].
+    fileName := fileName string withoutSeparators asFilename.
 
     suff := fileName suffix asLowercase.
     (suff = 'zip' or:[suff = 'jar']) ifTrue:[^ true].
@@ -2516,7 +2517,7 @@
 
         dir := currentDirectory asFilename.
         self label:myName , '- gathering file names ...'.
-        fileNames := dir recursiveDirectoryContentsAsFilenames select:[:fn | fn isDirectory not].
+        fileNames := dir recursiveDirectoryContentsAsFilenames reject:[:fn | fn isDirectory ].
 
         self label:myName , '- gathering sizes ...'.
         infoDir := Dictionary new.
@@ -2616,7 +2617,7 @@
         result := Dictionary new.
 
         dir := currentDirectory asFilename.
-        fileNames := dir directoryContentsAsFilenames select:[:fn | fn isDirectory not].
+        fileNames := dir directoryContentsAsFilenames reject:[:fn | fn isDirectory ].
 
         infoDir := Dictionary new.
         fileNames do:[:fn |
@@ -6696,7 +6697,7 @@
     "get stat info on selected file - return a string which can be
      shown in a box"
 
-    |fileName f text info fileOutput type modeBits modeString s ts md5Hash|
+    |fileName f text info fileOutput modeBits modeString s ts md5Hash|
 
     fileName := self getSelectedFileName.
     fileName isNil ifTrue:[^ nil].
@@ -6723,14 +6724,14 @@
 
     s := (resources string:'type:   ').
     fileOutput isNil ifTrue:[
-        s := s ,  type asString
+        s := s ,  info type asString
     ] ifFalse:[
         s := s , 'regular (' , fileOutput , ')'
     ].
     text add:s.
     text add:(resources string:'size:   %1' with:(info size) printString).
 
-    self hasMD5 value ifTrue:[
+    info isRegular ifTrue:[
         md5Hash := MD5Stream hashValueOfFile:f.
         s := String streamContents:[:s | md5Hash do:[:byte | s nextPutAll:(byte hexPrintString)]].
         text add:(resources string:'md5:   %1' with:s).
@@ -7505,11 +7506,11 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.647 2013-04-27 13:01:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.649 2013-06-05 13:22:16 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.647 2013-04-27 13:01:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.649 2013-06-05 13:22:16 stefan Exp $'
 !
 
 version_HG