--- a/AbstractFileBrowser.st	Fri Jul 30 17:27:09 2004 +0200
+++ b/AbstractFileBrowser.st	Tue Aug 03 11:30:12 2004 +0200
@@ -2623,12 +2623,13 @@
 gotoFile:aFilename 
     "select only if the file is not already in the selection"
     
-    |currentSel|
-
-    currentSel := self currentFileNameHolder value.
+    |currentFileNameHolder currentSel|
+
+    currentFileNameHolder := self currentFileNameHolder.
+
+    currentSel := currentFileNameHolder value.
     (currentSel includes:aFilename) ifFalse:[
-        self currentFileNameHolder 
-            value:(OrderedCollection with:(aFilename asAbsoluteFilename)).
+        currentFileNameHolder value:(OrderedCollection with:(aFilename asAbsoluteFilename)).
     ].
 !
 
@@ -2695,10 +2696,18 @@
     ^ nil.
 !
 
+setCurrentFileName:aFilename 
+    self setCurrentFileNames:(OrderedCollection with:aFilename).
+!
+
+setCurrentFileNames:aCollectionOfFilenames 
+    self currentFileNameHolder value:aCollectionOfFilenames.
+!
+
 updateAndSelect:aColOfFiles
     self updateCurrentDirectory.
     aColOfFiles notNil ifTrue:[ 
-        self currentFileNameHolder value:aColOfFiles 
+        self setCurrentFileNames:aColOfFiles 
     ].
 !
 
@@ -4023,7 +4032,7 @@
         bookmarks do:[:dirName |
             menu addItem:((MenuItem label:dirName asString value:[
                 (self currentDirectories value includes:dirName) ifFalse:[
-                    self currentFileNameHolder value:(OrderedCollection with:dirName).
+                    self setCurrentFileName:dirName.
                 ].
             ])).
         ].
@@ -4072,7 +4081,7 @@
         menuItem := MenuItem new.
         menuItem label:aPath.
         menuItem value:[
-            self currentFileNameHolder value:(OrderedCollection with:(aPath asFilename)).
+            self setCurrentFileName:(aPath asFilename).
         ].
         menu addItem:menuItem.
     ].
@@ -4113,7 +4122,7 @@
     hist do:[:aFileItem|
         aFileItem fileName exists ifTrue:[
             menu addItem:(MenuItem label: aFileItem fileName asString value:[
-                self currentFileNameHolder value:(OrderedCollection with:(aFileItem fileName)).
+                self setCurrentFileName:(aFileItem fileName).
                 self openApplByFileItem:aFileItem
             ]).
         ] ifFalse:[
@@ -4196,7 +4205,7 @@
     histCopy := self dirHistory.
     histCopy do:[:aFile| 
         menu addItem:(MenuItem label:aFile asString value:[
-            self currentFileNameHolder value:(OrderedCollection with:(aFile path asFilename)).
+            self setCurrentFileName:(aFile path asFilename).
         ]).
     ].
     menu addItem:(MenuItem label:'-').
@@ -4225,7 +4234,7 @@
                             ifPresentDo:[:appl | appl rootHolder].
         upDir := rootInTreeView value asFilename directory.
     ].
-    self currentFileNameHolder value:(OrderedCollection with:upDir).
+    self setCurrentFileName:upDir.
 !
 
 doGotoDefaultDirectory
@@ -6882,5 +6891,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.243 2004-07-28 12:12:16 james Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.244 2004-08-03 09:30:04 cg Exp $'
 ! !

--- a/DirectoryContentsBrowser.st	Fri Jul 30 17:27:09 2004 +0200
+++ b/DirectoryContentsBrowser.st	Tue Aug 03 11:30:12 2004 +0200
@@ -1140,10 +1140,11 @@
 !
 
 doubleClickedAt:anItemIndex
+    |action|
 
     self withWaitCursorDo:[
-        self doubleClickAction notNil ifTrue:[
-            self doubleClickAction value:anItemIndex.
+        (action := self doubleClickAction) notNil ifTrue:[
+            action value:anItemIndex.
         ].
         self enterActionFor:(self browserItemList at:anItemIndex). "/ anItemIndex.
     ]
@@ -1155,11 +1156,11 @@
     filename := anItem fileName.
 
     filename baseName = '..' ifTrue:[
-        self currentFileNameHolder value:(OrderedCollection with:(self directory directory)).
+        self setCurrentFileName:(self directory directory).
         ^ self.
     ].
     (filename isDirectory) ifTrue:[
-        self currentFileNameHolder value:(OrderedCollection with:filename).
+        self setCurrentFileName:filename.
         ^ self.
     ].
     self withWaitCursorDo:[
@@ -3183,5 +3184,5 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.165 2004-07-12 14:20:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.166 2004-08-03 09:30:12 cg Exp $'
 ! !

--- a/DirectoryTreeBrowser.st	Fri Jul 30 17:27:09 2004 +0200
+++ b/DirectoryTreeBrowser.st	Tue Aug 03 11:30:12 2004 +0200
@@ -487,7 +487,7 @@
         (anItem fileName directory asString startsWith:(indicatorItem fileName asString)) not] 
         ifNone:[nil].
     selectedItemNotUnderIndicatorItem isNil ifTrue:[
-        self currentFileNameHolder value:(OrderedCollection with:indicatorItem fileName).
+        self setCurrentFileName:(indicatorItem fileName).
     ].
     self toggleExpand:indicatorItem.
 !
@@ -499,7 +499,7 @@
     selDir notNil ifTrue:[
         self rootHolder value asFilename = selDir ifTrue:[ ^ self].
         self rootHolder value:selDir.
-        self currentFileNameHolder value:(OrderedCollection with:selDir).
+        self setCurrentFileName:selDir.
     ].
 !
 
@@ -801,7 +801,7 @@
             ].
         ].
     ].
-    self currentFileNameHolder value:sel.
+    self setCurrentFileNames:sel.
 !
 
 update:something with:aParameter from:aModel 
@@ -1312,5 +1312,5 @@
 !DirectoryTreeBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.88 2004-06-23 07:52:25 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.89 2004-08-03 09:30:09 cg Exp $'
 ! !

--- a/FileApplicationNoteBook.st	Fri Jul 30 17:27:09 2004 +0200
+++ b/FileApplicationNoteBook.st	Tue Aug 03 11:30:12 2004 +0200
@@ -747,7 +747,7 @@
 
 openSearchFileOn:anItem
 
-    ^ self openApplicationClass:FindFileApplication withItem:anItem withType:nil
+    ^ self openApplicationClass:FindFileApplication withItem:anItem withType:nil checkExisting:false
 !
 
 openTerminalApplication:anItem
@@ -5470,5 +5470,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.169 2004-06-11 15:21:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.170 2004-08-03 09:30:00 cg Exp $'
 ! !

--- a/FileBrowserV2.st	Fri Jul 30 17:27:09 2004 +0200
+++ b/FileBrowserV2.st	Tue Aug 03 11:30:12 2004 +0200
@@ -1410,7 +1410,7 @@
         ].
         ^ self
     ].
-    self currentFileNameHolder value:(OrderedCollection with:fileName).
+    self setCurrentFileName:fileName.
 !
 
 selectedDeviceDriveChanged
@@ -1716,7 +1716,7 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.115 2004-03-17 11:50:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.116 2004-08-03 09:30:06 cg Exp $'
 ! !
 
 FileBrowserV2 initialize!