Merge jv
authorMerge Script
Thu, 14 Apr 2016 06:38:31 +0200
branchjv
changeset 16288 5b2b245916fd
parent 16286 845a3d624cb7 (current diff)
parent 16287 e33a72e5e4eb (diff)
child 16293 d6b477b1814a
Merge
Tools__NewSystemBrowser.st
--- a/Tools__NewSystemBrowser.st	Wed Apr 13 22:53:21 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Thu Apr 14 06:38:31 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2000 by eXept Software AG
               All Rights Reserved
@@ -46256,7 +46254,7 @@
             sourceCode := ('The overwritten method is:\\' withCRs , sourceCode) asStringCollection.
             sourceCode size > 10 ifTrue:[
                 sourceCode := sourceCode copyTo:10.
-                sourceCode := sourceCode , '... <more code here> ...'.
+                sourceCode := sourceCode copyWith: '... <more code here> ...'.
             ].    
             sourceCode := (sourceCode asString) allItalic.
 
@@ -51243,7 +51241,7 @@
             label:[:chg | 
                 |lbl|
                 "/ lbl := chg printString
-                lbl := (chg className ? '???') , ' » ' , (chg selector  ? '???') allBold.
+                lbl := (chg className ? '???') , ' » ' , (chg selector  ? '???') allBold.
                 (chg isMethodChange and:[chg changeMethod isNil]) ifTrue:[
                     lbl := lbl asText allStrikedOut,' ','(removed)' allItalic.
                 ].    
@@ -58487,6 +58485,7 @@
     "Created: / 04-12-2011 / 22:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !NewSystemBrowser methodsFor:'private-semantic checks'!
 
 checkAcceptedMethod:aMethod inClass:aClass