--- a/AbstractFileBrowser.st	Tue Oct 21 16:14:16 2003 +0200
+++ b/AbstractFileBrowser.st	Tue Oct 21 20:21:29 2003 +0200
@@ -2489,16 +2489,13 @@
 !
 
 openApplByFileItem:anItem
-
     self 
         applicationNamed:#FileApplicationNoteBook
-        ifPresentDo:[:appl | ^ appl openApplByFileItem:anItem].
-
-    ^ nil
+        ifPresentDo:[:appl | appl openApplByFileItem:anItem. ^self].
 !
 
 openApplForFile:aFilename
-    ^ self openApplByFileItem:(DirectoryContentsBrowser itemClass fileName:aFilename).
+    self openApplByFileItem:(DirectoryContentsBrowser itemClass fileName:aFilename).
 !
 
 openCommandResultApplication
@@ -6427,5 +6424,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.177 2003-10-13 13:32:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.178 2003-10-21 18:20:57 cg Exp $'
 ! !

--- a/DirectoryContentsBrowser.st	Tue Oct 21 16:14:16 2003 +0200
+++ b/DirectoryContentsBrowser.st	Tue Oct 21 20:21:29 2003 +0200
@@ -1094,7 +1094,9 @@
         self currentFileNameHolder value:(OrderedCollection with:filename).
         ^ self.
     ].
-    self openApplByFileItem:anItem.
+    self withWaitCursorDo:[
+        self openApplByFileItem:anItem.
+    ]
 !
 
 noOfAddedFiles:noOfAddedFiles noOfFiles:noOfFiles
@@ -3044,5 +3046,5 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.133 2003-10-21 07:28:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.134 2003-10-21 18:20:17 cg Exp $'
 ! !

--- a/FileApplicationNoteBook.st	Tue Oct 21 16:14:16 2003 +0200
+++ b/FileApplicationNoteBook.st	Tue Oct 21 20:21:29 2003 +0200
@@ -446,7 +446,7 @@
 
 " use the default class list for open of applications by item "
 
-    | applList applItem itemClass|
+    | applList applItem itemClass itemType appl|
 
     anItem isNil ifTrue:[ ^ self ].
     anItem isDirectory ifTrue:[
@@ -457,19 +457,19 @@
     self openAlwaysInTextEditor value ifTrue:[
         ^ self openDefaultApplicationByItem:anItem.
     ].
-    applItem := applList detect:[: aApplItem|
-        itemClass := self class classFor:aApplItem.
-        (itemClass canOpenItem:anItem).
-    ] ifNone:[nil].
-    applItem isNil ifTrue:[ ^ self openDefaultApplicationByItem:anItem].
-    applItem notNil ifTrue:[
-        |  itemType appl|
-        itemType := self class typeFor:applItem.
-        itemClass := self class classFor:applItem.
-        appl := self openApplicationClass:itemClass withItem:anItem withType:itemType.
-        appl notNil ifTrue:[ ^ appl].
-        ^ self openDefaultApplicationByItem:anItem.            
+    applItem := applList 
+                    detect:[: aApplItem|
+                        itemClass := self class classFor:aApplItem.
+                        (itemClass canOpenItem:anItem).
+                    ] ifNone:[nil].
+    applItem isNil ifTrue:[ 
+        ^ self openDefaultApplicationByItem:anItem
     ].
+    itemType := self class typeFor:applItem.
+    itemClass := self class classFor:applItem.
+    appl := self openApplicationClass:itemClass withItem:anItem withType:itemType.
+    appl notNil ifTrue:[ ^ appl].
+    ^ self openDefaultApplicationByItem:anItem.            
 !
 
 openApplicationClass:aClass withItem:anItem withType:aType
@@ -4957,5 +4957,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.118 2003-10-21 07:27:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.119 2003-10-21 18:21:29 cg Exp $'
 ! !