--- a/ClassDescription.st	Thu Aug 17 16:11:56 2006 +0200
+++ b/ClassDescription.st	Thu Aug 17 16:12:10 2006 +0200
@@ -203,15 +203,14 @@
         UpdateChangeListQuerySignal handlerBlock:[:ex | ex proceedWith:UpdatingChanges].
 
         NameSpaceQuerySignal isNil ifTrue:[
-            NameSpaceQuerySignal := QuerySignal new.
-            NameSpaceQuerySignal nameClass:self message:#nameSpaceQuerySignal.
-            NameSpaceQuerySignal notifierString:'asking for nameSpace'.
-            NameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:Smalltalk defaultNameSpace].
+            "This could be used BEFORE initialize has been invoked - thats why we initialize
+             the class var there."
+            NameSpaceQuerySignal := self nameSpaceQuerySignal
         ].
         UsedNameSpaceQuerySignal isNil ifTrue:[
-            UsedNameSpaceQuerySignal := QuerySignal new.
-            UsedNameSpaceQuerySignal nameClass:self message:#usedNameSpaceQuerySignal.
-            UsedNameSpaceQuerySignal notifierString:'asking for used nameSpaced'.
+            "This could be used BEFORE initialize has been invoked - thats why we initialize
+             the class var there."
+            UsedNameSpaceQuerySignal := self usedNameSpaceQuerySignal.
         ].
 
         CreateNameSpaceQuerySignal := QuerySignal new.
@@ -259,7 +258,7 @@
 
     "Created: / 02-04-1997 / 17:27:40 / stefan"
     "Modified: / 17-03-1999 / 16:52:41 / stefan"
-    "Modified: / 05-07-2006 / 17:36:43 / cg"
+    "Modified: / 17-08-2006 / 14:04:17 / cg"
 ! !
 
 !ClassDescription class methodsFor:'Signal constants'!
@@ -382,13 +381,15 @@
 
 nameSpaceQuerySignal
     "return the signal used as an upQuery for the current nameSpace.
-     Will be used when filing in code"
+     Will be used when filing in code.
+     This could be used BEFORE initialize has been invoked - thats why we do not
+     simply return the class var here."
 
     NameSpaceQuerySignal isNil ifTrue:[
-	NameSpaceQuerySignal := QuerySignal new.
-	NameSpaceQuerySignal nameClass:self message:#nameSpaceQuerySignal.
-	NameSpaceQuerySignal notifierString:'asking for nameSpace'.
-	NameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:Smalltalk defaultNameSpace].
+        NameSpaceQuerySignal := QuerySignal new.
+        NameSpaceQuerySignal nameClass:self message:#nameSpaceQuerySignal.
+        NameSpaceQuerySignal notifierString:'asking for nameSpace'.
+        NameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:Project defaultNameSpace].
     ].
     ^ NameSpaceQuerySignal
 
@@ -396,7 +397,7 @@
      Transcript showCR:Class nameSpaceQuerySignal raise
     "
 
-    "Modified: 5.11.1996 / 20:08:38 / cg"
+    "Modified: / 17-08-2006 / 14:03:39 / cg"
 !
 
 packageQuerySignal
@@ -464,16 +465,19 @@
 
 usedNameSpaceQuerySignal
     "return the signal used as an upQuery for the used nameSpace.
-     Will be used when filing in code"
+     Will be used when filing in code.
+     This could be used BEFORE initialize has been invoked - thats why we do not
+     simply return the class var here."
 
     UsedNameSpaceQuerySignal isNil ifTrue:[
-	UsedNameSpaceQuerySignal := QuerySignal new.
-	UsedNameSpaceQuerySignal nameClass:self message:#usedNameSpaceQuerySignal.
-	UsedNameSpaceQuerySignal notifierString:'asking for used nameSpaced'.
+        UsedNameSpaceQuerySignal := QuerySignal new.
+        UsedNameSpaceQuerySignal nameClass:self message:#usedNameSpaceQuerySignal.
+        UsedNameSpaceQuerySignal notifierString:'asking for used nameSpaced'.
     ].
     ^ UsedNameSpaceQuerySignal
 
-    "Created: 19.12.1996 / 23:57:27 / cg"
+    "Created: / 19-12-1996 / 23:57:27 / cg"
+    "Modified: / 17-08-2006 / 14:03:33 / cg"
 ! !
 
 !ClassDescription class methodsFor:'accessing-flags'!
@@ -1075,34 +1079,12 @@
         ]
     ].
 
-    "/ remember new->old association in the MethodHistory dictionary (if non-nil)
-
-    MethodHistory notNil ifTrue:[
-        oldMethod notNil ifTrue:[
-            MethodHistory add:(Array with:#methodChange with:oldMethod with:newMethod).
-            (MethodHistorySize notNil and:[MethodHistory size > MethodHistorySize]) ifTrue:[
-                MethodHistory removeFirst.
-            ]
-        ]
-    ].
-
-    "/ remember in the projects overwritten dictionary
-
-    oldMethod notNil ifTrue:[
-        oldMethod package ~= newMethod package ifTrue:[
-            Project notNil ifTrue:[
-                "/ allow configurations without Project
-                Project rememberOverwrittenMethod:newMethod from:oldMethod
-            ]
-        ]
-    ].
-
     super addSelector:newSelector withMethod:newMethod.
     self addChangeRecordForMethod:newMethod fromOld:oldMethod.
 
-    "Modified: / 9.9.1996 / 22:39:32 / stefan"
-    "Created: / 4.6.1997 / 14:47:10 / cg"
-    "Modified: / 17.6.1998 / 10:41:34 / cg"
+    "Modified: / 09-09-1996 / 22:39:32 / stefan"
+    "Created: / 04-06-1997 / 14:47:10 / cg"
+    "Modified: / 17-08-2006 / 13:54:00 / cg"
 !
 
 basicAddSelector:newSelector withMethod:newMethod
@@ -4014,7 +3996,7 @@
 !ClassDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.189 2006-08-11 12:11:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.190 2006-08-17 14:12:10 cg Exp $'
 ! !
 
 ClassDescription initialize!