--- a/Tools_NamespaceList.st	Wed Sep 04 23:50:52 2013 +0200
+++ b/Tools_NamespaceList.st	Thu Sep 05 12:46:11 2013 +0200
@@ -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.
@@ -561,5 +561,5 @@
 !NamespaceList class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_NamespaceList.st,v 1.20 2012-10-20 19:36:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NamespaceList.st,v 1.21 2013-09-05 10:46:11 vrany Exp $'
 ! !