--- a/DirectoryContentsBrowser.st	Thu Jun 12 17:31:39 2003 +0200
+++ b/DirectoryContentsBrowser.st	Thu Jun 12 17:32:50 2003 +0200
@@ -1,25 +1,25 @@
 "{ Package: 'stx:libtool' }"
 
 AbstractDirectoryBrowser subclass:#DirectoryContentsBrowser
-	instanceVariableNames:'modificationTime directory columnDescriptors iconIndex
-		fileDescriptionIndex iconExtent tableColumns previewIndex
-		draggedItem viewBrowserMenu updateContentsSelection
-		selectionInFileList browserItemList matchBlock updateTask
-		directoryChangeFlag directoryContentsChangeFlag filterChangeFlag
-		sortBlockChangeFlag isBusy changeSema filteredItems allItems
-		diskUsageInfo diskUsageUpdateProcess'
-	classVariableNames:''
-	poolDictionaries:''
-	category:'Interface-Tools-File'
+        instanceVariableNames:'modificationTime directory columnDescriptors iconIndex
+                fileDescriptionIndex iconExtent tableColumns previewIndex
+                draggedItem viewBrowserMenu updateContentsSelection
+                selectionInFileList browserItemList matchBlock updateTask
+                directoryChangeFlag directoryContentsChangeFlag filterChangeFlag
+                sortBlockChangeFlag isBusy changeSema filteredItems allItems
+                diskUsageInfo diskUsageUpdateProcess'
+        classVariableNames:''
+        poolDictionaries:''
+        category:'Interface-Tools-File'
 !
 
 Object subclass:#DirectoryContentsItem
-	instanceVariableNames:'fileName fileInfo icon fileType
-		contentsBrowserChangeModificationTime suffix preview group owner
-		timeAndDate mimeType iconKey mimeTypeForContents'
-	classVariableNames:'LastUIDToUserNameMapping LastGIDToGroupNameMapping'
-	poolDictionaries:''
-	privateIn:DirectoryContentsBrowser
+        instanceVariableNames:'fileName fileInfo icon fileType
+                contentsBrowserChangeModificationTime suffix preview group owner
+                timeAndDate mimeType iconKey mimeTypeForContents'
+        classVariableNames:'LastUIDToUserNameMapping LastGIDToGroupNameMapping'
+        poolDictionaries:''
+        privateIn:DirectoryContentsBrowser
 !
 
 !DirectoryContentsBrowser class methodsFor:'documentation'!
@@ -953,7 +953,7 @@
     | browserList selection|
 
     (addItemCol isEmpty and:[remItemCol isEmpty]) ifTrue:[ ^ self].
-    selection := self selectedItems.
+    selection := self selectedItemsWithoutDotDotDirectory.
     remItemCol notEmpty ifTrue:[
         self browserItemList removeAllFoundIn:remItemCol        
     ].
@@ -1478,7 +1478,7 @@
         ^ true.
     ].
     (key == #Return) ifTrue:[
-        self doOpenSelectedFile.
+        self enterAction.
         ^ true.
     ].
     key == #Replace ifTrue:[
@@ -1510,16 +1510,6 @@
 
 !DirectoryContentsBrowser methodsFor:'menu actions'!
 
-doOpenSelectedFile
-
-    | selectedItems|
-
-    selectedItems := self selectedItems.
-    (selectedItems size == 1) ifTrue:[ 
-        self enterActionFor:(selectedItems first).
-    ].
-!
-
 doShowFileContents
 
     | selectedFileItems|
@@ -1528,6 +1518,16 @@
     (selectedFileItems size == 1) ifTrue:[ 
         self openNewTextEditorOn:(selectedFileItems first).
     ].
+!
+
+enterAction
+
+    | selectedItems|
+
+    selectedItems := self selectedItems.
+    (selectedItems size == 1) ifTrue:[ 
+        self enterActionFor:(selectedItems first).
+    ].
 ! !
 
 !DirectoryContentsBrowser methodsFor:'queries'!
@@ -1626,7 +1626,7 @@
 
     | sel |
 
-    sel := self selectedItems select:[:item | item isDirectory not].
+    sel := self selectedItemsWithoutDotDotDirectory select:[:item | item isDirectory not].
     ^ sel
 !
 
@@ -1639,6 +1639,14 @@
 
     selection := self selectionInFileList value copy.
     selection isNil ifTrue:[ ^ #()].
+    ^ selection.
+!
+
+selectedItemsWithoutDotDotDirectory
+    | selection |
+
+    selection := self selectionInFileList value copy.
+    selection isNil ifTrue:[ ^ #()].
     (self viewDirsInContentsBrowser value and:[browserItemList notEmpty]) ifTrue:[
         selection removeIdentical:(browserItemList first) ifAbsent:[nil]
     ].
@@ -2878,5 +2886,5 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.118 2003-06-12 15:12:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.119 2003-06-12 15:32:50 penk Exp $'
 ! !