Introduced environment instvar in Tools::NavigatorModel. default-browser-environment
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 03 Sep 2013 16:14:28 +0100
branchdefault-browser-environment
changeset 13473 d8e9ed472e9f
parent 13464 931d28c589b7
child 13474 6a737cc259fc
Introduced environment instvar in Tools::NavigatorModel. All references to Smalltalk were rewritten to access `environment` instvar instead. The `environment` defaults to Smalltalk (set in #initialize).
Tools_BrowserList.st
Tools_ClassCategoryList.st
Tools_ClassGeneratorList.st
Tools_ClassList.st
Tools_FullMethodCategoryList.st
Tools_HierarchicalClassList.st
Tools_HierarchicalProjectList.st
Tools_MethodCategoryList.st
Tools_MethodList.st
Tools_NamespaceList.st
Tools_NavigatorModel.st
Tools_OrganizerCanvas.st
Tools_ProjectList.st
Tools__ChangeList.st
Tools__HierarchicalPackageFilterList.st
Tools__VariableList.st
--- a/Tools_BrowserList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_BrowserList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -607,7 +607,7 @@
 delayedUpdate:something with:aParameter from:changedObject
 
     "/ if any of my subclasses want those, they should look for them.
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
 	(something == #Language or:[something == #LanguageTerritory]) ifTrue:[
 	    ^ self
 	].
@@ -868,7 +868,7 @@
 dropClassFiles:files
     files do:[:fn |
         (Dialog confirm:(resources string:'FileIn %1 ?' with:fn baseName allBold)) ifTrue:[
-            Smalltalk fileIn:fn logged:true.
+            environment fileIn:fn logged:true.
         ]
     ].
 
--- a/Tools_ClassCategoryList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_ClassCategoryList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -275,7 +275,7 @@
 
     selectedCategories := self selectedCategoriesStrings.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         ((something == #classVariables) 
         or:[something == #classDefinition]) ifTrue:[
             listValid == true ifTrue:[
@@ -452,7 +452,7 @@
 update:something with:aParameter from:changedObject
     |categoryOfClass|
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         (something == #methodInClass 
         or:[ something == #classComment
         or:[ something == #methodDictionary
@@ -627,7 +627,7 @@
     ^ Iterator on:[:whatToDo |
             showChangedClasses ifTrue:[ changedClasses := ChangeSet current changedClasses ].
 
-            Smalltalk allClassesDo:[:cls |
+            environment allClassesDo:[:cls |
                 (cls isRealNameSpace) ifFalse:[
                     (inclusionTest value:cls) ifTrue:[
                         (nameSpaceFilter isNil
@@ -702,7 +702,7 @@
 
     classes := IdentitySet new.
     inGeneratorHolder isNil ifTrue:[
-        Smalltalk allClassesDo:[:cls | 
+        environment allClassesDo:[:cls | 
             |cat isLoaded|
 
             (cls isRealNameSpace) ifFalse:[
@@ -764,7 +764,7 @@
         setOfCategories := Set withAll:generator.
         generator do:[:cat | categories add:cat string].
         
-        Smalltalk allClassesDo:[:each |
+        environment allClassesDo:[:each |
             |cat|
 
             each isNameSpace ifFalse:[
@@ -852,14 +852,14 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
     ChangeSet addDependent:self.
 
     "Created: / 5.2.2000 / 13:42:13 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
     ChangeSet removeDependent:self.
 
     "Created: / 5.2.2000 / 13:42:13 / cg"
--- a/Tools_ClassGeneratorList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_ClassGeneratorList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -257,7 +257,7 @@
 delayedUpdate:something with:aParameter from:changedObject
     |cls sel pkg mthd orgMode|
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         orgMode := organizerMode value.
 
         orgMode == OrganizerCanvas organizerModeCategory ifTrue:[
@@ -346,7 +346,7 @@
     hideUnloadedClasses := self hideUnloadedClasses value.
 
     categories := Set new.
-    Smalltalk allClassesDo:[:cls |
+    environment allClassesDo:[:cls |
         (hideUnloadedClasses not or:[cls isLoaded])
         ifTrue:[
             categories add:cls category.
@@ -381,7 +381,7 @@
     allNamespaces := IdentitySet new.
 
     (self hideUnloadedClasses value) ifTrue:[
-        Smalltalk allClassesDo:[:eachClass |
+        environment allClassesDo:[:eachClass |
             eachClass isLoaded ifTrue:[
                 allNamespaces add:(eachClass theNonMetaclass topNameSpace)
             ].
@@ -416,9 +416,9 @@
     allProjects := IdentitySet new.
 
     (self hideUnloadedClasses value) ifTrue:[
-        allProjects := Smalltalk allLoadedProjectIDs.
+        allProjects := environment allLoadedProjectIDs.
     ] ifFalse:[
-        allProjects := Smalltalk allProjectIDs.
+        allProjects := environment allProjectIDs.
     ].
 
     "/ those are simulated - in ST/X, empty projects do not
@@ -437,12 +437,12 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self
+    environment addDependent:self
 
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
 
 !
 
--- a/Tools_ClassList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_ClassList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -513,7 +513,7 @@
         ^ self.
     ].
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #methodInClass ifTrue:[
             ^ self "no interest" 
         ].    
@@ -822,7 +822,7 @@
 
     classListValue := classList value.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #classComment ifTrue:[
             ^ self.
         ].
@@ -1186,7 +1186,7 @@
 
     inGeneratorHolder isNil ifTrue:[
         "/ for standAlone testing
-        generator := Smalltalk allClasses.
+        generator := environment allClasses.
         (self hideUnloadedClasses value) ifTrue:[
             generator := generator select:[:cls | cls isLoaded]
         ].
@@ -1315,7 +1315,7 @@
 
     inGeneratorHolder isNil ifTrue:[
         "/ for standAlone testing
-        generator := Smalltalk allClasses.
+        generator := environment allClasses.
         (self hideUnloadedClasses value) ifTrue:[
             generator := generator select:[:cls | cls isLoaded]
         ].
@@ -1412,14 +1412,14 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
     ChangeSet addDependent:self.
 
     "Created: / 5.2.2000 / 13:42:17 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
     ChangeSet removeDependent:self.
 !
 
@@ -1628,7 +1628,7 @@
 	    |newClass|
 
 	    meta := cls isMeta.
-	    newClass := Smalltalk at:(cls theNonMetaclass name).
+	    newClass := environment at:(cls theNonMetaclass name).
 	    newClass isNil ifTrue:[
 		newClass := cls
 	    ] ifFalse:[
@@ -1645,7 +1645,7 @@
 
 	    cls notNil ifTrue:[
 		meta := cls isMeta.
-		newClass := Smalltalk at:(cls theNonMetaclass name).
+		newClass := environment at:(cls theNonMetaclass name).
 		newClass isNil ifTrue:[
 		    newClass := cls
 		] ifFalse:[
@@ -1723,7 +1723,7 @@
 
         newSelectionIndices := prevSelection 
                             collect:[:item | |cls|
-                                             cls := Smalltalk at:item theNonMetaclass name.   
+                                             cls := environment at:item theNonMetaclass name.   
                                              newList identityIndexOf:cls]
                             thenSelect:[:index | index ~~ 0].
 
--- a/Tools_FullMethodCategoryList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_FullMethodCategoryList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -70,7 +70,7 @@
                         protocols size > 0 ifTrue:[
                             protocols size == 1 ifTrue:[
                                 theProtocol := protocols first.
-                                Smalltalk allClassesDo:[:eachClass |
+                                environment allClassesDo:[:eachClass |
                                     eachClass instAndClassSelectorsAndMethodsDo:[:sel :eachMethod |
                                         |cat|
 
@@ -86,7 +86,7 @@
                                     ].
                                 ]
                             ] ifFalse:[
-                                Smalltalk allClassesDo:[:eachClass |
+                                environment allClassesDo:[:eachClass |
                                     eachClass instAndClassSelectorsAndMethodsDo:[:sel :eachMethod |
                                         |cat|
 
--- a/Tools_HierarchicalClassList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_HierarchicalClassList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -160,7 +160,7 @@
     self updateList.
 
     selectedClassesHolder value ~= prevSelection ifTrue:[
-	newSelection := prevSelection collect:[:eachOldClass | Smalltalk classNamed:(eachOldClass name)].
+	newSelection := prevSelection collect:[:eachOldClass | environment classNamed:(eachOldClass name)].
 	selectedClassesHolder value:newSelection.
     ]
 
@@ -175,7 +175,7 @@
     prevTop notNil ifTrue:[
 	wasMeta := prevTop isMeta.
 	newTop := prevTop theNonMetaclass.
-	[newTop notNil and:[(Smalltalk at:newTop name) ~= newTop]] whileTrue:[
+	[newTop notNil and:[(environment at:newTop name) ~= newTop]] whileTrue:[
 	    newTop := newTop superclass.
 	].
 	wasMeta ifTrue:[
@@ -221,7 +221,7 @@
     |theClasses|
 
     aSuperclass isNil ifTrue:[
-	theClasses := Smalltalk allClasses select:[:cls | cls superclass isNil]
+	theClasses := environment allClasses select:[:cls | cls superclass isNil]
     ] ifFalse:[
 	theClasses := aSuperclass subclasses.
     ].
--- a/Tools_HierarchicalProjectList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_HierarchicalProjectList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -248,7 +248,7 @@
 	].
     ].
 
-"/    Smalltalk allClassesDo:[:eachClass |
+"/    environment allClassesDo:[:eachClass |
 "/        |package|
 "/
 "/        package := eachClass package asSymbol.
--- a/Tools_MethodCategoryList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_MethodCategoryList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -419,7 +419,7 @@
 
                     nm := oldClass theNonMetaclass name.
                     oldClass isMeta ifTrue:[
-                        newClass := Smalltalk at:nm.
+                        newClass := environment at:nm.
                         newClass isNil ifTrue:[
                             "/ Transcript showCR:'oops - browser lost class ' , nm.
                             newClass := oldClass
@@ -427,7 +427,7 @@
                             newClass := newClass theMetaclass
                         ]
                     ] ifFalse:[
-                        newClass := Smalltalk at:nm
+                        newClass := environment at:nm
                     ].
                     newClass ~~ oldClass ifTrue:[
                         anyChange := true.
@@ -451,7 +451,7 @@
     selectedProtocolsHolder := self selectedProtocols.
     rawProtocolListHolder := self rawProtocolList.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         classes notNil ifTrue:[
             something == #methodCategory ifTrue:[
                 cls := aParameter at:1.
@@ -715,9 +715,9 @@
     |cls sel mthd oldMethod newMethod|
 
     "/ some can be ignored immediately
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something isNil ifTrue:[
-            "/ self halt "/ huh - Smalltalk changed - so what ?
+            "/ self halt "/ huh - environment changed - so what ?
             ^ self.
         ].
 
@@ -1586,14 +1586,14 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
 "/    ChangeSet addDependent:self.
 
     "Modified: / 10-11-2006 / 17:57:13 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
 "/    ChangeSet removeDependent:self.
 !
 
@@ -1690,7 +1690,7 @@
             "/ TODO: start a background thread to compute the stuff below,
             "/ notify me to update the list, when all the lazy info is avail...
         ] ifFalse:[
-            true "aMethod mclass language isSmalltalk" ifTrue:[
+            true "aMethod mclass language isenvironment" ifTrue:[
                 methodsPackage := aMethod package.
 
                 isVersionMethod := aMethod isVersionMethod.
@@ -1799,7 +1799,7 @@
     ].
     categories add:aProtocol.
     aClass changed:#organization.                                                       "/ not really ... to force update
-    Smalltalk changed:#methodCategoryAdded with:(Array with:aClass with:aProtocol).     "/ not really ... to force update
+    environment changed:#methodCategoryAdded with:(Array with:aClass with:aProtocol).     "/ not really ... to force update
 
     "Modified (comment): / 01-08-2012 / 17:30:36 / cg"
 !
@@ -1842,7 +1842,7 @@
     ].
 
     aClass changed:#organization.                      "/ not really ... to force update
-    Smalltalk changed:#methodCategoriesRemoved with:(Array with:aClass with:aListOfProtocols).     "/ not really ... to force update
+    environment changed:#methodCategoriesRemoved with:(Array with:aClass with:aListOfProtocols).     "/ not really ... to force update
 
     "Modified (comment): / 01-08-2012 / 17:29:59 / cg"
 !
@@ -1886,7 +1886,7 @@
     categories add:newName.
 
     aClass changed:#organization.                      "/ not really ... to force update
-    Smalltalk changed:#methodCategoryRenamed with:(Array with:aClass with:oldName with:newName).     "/ not really ... to force update
+    environment changed:#methodCategoryRenamed with:(Array with:aClass with:oldName with:newName).     "/ not really ... to force update
 
     "Modified (comment): / 01-08-2012 / 17:30:16 / cg"
 ! !
--- a/Tools_MethodList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_MethodList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -348,7 +348,7 @@
     selectionHolder := self selectedMethods.
     selection := selectionHolder value.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         classes notNil ifTrue:[
             something == #classDefinition ifTrue:[
                 cls := aParameter.
@@ -356,7 +356,7 @@
                 (classes contains:[:aClass | aClass name = clsName]) ifFalse:[
                     ^ self   "/ I don't care for that class
                 ].
-                classes := classes collect:[:eachClass | (Smalltalk classNamed:eachClass name) ].
+                classes := classes collect:[:eachClass | (environment classNamed:eachClass name) ].
                 self invalidateList.
 "/                self updateList.
                 ^ self.
@@ -763,12 +763,12 @@
     mustFlushInheritanceInfo := true.
 
     "/ some can be ignored immediately
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         classes isNil ifTrue:[
             ^ self.
         ].
         something isNil ifTrue:[
-            "/ self halt "/ huh - Smalltalk changed - so what ?
+            "/ self halt "/ huh - environment changed - so what ?
             ^ self.
         ].
         something == #classComment ifTrue:[
@@ -1246,14 +1246,14 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
 "/    ChangeSet addDependent:self.
 
     "Modified: / 10-11-2006 / 17:57:01 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
 "/    ChangeSet removeDependent:self.
 !
 
--- a/Tools_NamespaceList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_NamespaceList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -203,7 +203,7 @@
 
     self inSlaveModeOrInvisible 
     ifTrue:[
-	changedObject == Smalltalk ifTrue:[
+	changedObject == environment ifTrue:[
 	    something == #classComment ifTrue:[^ self].
 	].
 	self invalidateList.
@@ -218,7 +218,7 @@
 	^  self
     ].
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
 	something == #newClass ifTrue:[
 	    listValid == true ifTrue:[
 		aParameter isNameSpace ifTrue:[
@@ -254,7 +254,7 @@
 !
 
 update:something with:aParameter from:changedObject
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #methodDictionary ifTrue:[
             ^ self 
         ].
@@ -310,14 +310,14 @@
                 |className|
 
                 className := eachClassToMove nameWithoutPrefix.
-                nameSpace == Smalltalk ifTrue:[
-                    Smalltalk renameClass:eachClassToMove to:className asSymbol.
+                nameSpace == environment ifTrue:[
+                    environment renameClass:eachClassToMove to:className asSymbol.
                 ] ifFalse:[
-                    Smalltalk renameClass:eachClassToMove to:(nameSpace name , '::' , className) asSymbol.
+                    environment renameClass:eachClassToMove to:(nameSpace name , '::' , className) asSymbol.
                     nameSpace changed.
                 ].
             ].
-            Smalltalk changed.
+            environment changed.
         ].
         ^ self
     ].
@@ -358,7 +358,7 @@
     (showAllClasses or:[spaceNames includes:(self class nameListEntryForALL)]) ifTrue:[
         hideUnloadedClasses ifTrue:[
             ^ Iterator on:[:whatToDo |
-                               Smalltalk allClassesDo:[:cls |
+                               environment allClassesDo:[:cls |
                                    cls isLoaded ifTrue:[
                                        cls isRealNameSpace ifFalse:[
                                            whatToDo value:cls
@@ -368,24 +368,24 @@
                           ]
         ].
         ^ Iterator on:[:whatToDo |
-                           Smalltalk allClassesDo:whatToDo
+                           environment allClassesDo:whatToDo
                       ]
     ].
 
     (spaceNames size == 1 
-     and:[spaceNames first = 'Smalltalk']) ifTrue:[
+     and:[spaceNames first = 'environment']) ifTrue:[
         "/ somewhat tuned - quick look if classes name includes colons ...
         ^ Iterator on:[:whatToDo |
-                       Smalltalk allClassesDo:[:cls |
+                       environment allClassesDo:[:cls |
                            |includeIt|
 
                            includeIt := (cls name includes:$:) not.
                            includeIt := includeIt
                                         or:[(cls isPrivate not 
-                                            and:[(cls nameSpace == Smalltalk)])].
+                                            and:[(cls nameSpace == environment)])].
                            includeIt := includeIt
                                         or:[(cls isPrivate  
-                                            and:[(cls topOwningClass nameSpace == Smalltalk)])].
+                                            and:[(cls topOwningClass nameSpace == environment)])].
 
                            includeIt := includeIt
                                         and:[hideUnloadedClasses not or:[cls isLoaded]].
@@ -415,7 +415,7 @@
 
                         showChangedClasses ifTrue:[ changedClasses := ChangeSet current changedClasses collect:[:cls | cls theNonMetaclass]].
 
-                        Smalltalk allClassesDo:[:cls |
+                        environment allClassesDo:[:cls |
                             |spaceOfClass spaceNameOfClass includeIt|
 
                             spaceOfClass := cls isPrivate ifTrue:[cls topOwningClass nameSpace] ifFalse:[cls nameSpace].
@@ -470,7 +470,7 @@
 
     inGeneratorHolder isNil ifTrue:[
         (self hideUnloadedClasses value) ifTrue:[
-            Smalltalk allClassesDo:[:eachClass |
+            environment allClassesDo:[:eachClass |
                 eachClass isLoaded ifTrue:[
                     allNamespaces add:(eachClass theNonMetaclass topNameSpace)
                 ].
@@ -520,13 +520,13 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self
+    environment addDependent:self
 
     "Created: / 18.2.2000 / 01:04:36 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
 
     "Created: / 18.2.2000 / 01:04:42 / cg"
 !
@@ -548,7 +548,7 @@
 	oldSelection size > 0 ifTrue:[
 	    newSelection := oldSelection select:[:nm | 
 				(nm = self class nameListEntryForALL) 
-				or:[ (Smalltalk at:nm asSymbol) isNameSpace]
+				or:[ (environment at:nm asSymbol) isNameSpace]
 			    ].
 	    newSelection ~= oldSelection ifTrue:[
 		selectedNamespacesHolder value:newSelection.
--- a/Tools_NavigatorModel.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_NavigatorModel.st	Tue Sep 03 16:14:28 2013 +0100
@@ -14,7 +14,7 @@
 "{ NameSpace: Tools }"
 
 ApplicationModel subclass:#NavigatorModel
-	instanceVariableNames:''
+	instanceVariableNames:'environment'
 	classVariableNames:'AllEntry SuperSendEntry UncommentedEntry'
 	poolDictionaries:''
 	category:'Interface-Browsers-New'
@@ -34,6 +34,31 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+!
+
+documentation
+"
+    A base abstract superclass for all tools browsing the code.
+
+    The `environment` instvar should be used to access the code elements
+    (classes, packages, namespace). The tool should never access Smalltalk
+    directly, but the `environment`. By default, the `environment` is 
+    initialized to Smalltalk. The `environment` could be whatever object
+    you like, but it MUST be polymorph with Smalltalk. Also, all classes-like
+    objects it returns MUST be polymorph with Class. Otherwise, expect
+    a lot of DNUs.
+
+    [author:]
+        Jan Vrany <jan.vrany@fit.cvut.cz>
+
+    [instance variables:]
+        environment         
+
+    [class variables:]
+
+    [see also:]
+
+"
 ! !
 
 !NavigatorModel class methodsFor:'initialization'!
@@ -329,6 +354,22 @@
     "Created: / 06-04-2010 / 11:09:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 07-09-2011 / 10:45:45 / cg"
     "Modified: / 19-01-2012 / 10:43:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isAbstract
+    ^ self == Tools::NavigatorModel
+
+    "Created: / 03-09-2013 / 15:36:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!NavigatorModel methodsFor:'initialization'!
+
+initialize
+
+    super initialize.
+    environment := Smalltalk.
+
+    "Created: / 03-09-2013 / 15:35:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !NavigatorModel methodsFor:'misc'!
@@ -363,8 +404,14 @@
     ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigatorModel.st,v 1.23 2012-11-07 13:57:05 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '§Id: Tools__NavigatorModel.st 7802 2011-07-05 18:33:36Z vranyj1 §'
 ! !
 
+
 NavigatorModel initialize!
--- a/Tools_OrganizerCanvas.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_OrganizerCanvas.st	Tue Sep 03 16:14:28 2013 +0100
@@ -4806,7 +4806,7 @@
         categories := self selectedCategories value.
         categories notEmptyOrNil ifTrue:[
             includesAll := categories includes:BrowserList nameListEntryForALL.
-            classes :=  Smalltalk allClassesForWhich:[:aClass |
+            classes :=  environment allClassesForWhich:[:aClass |
                 (includesAll or:[categories includes:aClass category]).
             ].
         ].
@@ -4943,7 +4943,7 @@
         categories := self selectedCategories value.
         categories notEmptyOrNil ifTrue:[
             categories do:[:eachCategory |
-                classes addAll:(Smalltalk allClassesInCategory:eachCategory)
+                classes addAll:(environment allClassesInCategory:eachCategory)
             ].
         ].
     ].
--- a/Tools_ProjectList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_ProjectList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -232,7 +232,7 @@
     self inSlaveModeOrInvisible 
     "/ (self slaveMode value == true) 
     ifTrue:[
-        (changedObject == Smalltalk
+        (changedObject == environment
         or:[ something == #projectOrganization ]) ifTrue:[
             listValid ifFalse:[ ^ self].
             listValid := false
@@ -284,7 +284,7 @@
         ^  self
     ].
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #projectOrganization ifTrue:[
             self invalidateList.
             slaveMode value == true ifFalse:[
@@ -375,7 +375,7 @@
         ^ self
     ].
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #methodDictionary ifTrue:[
             ^ self 
         ].
@@ -547,7 +547,7 @@
     (selectedPackages includes:(self class nameListEntryForALL)) ifTrue:[
         hideUnloadedClasses ifTrue:[
             ^ Iterator on:[:whatToDo |
-                               Smalltalk allClassesDo:[:cls |
+                               environment allClassesDo:[:cls |
                                    cls isLoaded ifTrue:[
                                        cls isRealNameSpace ifFalse:[
                                            whatToDo value:cls
@@ -557,7 +557,7 @@
                           ]
         ].
         ^ Iterator on:[:whatToDo |
-                           Smalltalk allClassesDo:[:cls |
+                           environment allClassesDo:[:cls |
                                cls isRealNameSpace ifFalse:[
                                    whatToDo value:cls
                                ]
@@ -574,7 +574,7 @@
 
                            showChangedClasses ifTrue:[ changedClasses := ChangeSet current changedClasses ].
 
-                           Smalltalk allClassesDo:[:cls |
+                           environment allClassesDo:[:cls |
                                |doInclude|
 
                                (hideUnloadedClasses not or:[cls isLoaded])
@@ -607,7 +607,7 @@
 
                        showChangedClasses ifTrue:[ changedClasses := ChangeSet current changedClasses ].
 
-                       Smalltalk allClassesDo:[:cls |
+                       environment allClassesDo:[:cls |
                            |doInclude|
 
                            (hideUnloadedClasses not or:[cls isLoaded])
@@ -707,7 +707,7 @@
                 ].
             ].
 
-        Smalltalk allClassesDo:[:eachClass |
+        environment allClassesDo:[:eachClass |
             |cls pkg p classPackage|
 
             eachClass isRealNameSpace ifFalse:[
@@ -807,12 +807,12 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
     ChangeSet addDependent:self.
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
     ChangeSet removeDependent:self.
 !
 
@@ -823,8 +823,8 @@
 "/    workerQueue 
 "/        nextPut:[
 "/            | repo newEntry branch mark|
-"/            "/ use Smalltalk-at to trick the dependency/prerequisite generator
-"/            repo := (Smalltalk at:#SVN::RepositoryManager) current 
+"/            "/ use environment-at to trick the dependency/prerequisite generator
+"/            repo := (environment at:#SVN::RepositoryManager) current 
 "/                        repositoryForPackage: package onlyFromCache: false.
 "/            repo ifNotNil:[
 "/                mark := ' [SVN]'.
@@ -990,7 +990,7 @@
     ].
     AdditionalEmptyProjects add:aProject.
 
-    Smalltalk changed:#projectOrganization   "/ not really ... to force update
+    environment changed:#projectOrganization   "/ not really ... to force update
 
     "Created: / 17.2.2000 / 23:44:27 / cg"
 !
@@ -1003,7 +1003,7 @@
 	    AdditionalEmptyProjects remove:eachProject ifAbsent:nil.
 	].
     ].
-    Smalltalk changed:#projectOrganization   "/ not really ... to force update
+    environment changed:#projectOrganization   "/ not really ... to force update
 
     "Created: / 17.2.2000 / 23:45:24 / cg"
 ! !
--- a/Tools__ChangeList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools__ChangeList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -748,7 +748,7 @@
         ]
     ].
 
-    browserClass := Smalltalk browserClass.
+    browserClass := environment browserClass.
     methodsOnly 
         ifTrue:
             [methods size = 1 
--- a/Tools__HierarchicalPackageFilterList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools__HierarchicalPackageFilterList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -188,7 +188,7 @@
         ].
     ].
 
-"/    Smalltalk allClassesDo:[:eachClass |
+"/    environment allClassesDo:[:eachClass |
 "/        |package|
 "/
 "/        package := eachClass package asSymbol.
--- a/Tools__VariableList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools__VariableList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -269,7 +269,7 @@
         self invalidateList.
         ^ self.
     ].
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         (something == #projectOrganization) ifTrue:[^ self].
         (something == #currentChangeSet) ifTrue:[^ self].
         (something == #aboutToAutoloadClass) ifTrue:[^ self].
@@ -289,10 +289,10 @@
                         cls isObsolete ifTrue:[
                             cls isMeta ifTrue:[
                                 nm := cls theNonMetaclass name.
-                                selectedClasses at:idx put:(Smalltalk at:nm) class.
+                                selectedClasses at:idx put:(environment at:nm) class.
                             ] ifFalse:[
                                 nm := cls name.
-                                selectedClasses at:idx put:(Smalltalk at:nm).
+                                selectedClasses at:idx put:(environment at:nm).
                             ].
                             anyChange := true.
                         ] ifFalse:[
@@ -328,7 +328,7 @@
                 selectedClasses keysAndValuesDo:[:idx :cls | |nm|
                     cls isObsolete ifTrue:[
                         nm := cls name.
-                        selectedClasses at:idx put:(Smalltalk at:nm).
+                        selectedClasses at:idx put:(environment at:nm).
                         anyChange := true.
                     ]
                 ].
@@ -357,12 +357,12 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self
+    environment addDependent:self
 
 !
 
 makeIndependent
-    Smalltalk removeDependent:self
+    environment removeDependent:self
 
 !
 
@@ -376,7 +376,7 @@
 update:something with:aParameter from:changedObject
     "/ ^ self delayedUpdate:something with:aParameter from:changedObject.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #methodDictionary ifTrue:[
             ^ self 
         ].