--- a/AbstractSourceCodeManager.st	Fri May 03 15:18:06 2013 +0200
+++ b/AbstractSourceCodeManager.st	Tue May 07 13:34:41 2013 +0200
@@ -1619,21 +1619,17 @@
     "Created: / 26-09-2012 / 18:15:58 / cg"
 !
 
-isVersionMethodForExtensionsSelector: selector 
+isVersionMethodForExtensionsSelector: selector
+    <resource: #obsolete>
+ 
     "true if the given selector is for one of the manager's extensions version methods.
      These are all named extensionVersion_XXX, where XXX is manager-specific (CVS, P4, SVN etc.).
      For backward compatibility (times, when there was only one CVS sourcecode manager,
-     the selector named 'version' alone also counts as a version method
+     the selector named 'extensionsVersion' alone also counts as a version method
      (which might be a somewhat bad idea in the long term...)."
 
-    selector isNil ifTrue: [^ false].
-
-    ^ selector == self nameOfVersionMethodForExtensions 
-    or:[selector startsWith: self prefixOfVersionMethodForExtensionsSelector]
-
-    "Modified (comment): / 09-07-2011 / 12:31:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 29-09-2011 / 14:56:15 / cg"
-    "Created: / 26-01-2012 / 14:53:34 / cg"
+    self obsoleteMethodWarning:'use isExtensionsVersionMethodSelector'.
+    ^self isExtensionsVersionMethodSelector: selector
 !
 
 isVersionMethodSelector: selector 
@@ -2559,7 +2555,10 @@
     "JV@2012-02-02: Do not fileout extensionVersion methods, that one is filed out
      when extensions are filed out."
     (aClass inheritsFrom: ProjectDefinition) ifTrue:[
-        filter := [:m| (methodFilter value: m) and:[m selector ~~ self nameOfVersionMethodForExtensions] ]
+        filter := [:m| (methodFilter value: m) 
+                        and:[ (self isExtensionsVersionMethodSelector:m selector) not
+                         "m selector ~~ self nameOfVersionMethodForExtensions"] 
+                  ]
     ] ifFalse:[
         filter := methodFilter.
     ].
@@ -3308,18 +3307,20 @@
      used when saving version_XXX methods in a non-XXX sourceCodeManager"
 
     AbstractSourceFileWriter methodSourceRewriteQuery handle:[:rewriteQuery |
-        |m newSource |
+        |m newSource selector|
 
         m := rewriteQuery method.
         m isVersionMethod ifFalse:[                                                            
             rewriteQuery proceedWith:rewriteQuery source.
         ].
-        (m selector = self nameOfVersionMethodInClasses 
-        or:[m selector = self nameOfVersionMethodForExtensions 
-        or:[m selector = Class nameOfOldVersionMethod]]) ifTrue:[
+        selector := m selector.
+
+        ((self isVersionMethodSelector:selector) "selector = self nameOfVersionMethodInClasses" 
+        or:[(self isExtensionsVersionMethodSelector:selector) "selector = self nameOfVersionMethodForExtensions" 
+        or:[selector = Class nameOfOldVersionMethod]]) ifTrue:[
             "/ it's my version method - make sure that it has $'s around...
             newSource := self ensureDollarsInVersionMethod:rewriteQuery source.
-            (m selector = Class nameOfOldVersionMethod) ifTrue:[
+            (selector = Class nameOfOldVersionMethod) ifTrue:[
                 "/ #version method: make sure that it contains proper
                 "/ keyword (Header for CVS/P4, Id for SVN...
                 newSource := self ensureKeywordInVersionMethod: newSource.
@@ -3816,15 +3817,15 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.308 2013-04-27 12:26:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.309 2013-05-07 11:34:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.308 2013-04-27 12:26:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.309 2013-05-07 11:34:41 cg Exp $'
 !
 
 version_SVN
-    ^ '§Id: AbstractSourceCodeManager.st 1925 2012-06-05 13:52:00Z vranyj1 §'
+    ^ '$Id: AbstractSourceCodeManager.st,v 1.309 2013-05-07 11:34:41 cg Exp $'
 ! !