--- a/Class.st	Sun Oct 26 16:26:37 2003 +0100
+++ b/Class.st	Sun Oct 26 16:26:52 2003 +0100
@@ -2169,18 +2169,17 @@
      Also, since the classes methods need a valid sourcefile, the current 
      sourceFile may not be rewritten."
 
-    |baseName dirName nm fileName|
-
-    baseName := (Smalltalk fileNameForClass:self name).
-    nm := baseName asFilename withSuffix:'st'.
+    |dirName nm fileName|
+
+    nm := (Smalltalk fileNameForClass:self name) , '.st'.
 
     "
      this test allows a smalltalk to be built without Projects/ChangeSets
     "
     Project notNil ifTrue:[
-	dirName := Project currentProjectDirectory
+        dirName := Project currentProjectDirectory
     ] ifFalse:[
-	dirName := Filename currentDirectory
+        dirName := Filename currentDirectory
     ].
     fileName := (dirName asFilename construct:nm).
     fileName makeLegalFilename.
@@ -2825,28 +2824,26 @@
     "create a file 'class.cls' (in the current projects fileOut-directory),
      consisting of all methods in myself in a portable binary format. 
      The argument controls how sources are to be saved:
-	#keep - include the source
-	#reference - include a reference to the sourceFile
-	#discard - dont save sources.
+        #keep - include the source
+        #reference - include a reference to the sourceFile
+        #discard - dont save sources.
 
      With #reference, the sourceFile needs to be present after reload 
      in order to be browsable."
 
-    |baseName fileName dirName|
-
-    baseName := (Smalltalk fileNameForClass:self name).
-    fileName := baseName , '.cls'.
+    |fileName dirName|
+
+    fileName := (Smalltalk fileNameForClass:self name) , '.cls'.
 
     Project notNil ifTrue:[
-	dirName := Project currentProjectDirectory
+        dirName := Project currentProjectDirectory
     ] ifFalse:[
-	dirName := '.'
+        dirName := '.'
     ].
     fileName := dirName asFilename construct:fileName.
     fileName makeLegalFilename.
     fileName := fileName name.
     self binaryFileOutWithSourceMode:sourceMode as:fileName.
-
 !
 
 binaryFileOutWithSourceMode:sourceMode as:fileNameString
@@ -2889,18 +2886,17 @@
      directory. Care is taken, to not clobber any existing file in
      case of errors (for example: disk full)"
 
-    |baseName dirName nm fileName|
-
-    baseName := (Smalltalk fileNameForClass:self name).
-    nm := baseName asFilename withSuffix:'xml'.
+    |dirName nm fileName|
+
+    nm := (Smalltalk fileNameForClass:self name) , '.xml'.
 
     "
      this test allows a smalltalk to be built without Projects/ChangeSets
     "
     Project notNil ifTrue:[
-	dirName := Project currentProjectDirectory
+        dirName := Project currentProjectDirectory
     ] ifFalse:[
-	dirName := Filename currentDirectory
+        dirName := Filename currentDirectory
     ].
     fileName := (dirName asFilename construct:nm).
     fileName makeLegalFilename.
@@ -2910,8 +2906,6 @@
     "
      Class fileOutXML
     "
-
-
 !
 
 fileOutXMLAllDefinitionsOn:aStream
@@ -4868,5 +4862,5 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.447 2003-10-10 07:05:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.448 2003-10-26 15:26:52 cg Exp $'
 ! !