Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 19 Apr 2015 21:30:23 +0100
branchjv
changeset 3854 0590e72fca22
parent 3853 eff806ecb2e6 (current diff)
parent 3849 3c85146be3fa (diff)
child 3857 878ff5dde744
Merge
--- a/CVSSourceCodeManager.st	Wed Apr 15 11:50:08 2015 +0100
+++ b/CVSSourceCodeManager.st	Sun Apr 19 21:30:23 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
               All Rights Reserved
@@ -459,7 +461,7 @@
 recentTag
     "a place to remember recently set tags (to share between File and SystemBrowser)"
 
-    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags last].
+    ^ RecentTags isEmptyOrNil ifTrue:[nil] ifFalse:[RecentTags first].
 
     "
      self recentTag
@@ -1528,7 +1530,7 @@
     rightPart := rightPart copyFrom:idx+1.
 
     "/ originalVersionString:
-    "/      '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.504 2015-03-24 14:16:29 cg Exp $'
+    "/      '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.505 2015-04-16 09:35:34 stefan Exp $'
     "/ leftPart:
     "/      '$Header: /cvs/stx/stx/goodies/refactoryBrowser/lint/RBLiteralArrayContainsCommaRule.st,v'
     "/ dateAndTimePart:
@@ -4661,17 +4663,17 @@
             "/ The repair code will be removed at some time in the future...
 
             "/ temporary fix Felix' bad string translation:
-            (aString startsWith:'§Header:') ifTrue:[
-                (aString endsWith:'Exp §') ifTrue:[
+            (aString startsWith:'§Header:') ifTrue:[
+                (aString endsWith:'Exp §') ifTrue:[
                     fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
 
                     aClass isNil ifTrue:[
                         autoFixHolder value ifFalse:[
-                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
                         ]
                     ] ifFalse:[
                         (autoFixHolder value 
-                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
                         ) ifTrue:[
                             self updateVersionMethodOf:aClass for:fixedString.
                         ].
@@ -4679,7 +4681,7 @@
                 ].
             ].
 
-            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
             (aString startsWith:'Header: ') ifTrue:[
                 (aString endsWith:'Exp ') ifTrue:[
                     fixedString := '$' , aString , '$'.
@@ -5611,11 +5613,11 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.504 2015-03-24 14:16:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.505 2015-04-16 09:35:34 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.504 2015-03-24 14:16:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.505 2015-04-16 09:35:34 stefan Exp $'
 ! !
 
 
--- a/SourceCodeManagerUtilities.st	Wed Apr 15 11:50:08 2015 +0100
+++ b/SourceCodeManagerUtilities.st	Sun Apr 19 21:30:23 2015 +0100
@@ -3389,6 +3389,12 @@
 !
 
 tagClasses:aCollectionOfClasses as:tag
+    ^ self tagClasses:aCollectionOfClasses as:tag revision:nil
+
+    "Created: / 12-09-2006 / 13:04:29 / cg"
+!
+
+tagClasses:aCollectionOfClasses as:tag revision:revision
     |classesPerManager|
 
     classesPerManager := Dictionary new.
@@ -3403,13 +3409,11 @@
     classesPerManager keysAndValuesDo:[:manager :classesPerManager|
         manager
             setSymbolicName:tag 
-            revision:nil 
+            revision:revision 
             overWrite:true 
             classes:classesPerManager.
     ].
     ^ true
-
-    "Created: / 12-09-2006 / 13:04:29 / cg"
 !
 
 tagPackage: package as:tag
@@ -4325,10 +4329,10 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.319 2015-03-01 13:18:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.320 2015-04-16 09:35:17 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.319 2015-03-01 13:18:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.320 2015-04-16 09:35:17 stefan Exp $'
 ! !