#BUGFIX by alkurz
authoralkurz
Wed, 29 Apr 2020 09:58:01 +0200
changeset 19582 32a575b05791
parent 19581 4169ae666b57
child 19583 95365b5ac1f5
#BUGFIX by alkurz Comparing directories failed class: AbstractFileBrowser changed: #openDiffViewOn:and:
AbstractFileBrowser.st
--- a/AbstractFileBrowser.st	Tue Apr 21 13:54:52 2020 +0200
+++ b/AbstractFileBrowser.st	Wed Apr 29 09:58:01 2020 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -3026,7 +3024,7 @@
                                     "/ are perfect here, but usually not available in the font
                                     "/ and we have currently no way of knowing if they are...
                                     "/ (could let the font draw into a bitmap and check if there is something...)
-                                    "/ For now, write a dot.·
+                                    "/ For now, write a dot.·
                                     "/ charPrinted := (Character value:(byte + 16r2400))
                                 ].
                             ].
@@ -8754,13 +8752,13 @@
 
             file1 notNil ifTrue:[
                 file1 isDirectory ifTrue:[
-                    text1 := file1 directoryContents asString.
+                    text1 := file1 directoryContents asStringCollection asString.
                 ] ifFalse:[
                     text1 := file1 contents.
                 ]
             ].
             file2 isDirectory ifTrue:[
-                text2 := file2 directoryContents asString.
+                text2 := file2 directoryContents asStringCollection asString.
             ] ifFalse:[
                 text2 := file2 contents.
             ].
@@ -9261,7 +9259,7 @@
             ] ifFalse:[sig == HaltInterrupt ifTrue:[ |sender|
                 label := msg := 'Breakpoint/Halt in fileIn'.
                 sender := ex suspendedContext.
-                msg := msg , ('\\in %1 » %2' bindWith:(sender receiver class name) with:(sender sender selector))
+                msg := msg , ('\\in %1 » %2' bindWith:(sender receiver class name) with:(sender sender selector))
             ] ifFalse:[
                 label := 'Error in fileIn'.
                 msg := 'error in fileIn: %1'