AbstractSourceCodeManager.st
changeset 3417 848ad94c1e8f
parent 3399 296cd9342551
child 3419 96c5f010e49d
child 3453 d5b7369cc5de
--- a/AbstractSourceCodeManager.st	Fri Nov 08 11:34:29 2013 +0100
+++ b/AbstractSourceCodeManager.st	Thu Nov 14 16:34:21 2013 +0100
@@ -1598,35 +1598,7 @@
 isRevision:revision1 after:revision2
     "true, if the dotted revision string revision1 is > than revision2"
 
-    |idx1 idx2 nr1 nr2 rest1 rest2|
-
-    idx1 := revision1 indexOf:$..
-    idx1 == 0 ifTrue:[
-        nr1 := Integer readFrom:revision1.
-    ] ifFalse:[
-        nr1 := Integer readFrom:(revision1 copyTo:idx1-1).
-        rest1 := revision1 copyFrom:idx1+1.
-    ].
-
-    idx2 := revision2 indexOf:$..
-    idx2 == 0 ifTrue:[
-        nr2 := Integer readFrom:revision2.
-    ] ifFalse:[
-        nr2 := Integer readFrom:(revision2 copyTo:idx2-1).
-        rest2 := revision2 copyFrom:idx2+1.
-    ].
-    nr1 = nr2 ifFalse:[
-        ^ nr1 > nr2
-    ].
-
-    "/ advance...
-    rest1 isEmptyOrNil ifTrue:[
-        ^ false
-    ].
-    rest2 isEmptyOrNil ifTrue:[
-        ^ true
-    ].
-    ^ self isRevision:rest1 after:rest2
+    ^ (revision1 compareAsVersionNumberWith:revision2) > 0
 
     "
      SourceCodeManager isRevision:'1' after:'2'      
@@ -1636,6 +1608,7 @@
      SourceCodeManager isRevision:'1' after:'1.1'    
      SourceCodeManager isRevision:'1.1' after:'1'    
      SourceCodeManager isRevision:'1.1' after:'1.2' 
+     SourceCodeManager isRevision:'1.10' after:'1.2' 
      SourceCodeManager isRevision:'1.2' after:'1.1' 
      SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.5' 
      SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.3' 
@@ -1649,8 +1622,7 @@
 isRevision:revision1 sameOrAfter:revision2
     "true, if the dotted revision string revision1 is >= than revision2"
 
-    revision1 = revision2 ifTrue:[^ true].
-    ^ self isRevision:revision1 after:revision2
+    ^ (revision1 compareAsVersionNumberWith:revision2) >= 0
 
     "Created: / 26-09-2012 / 18:15:58 / cg"
 !
@@ -3867,15 +3839,15 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.317 2013-09-05 23:17:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.318 2013-11-14 15:34:21 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.317 2013-09-05 23:17:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.318 2013-11-14 15:34:21 stefan Exp $'
 !
 
 version_SVN
-    ^ '$Id: AbstractSourceCodeManager.st,v 1.317 2013-09-05 23:17:52 cg Exp $'
+    ^ '$Id: AbstractSourceCodeManager.st,v 1.318 2013-11-14 15:34:21 stefan Exp $'
 ! !