--- a/AbstractFileBrowser.st Sat Mar 20 16:01:48 2004 +0100
+++ b/AbstractFileBrowser.st Sat Mar 20 16:02:50 2004 +0100
@@ -5378,22 +5378,25 @@
openImagePreview
- [self loadImageAndPerform:[:img |
- |i top viewer|
-
- top := StandardSystemView new.
-
- viewer := ImageView origin:0.0@0.0 corner:1.0@1.0 in:top.
- i := img.
- top extent:200@200.
- top label:(img fileName asFilename directoryName asFilename baseName , Filename separator asString , img fileName asFilename baseName).
- top openAndWait.
-
- (i width > 200 or:[i height > 200]) ifTrue:[
- i := i magnifiedPreservingRatioTo:200@200.
- ].
- viewer image:i.
- ].
+ [
+ self
+ loadImageAndPerform:
+ [:img |
+ |i top viewer|
+
+ top := StandardSystemView new.
+
+ viewer := ImageView origin:0.0@0.0 corner:1.0@1.0 in:top.
+ i := img.
+ top extent:200@200.
+ top label:(img fileName asFilename directory baseName , Filename separator , img fileName asFilename baseName).
+ top openAndWait.
+
+ (i width > 200 or:[i height > 200]) ifTrue:[
+ i := i magnifiedPreservingRatioTo:200@200.
+ ].
+ viewer image:i.
+ ].
] fork
!
@@ -6714,5 +6717,5 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.224 2004-03-20 11:44:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.225 2004-03-20 15:02:11 cg Exp $'
! !
--- a/DiffTextView.st Sat Mar 20 16:01:48 2004 +0100
+++ b/DiffTextView.st Sat Mar 20 16:02:50 2004 +0100
@@ -218,7 +218,7 @@
stream := tmpFile1 writeStream.
text1 do:[:line |
line notNil ifTrue:[
-(line includes:Character return) ifTrue: [self halt].
+(line includes:Character return) ifTrue: [self halt:'oops - funny line'].
stream nextPutAll:line.
].
stream cr
@@ -229,7 +229,7 @@
stream := tmpFile2 writeStream.
text2 do:[:line |
line notNil ifTrue:[
-(line includes:Character return) ifTrue: [self halt].
+(line includes:Character return) ifTrue: [self halt:'oops - funny line'].
stream nextPutAll:line.
].
stream cr
@@ -245,8 +245,8 @@
stream := PipeStream readingFrom:diffCmd.
stream isNil ifTrue:[
- stream := PipeStream readingFrom:('support' , Filename separator asString , diffCmd).
- ].
+ stream := PipeStream readingFrom:('support' , Filename separator , diffCmd).
+ ].
stream isNil ifTrue:[
self error:'cannot execute diff'.
text1 := text2 := nil.
@@ -632,5 +632,5 @@
!DiffTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.37 2003-01-27 12:07:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.38 2004-03-20 15:02:50 cg Exp $'
! !