Merge jv
authorMerge Script
Fri, 01 Apr 2016 06:37:19 +0200
branchjv
changeset 3973 e0c2353a205b
parent 3970 6137854c2085 (current diff)
parent 3972 a635f8764d03 (diff)
child 3975 670fd6e04c95
Merge
AbstractSourceCodeManager.st
SourceCodeManagerUtilities.st
--- a/AbstractSourceCodeManager.st	Sat Mar 26 07:56:43 2016 +0000
+++ b/AbstractSourceCodeManager.st	Fri Apr 01 06:37:19 2016 +0200
@@ -1669,9 +1669,11 @@
 
     (newInfo includesKey:#pathInRepository) ifFalse:[
         (fileNameFromVersion := newInfo at:#fileName ifAbsent:nil) notNil ifTrue:[
-            (repairedPath := cls projectDirectory asFilename construct:fileNameFromVersion) exists ifTrue:[
-                Transcript showCR:('Oldstyle, broken or invalid version-info in class: ',cls name allBold,'. Please check').
-                newInfo at:#pathInRepository put:repairedPath pathName.
+            cls projectDirectory notNil ifTrue:[
+                (repairedPath := cls projectDirectory asFilename construct:fileNameFromVersion) exists ifTrue:[
+                    Transcript showCR:('Oldstyle, broken or invalid version-info in class: ',cls name allBold,'. Please check').
+                    newInfo at:#pathInRepository put:repairedPath pathName.
+                ].
             ].
         ].
     ].
--- a/SourceCodeManagerUtilities.st	Sat Mar 26 07:56:43 2016 +0000
+++ b/SourceCodeManagerUtilities.st	Fri Apr 01 06:37:19 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 eXept Software AG
               All Rights Reserved
@@ -3352,6 +3354,14 @@
                     ] ifFalse:[ 
                         checkinInfo checkinReason == Tools::CheckinInfoDialog reasonUIEnhancement ifTrue:[
                             reasonLine := '#UI_ENHANCEMENT' 
+                        ] ifFalse:[ 
+                            checkinInfo checkinReason == Tools::CheckinInfoDialog reasonQuality ifTrue:[
+                                reasonLine := '#QUALITY' 
+                            ] ifFalse:[ 
+                                checkinInfo checkinReason == Tools::CheckinInfoDialog reasonTuning ifTrue:[
+                                    reasonLine := '#TUNING' 
+                                ]
+                            ]
                         ]
                     ]
                 ]
@@ -3374,6 +3384,8 @@
     ].
     aBlock value:logMessage value:checkinInfo.
     ^ true
+
+    "Modified: / 31-03-2016 / 17:58:11 / cg"
 !
 
 removeSourceContainerForClass:aClass