conflict classVar vs. private class
authorClaus Gittinger <cg@exept.de>
Wed, 21 Nov 2012 08:48:33 +0100
changeset 12062 0056d17cf012
parent 12061 8250241997b8
child 12063 712accefee7a
conflict classVar vs. private class
AbstractFileBrowser.st
--- a/AbstractFileBrowser.st	Wed Nov 21 08:42:59 2012 +0100
+++ b/AbstractFileBrowser.st	Wed Nov 21 08:48:33 2012 +0100
@@ -13,7 +13,7 @@
 
 ApplicationModel subclass:#AbstractFileBrowser
 	instanceVariableNames:'aspects'
-	classVariableNames:'DirectoryHistory RuntimeAspects DirectoryBookmarks
+	classVariableNames:'VisitedDirectories RuntimeAspects DirectoryBookmarks
 		LastEnforcedNameSpace CommandHistory DefaultCommandPerSuffix
 		CommandHistorySize LastFileDiffFile DefaultFilters RootHolder
 		LastFileSelection LastMoveDestination LastScriptBlockString
@@ -116,20 +116,24 @@
 
 directoryHistory
 
-    DirectoryHistory isNil ifTrue:[
-        DirectoryHistory := self directoryHistoryClass new.
-"/        DirectoryHistory inspect.
-    ].
-    ^ DirectoryHistory
+    VisitedDirectories isNil ifTrue:[
+        VisitedDirectories := self directoryHistoryClass new.
+        "/ VisitedDirectories inspect.
+    ].
+    ^ VisitedDirectories
+
+    "Modified: / 21-11-2012 / 08:45:49 / cg"
 !
 
 resetClassVars
-    DirectoryHistory := nil.
+    VisitedDirectories := nil.
     LastFileSelection := nil.
 
     "
      AbstractFileBrowser resetClassVars
     "
+
+    "Modified: / 21-11-2012 / 08:45:53 / cg"
 !
 
 rootHolder
@@ -296,8 +300,9 @@
 !AbstractFileBrowser class methodsFor:'accessing-classes'!
 
 directoryHistoryClass
-
-    ^ AbstractFileBrowser::DirectoryHistory
+    ^ DirectoryHistory
+
+    "Modified: / 21-11-2012 / 08:46:34 / cg"
 ! !
 
 !AbstractFileBrowser class methodsFor:'defaults'!
@@ -9090,9 +9095,9 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.504 2012-11-02 10:27:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.505 2012-11-21 07:48:33 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.504 2012-11-02 10:27:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.505 2012-11-21 07:48:33 cg Exp $'
 ! !