--- a/Class.st	Fri Jan 03 15:14:53 1997 +0100
+++ b/Class.st	Fri Jan 03 16:35:28 1997 +0100
@@ -168,12 +168,11 @@
         UsedNameSpaceQuerySignal := QuerySignal new.
         UsedNameSpaceQuerySignal nameClass:self message:#usedNameSpaceQuerySignal.
         UsedNameSpaceQuerySignal notifierString:'asking for used nameSpaced'.
-        UsedNameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:nil].
 
         CreateNameSpaceQuerySignal := QuerySignal new.
         CreateNameSpaceQuerySignal nameClass:self message:#createNameSpaceQuerySignal.
         CreateNameSpaceQuerySignal notifierString:'asking for nameSpace creation'.
-        CreateNameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:false].
+        CreateNameSpaceQuerySignal defaultAnswer:false.
 
         PackageQuerySignal := QuerySignal new.
         PackageQuerySignal nameClass:self message:#packageQuerySignal.
@@ -186,12 +185,12 @@
                                                                     ])].
 
         FileOutNameSpaceQuerySignal := QuerySignal new.
-        FileOutNameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:false].
+        FileOutNameSpaceQuerySignal defaultAnswer:false.
 
         ChangeFileAccessLock := Semaphore forMutualExclusion.
     ]
 
-    "Modified: 3.1.1997 / 13:21:20 / cg"
+    "Modified: 3.1.1997 / 15:16:05 / cg"
 ! !
 
 !Class class methodsFor:'Signal constants'!
@@ -2229,14 +2228,18 @@
 basicFileOutDefinitionOn:aStream
     "append an expression on aStream, which defines myself."
 
-    |s owner ns|
+    |s owner ns fullName|
 
     owner := self owningClass.
     ns := self nameSpace.
 
+    fullName := FileOutNameSpaceQuerySignal raise == true.
+
     owner isNil ifTrue:[
-        (ns notNil and:[ns ~~ Smalltalk]) ifTrue:[
-            aStream nextPutLine:'"{ Namespace: ''' , ns name , ''' }"'; cr.
+        fullName ifFalse:[
+            (ns notNil and:[ns ~~ Smalltalk]) ifTrue:[
+                aStream nextPutLine:'"{ Namespace: ''' , ns name , ''' }"'; cr.
+            ]
         ]
     ].
 
@@ -2244,19 +2247,23 @@
     superclass isNil ifTrue:[
         s := 'nil'
     ] ifFalse:[
-        (ns == superclass nameSpace 
-        and:[superclass owningClass isNil]) ifTrue:[
-            s := superclass nameWithoutPrefix
+        fullName ifTrue:[
+            s := superclass name
         ] ifFalse:[
-            s := superclass name
+            (ns == superclass nameSpace 
+            and:[superclass owningClass isNil]) ifTrue:[
+                s := superclass nameWithoutPrefix
+            ] ifFalse:[
+                s := superclass name
+            ]
         ]
     ].
 
     aStream nextPutAll:s.
     aStream space.
     self basicFileOutInstvarTypeKeywordOn:aStream.
-    owner isNil ifTrue:[
-        aStream nextPut:$#; nextPutAll:(self nameWithoutPrefix).
+    fullName ifTrue:[
+        aStream nextPutAll:'#'''; nextPutAll:(self name); nextPutAll:''''.
     ] ifFalse:[
         aStream nextPut:$#; nextPutAll:(self nameWithoutPrefix).
     ].
@@ -2291,7 +2298,7 @@
     ].
     aStream cr
 
-    "Modified: 21.12.1996 / 20:53:01 / cg"
+    "Modified: 3.1.1997 / 16:30:31 / cg"
 !
 
 basicFileOutInstvarTypeKeywordOn:aStream
@@ -4524,6 +4531,6 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.229 1997-01-03 12:31:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.230 1997-01-03 15:35:28 cg Exp $'
 ! !
 Class initialize!