care for filename in classFilename,
authorClaus Gittinger <cg@exept.de>
Wed, 11 Oct 2006 14:51:14 +0200
changeset 1856 1b69eec9b150
parent 1855 0c365a83ffc2
child 1857 5a5287e57ffe
care for filename in classFilename, being diferent from the expected one (no info message if access is ok).
AbstractSourceCodeManager.st
--- a/AbstractSourceCodeManager.st	Wed Oct 11 14:20:48 2006 +0200
+++ b/AbstractSourceCodeManager.st	Wed Oct 11 14:51:14 2006 +0200
@@ -1071,10 +1071,10 @@
     "/
     "/ the filename I'd expect from its name ...
     "/
-    classFileNameBase := (Smalltalk fileNameForClass:cls owningClassOrYourself).
+    classFileNameBase := cls classFilename.
 
     (newInfo includesKey:#fileName) ifFalse:[
-        newInfo at:#fileName put:(classFileNameBase , '.st')
+        newInfo at:#fileName put:classFileNameBase
     ].
 
     "/ guess on the container
@@ -1086,13 +1086,13 @@
                          , '/'
                          , (newInfo at:#directory)
                          , '/'
-                         , classFileNameBase , '.st,v'.
+                         , classFileNameBase , ',v'.
         ].
         pathInRepository := (newInfo at:#module)
                      , '/'
                      , (newInfo at:#directory)
                      , '/'
-                     , classFileNameBase , '.st'.
+                     , classFileNameBase.
         newInfo at:#pathInRepository put:pathInRepository.
     ].
 
@@ -1104,26 +1104,26 @@
     revInfo notNil ifTrue:[
         actualSourceFileName := revInfo at:#fileName ifAbsent:nil.
         actualSourceFileName notNil ifTrue:[
-            expectedFileName := classFileNameBase , '.st'.
+            expectedFileName := classFileNameBase.
             actualSourceFileName ~= expectedFileName ifTrue:[
                 ('SourceCodeManager [warning]: source of class ' , cls name , ' in ' , actualSourceFileName , ';') infoPrintCR.
                 ('SourceCodeManager [info]: (expected: ' , expectedFileName , '); renamed or missing abbreviation ?') infoPrintCR.
                 ('SourceCodeManager [info]: This may fail to autoload later if left unchanged.') infoPrintCR.
                 newInfo at:#expectedFileName put:expectedFileName.
                 newInfo at:#renamed put:true.
-                classFileNameBase := actualSourceFileName copyWithoutLast:3
+                classFileNameBase := actualSourceFileName
             ]
         ]
     ].
 
-    newInfo at:#classFileNameBase put:classFileNameBase.
+    newInfo at:#classFileNameBase put:(classFileNameBase asFilename withoutSuffix) name.
     ^ newInfo
 
     "
      self sourceInfoOfClass:Array
     "
 
-    "Modified: / 06-10-2006 / 16:17:24 / cg"
+    "Modified: / 11-10-2006 / 14:50:08 / cg"
 ! !
 
 !AbstractSourceCodeManager class methodsFor:'source code access'!
@@ -2379,7 +2379,7 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.196 2006-10-06 14:23:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.197 2006-10-11 12:51:14 cg Exp $'
 ! !
 
 AbstractSourceCodeManager initialize!