--- a/Tools_ClassGeneratorList.st	Wed Sep 04 23:50:52 2013 +0200
+++ b/Tools_ClassGeneratorList.st	Thu Sep 05 12:46:11 2013 +0200
@@ -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.
@@ -357,7 +357,7 @@
     "/ really exist; however, during browsing, it makes sense.
     AdditionalEmptyCategories size > 0 ifTrue:[
         "/ remove those that are present ...
-        AdditionalEmptyCategories := AdditionalEmptyCategories select:[:cat | (categories includes:cat) not].
+        AdditionalEmptyCategories := AdditionalEmptyCategories reject:[:cat | (categories includes:cat)].
         categories addAll:AdditionalEmptyCategories.
     ].
     categories := categories asOrderedCollection.
@@ -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,16 +416,16 @@
     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
     "/ really exist; however, during browsing, it makes sense.
     AdditionalEmptyProjects size > 0 ifTrue:[
         "/ remove those that are present ...
-        AdditionalEmptyProjects := AdditionalEmptyProjects select:[:pkg | (allProjects includes:pkg) not].
+        AdditionalEmptyProjects := AdditionalEmptyProjects reject:[:pkg | (allProjects includes:pkg)].
         allProjects addAll:AdditionalEmptyProjects.
     ].
     allProjects sort.
@@ -437,12 +437,12 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self
+    environment addDependent:self
 
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
 
 !
 
@@ -515,9 +515,10 @@
 !ClassGeneratorList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassGeneratorList.st,v 1.12 2012-11-03 11:29:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassGeneratorList.st,v 1.14 2013-09-05 10:46:11 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassGeneratorList.st,v 1.12 2012-11-03 11:29:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassGeneratorList.st,v 1.14 2013-09-05 10:46:11 vrany Exp $'
 ! !
+