--- a/FileBrowser.st	Tue Mar 18 12:17:53 2003 +0100
+++ b/FileBrowser.st	Tue Mar 18 12:22:02 2003 +0100
@@ -152,6 +152,10 @@
 
 !FileBrowser class methodsFor:'aspects'!
 
+directoryBookmarks
+    ^ AbstractFileBrowser directoryBookmarks.
+!
+
 directoryHistory
 
     ^ AbstractFileBrowser directoryHistory.
@@ -759,22 +763,25 @@
 
     <resource: #programMenu>
 
-    |m|
-
-    m := self baseBookmarksMenuSpec.
-    m := m decodeAsLiteralArray.
+    |menu bookmarks|
+
+    menu := self baseBookmarksMenuSpec decodeAsLiteralArray.
 
     "/ add the history items ...
 
-    DirectoryBookmarks size > 0 ifTrue:[
-        m addItem:(MenuItem labeled:'-').
-        DirectoryBookmarks do:[:dirName |
-            m addItem:((MenuItem label:dirName value:#changeDirectoryTo:)
+    bookmarks := self directoryBookmarks.
+    bookmarks size > 0 ifTrue:[
+        menu addItem:(MenuItem labeled:'-').
+        bookmarks do:[:dirName |
+            |pathName|
+
+            pathName := dirName asFilename pathName.
+            menu addItem:((MenuItem label:pathName value:#changeDirectoryTo:)
                             argument:dirName;
                             yourself).
         ].
     ].
-    ^ m
+    ^ menu
 
     "Modified: / 17.8.1998 / 10:13:05 / cg"
 !
@@ -1856,15 +1863,18 @@
 !
 
 hasBookmarks
-    ^ DirectoryBookmarks size > 0
+    ^ AbstractFileBrowser hasBookmarks
 
     "Created: / 14.8.1998 / 19:17:02 / cg"
     "Modified: / 14.8.1998 / 19:17:17 / cg"
 !
 
 hasBookmarksToRemove
-    ^ DirectoryBookmarks size > 0
-      and:[ DirectoryBookmarks includes:(currentDirectory pathName) ]
+    |bookmarks|
+
+    bookmarks := self class directoryBookmarks.
+    ^ bookmarks size > 0
+      and:[ bookmarks includes:(currentDirectory pathName) ]
 
     "Created: / 14.8.1998 / 19:17:02 / cg"
     "Modified: / 14.8.1998 / 19:17:17 / cg"
@@ -4459,15 +4469,7 @@
 !
 
 addBookmark:path
-    |idx|
-
-    DirectoryBookmarks isNil ifTrue:[
-        DirectoryBookmarks := OrderedCollection new
-    ].
-    idx := DirectoryBookmarks indexOf:path.
-    idx == 0 ifTrue:[
-        DirectoryBookmarks addLast:path.
-    ].
+    AbstractFileBrowser addBookmark:path
 !
 
 copyCommandHistory
@@ -4611,8 +4613,7 @@
 !
 
 removeBookmark
-    DirectoryBookmarks isNil ifTrue:[ ^ self].
-    DirectoryBookmarks remove:(currentDirectory asFilename pathName) ifAbsent:nil.
+    AbstractFileBrowser removeBookmark:(currentDirectory asFilename pathName)
 !
 
 showAboutSTX
@@ -7820,5 +7821,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.525 2003-03-02 20:42:15 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.526 2003-03-18 11:21:13 cg Exp $'
 ! !