hg/stx-libtool: comparison VersionDiffBrowser.st

equal deleted inserted replaced

-:3f67162018e1
+:4970cf19ac71
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 2000 by eXept Software AG
 	      All Rights Reserved
 This software is furnished under a license and may be used
 name: 'InfoLabel'
 layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
 uuid: '90e47868-7175-11e9-a23a-b8f6b1108e05'
 level: -1
 translateLabel: true
-labelChannel: infoHolder
+labelChannel: informationHolder
 adjust: left
 )
 )
 )
 name: 'InfoLabel'
 layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
 uuid: '2b3f4a44-d4fd-11e7-af82-c42c033b4871'
 level: -1
 translateLabel: true
-labelChannel: infoHolder
+labelChannel: informationHolder
 adjust: left
 )
 )
 )
 name: 'InfoLabel'
 layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
 uuid: '2b3f4a44-d4fd-11e7-af82-c42c033b4871'
 level: -1
 translateLabel: true
-labelChannel: infoHolder
+labelChannel: informationHolder
 adjust: left
 )
 )
 )
 ^ infoHolder.
 "Modified: / 08-05-2019 / 11:05:10 / Claus Gittinger"
 !
+informationHolder
+^ infoHolder.
+"Modified: / 08-05-2019 / 11:05:10 / Claus Gittinger"
+!
 methodText
 "aspect for the text in the method text view"
 ^ methodText.
 changeB := (methodsChangedFiltered at:sel) second.
 self withReadCursorDo:[
 |info|
 info := self shortChangeInfoFor:changeA and:changeB.
-info notNil ifTrue:[
+self information:(info ? 'Methods are different').
-self infoHolder value:info
-].
 self diffTextView
 text1:(changeA prettyPrintedSource)
 text2:(changeB prettyPrintedSource)
 ].
 self showDiffTextView.
 self methodsChangedSelection value:nil.
 change := methodsOnlyInAFiltered "self changeSetA" at:sel.
 self methodText value:(change prettyPrintedSource).
 self showSingleTextView.
 (versionA := diffTextLabelA value) notEmptyOrNil ifTrue:[
-self infoHolder value:('Method removed from version: ',versionA).
+self information:'Method removed from %1' with:versionA.
-].
+] ifFalse:[
+self information:'Method removed'.
+].
 ] ifFalse:[
 self showVersionInfoIfNothingSelected
 ].
 "Modified: / 05-02-2017 / 12:08:07 / cg"
 "the selection in the list of the 'method only in version B' changed.
 Reset the selection of the two other lists and show the method in
 the text view.
 <return: self>"
-|change sel versionA|
+|change sel versionB|
 "/ self information:''.
 sel := self methodsOnlyInBSelection value.
 sel notNil ifTrue:[
 self methodsOnlyInASelection value:nil.
 self methodsChangedSelection value:nil.
 change := methodsOnlyInBFiltered "self changeSetB" at:sel.
 self methodText value:(change prettyPrintedSource).
 self showSingleTextView.
-(versionA := diffTextLabelA value) notEmptyOrNil ifTrue:[
+(versionB := diffTextLabelB value) notEmptyOrNil ifTrue:[
-self infoHolder value:('Method added to version: ',versionA).
+self information:'Method added to %1' with:versionB.
+] ifFalse:[
+self information:'Method added'.
 ].
 ] ifFalse:[
 self showVersionInfoIfNothingSelected
 ].
 (treeA semanticallyEqualTo:treeB withMapping:(Dictionary  new)) ifTrue:[
 ^ 'Methods seem to do the same'.
 ].
 ^ 'Methods are different'.
 ].
-self infoHolder value:'ParseError while comparing - please check the code'.
+self information:'ParseError while comparing - please check the code'.
 ^ nil
 ].
 changeA isClassDefinitionChange ifTrue:[
 changeB isClassDefinitionChange ifFalse:[^ 'Different change types'].
 v menuHolder:mGen.
 v menuMessage:#value.
 ]
 !
-informationUntranslated:msg
-self infoHolder value:msg
-"Created: / 09-08-2018 / 15:40:52 / Claus Gittinger"
-!
 printStringForChange:aChange
 "generate a print string for a change."
 |m changeClassName classOrMetaString useChangesString selectorString
 singleComparedClass singleComparedClassesName singleComparedMetaclassesName
 m := m originalMethodIfWrapped.
 selectorString := m printStringForBrowserWithSelector:aChange changeSelector inClass:aChange changeClass.
 ].
 ].
 changeClassName notEmptyOrNil ifTrue:[
-selectorString := ' � ',selectorString
+selectorString := ' » ',selectorString
 ]
 ].
 printString := changeClassName,classOrMetaString,selectorString.
 aChange isMethodCategoryChange ifTrue:[

changeset 19440	4970cf19ac71
parent 19351	b6350f5d7ae3
child 19463	33e02e0e9711