--- a/ClassBuilder.st	Thu Sep 21 18:21:27 2006 +0200
+++ b/ClassBuilder.st	Thu Sep 21 18:21:30 2006 +0200
@@ -326,7 +326,7 @@
      This might change in the future.
     "
 
-    |newClass newMetaclass newComment|
+    |newClass newMetaclass newComment sourceContainer|
 
     "NOTICE:
      this method is too complex and should be splitted into managable pieces ...
@@ -518,6 +518,11 @@
     "/ for new classes, we are almost done here
     "/ (also for autoloaded classes)
 
+    sourceContainer := PeekableStream currentSourceContainer.
+    sourceContainer isFileStream ifTrue:[
+        newClass setClassFilename:sourceContainer pathName asFilename baseName.
+    ].
+
     (oldClass isNil or:[oldClass isLoaded not]) ifTrue:[
         self handleNewlyCreatedClass:newClass.
         ^ newClass
@@ -2081,5 +2086,5 @@
 !ClassBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.57 2006-08-28 18:14:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.58 2006-09-21 16:21:30 stefan Exp $'
 ! !