--- a/Class.st	Thu May 02 11:19:23 2002 +0200
+++ b/Class.st	Thu May 02 14:31:20 2002 +0200
@@ -1975,10 +1975,10 @@
 
 !
 
-basicFileOutDefinitionOn:aStream withNameSpace:forceNameSpace withPackage:showPackage
+basicFileOutDefinitionOn:aStream withNameSpace:forceNameSpace withPackage:showPackage 
     "append an expression on aStream, which defines myself."
 
-    |s owner ns nsName fullName superNameWithoutNameSpacePrefix cls topOwner
+    |s owner ns nsName fullName forceNoNameSpace superNameWithoutNameSpacePrefix cls topOwner
      syntaxHilighting superclass superclassNamespace|
 
     UserPreferences isNil ifTrue:[
@@ -2008,7 +2008,10 @@
     "/ and there is no need to complicate global lookup in stc...
 
     owner notNil ifTrue:[
-        fullName := true.    
+        forceNoNameSpace := ForceNoNameSpaceQuerySignal query == true.
+        forceNoNameSpace ifFalse:[
+            fullName := true.    
+        ]
     ].
 
     fullName ifFalse:[
@@ -2231,9 +2234,11 @@
     "/ to avoid confusing stc 
     "/ (which otherwise could not find the correct superclass)
     "/
-    FileOutNameSpaceQuerySignal answer:true do:[
-        self privateClassesSorted do:[:aClass |
-            aClass fileOutAllDefinitionsOn:aStream
+    FileOutNameSpaceQuerySignal answer:false do:[
+        ForceNoNameSpaceQuerySignal answer:true do:[
+            self privateClassesSorted do:[:aClass |
+                 aClass fileOutAllDefinitionsOn:aStream
+            ]
         ]
     ].
 
@@ -4700,5 +4705,5 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.410 2002-02-25 19:57:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.411 2002-05-02 12:31:20 cg Exp $'
 ! !