--- a/DirectoryContentsBrowser.st	Tue Oct 08 21:29:16 2002 +0200
+++ b/DirectoryContentsBrowser.st	Wed Oct 09 14:20:58 2002 +0200
@@ -195,7 +195,7 @@
        )
       #(#DataSetColumnSpec
          #label: 'Date & Time'
-         #id: #timeAndDate
+         #id: #time
          #labelAlignment: #right
          #labelButtonType: #Button
          #labelActionSelector: #sortList:
@@ -237,7 +237,6 @@
          #showColSeparator: false
        )
       )
-    
 !
 
 windowSpec
@@ -1040,7 +1039,7 @@
                                             (id == #size and:[self viewSize value not]) ifTrue:[
                                                 columns remove:col.
                                             ] ifFalse:[
-                                                (id == #timeAndDate and:[self viewTime value not]) ifTrue:[
+                                                (id == #time and:[self viewTime value not]) ifTrue:[
                                                     columns remove:col.
                                                 ] ifFalse:[
                                                     (id == #fileInfo and:[self viewDescription value not]) ifTrue:[
@@ -1532,41 +1531,12 @@
 
 !DirectoryContentsBrowser methodsFor:'sorting'!
 
-sortList:instanceName 
-
-    self sortList:instanceName withReverse:true.
-!
-
-sortList:instanceName withReverse:aBoolean
+sortListChangedWith:currentSortOrder and:instanceName
 
     | aSymbol cmpOp sortCaselessLocal|
 
     aSymbol := instanceName asSymbol.
     sortCaselessLocal := self sortCaseless value.
-    currentSortOrder isNil ifTrue:[
-        currentSortOrder := aSymbol, sortCaselessLocal asString.
-        currentSortOrder := Dictionary new.
-        currentSortOrder at:#column put:aSymbol.
-        currentSortOrder at:#reverse put:false.
-        currentSortOrder at:#sortCaseless put:sortCaselessLocal.
-    ] ifFalse:[
-        (currentSortOrder at:#sortCaseless) ~= sortCaselessLocal ifTrue:[
-            "/ sort caseless changed
-            currentSortOrder at:#sortCaseless put:sortCaselessLocal.
-        ] ifFalse:[
-            (currentSortOrder at:#column) = aSymbol ifTrue:[
-                "/ same column like before - change sort order ifReverse is true
-                aBoolean ifTrue:[
-                    | isReverse |
-                    isReverse := currentSortOrder at:#reverse.
-                    currentSortOrder at:#reverse put:(isReverse not).
-                ].
-            ] ifFalse:[
-                "/ another column - remark column
-                currentSortOrder at:#column put:aSymbol.
-            ]
-        ]
-    ].
     (currentSortOrder at:#reverse) ifTrue:[
         cmpOp := #'>'
     ] ifFalse:[
@@ -2582,5 +2552,5 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.11 2002-10-08 19:27:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.12 2002-10-09 12:20:55 penk Exp $'
 ! !