# HG changeset patch # User Claus Gittinger # Date 1576624969 -3600 # Node ID a0f6259b11087299d113f25accd8a3504645e320 # Parent 6261c07996fb0e841599f9f9f139e91b6eec8507 #BUGFIX by exept class: ChangeSet FIX: fullClassName vs. class name changed: #includesChangeForClassNamed: (send #fullClassName instead of #className) #includesChangeForClassOrMetaclass: (send #fullClassName instead of #className) #includesChangeForClassOrMetaclassOrPrivateClassOf: (send #fullClassName instead of #className) #includesChangeForClassOrMetaclassOrPrivateClassOfAny: (send #fullClassName instead of #className) #methodDefinitionChangesForClassNamed: (send #fullClassName instead of #className) diff -r 6261c07996fb -r a0f6259b1108 ChangeSet.st --- a/ChangeSet.st Wed Dec 18 00:20:16 2019 +0100 +++ b/ChangeSet.st Wed Dec 18 00:22:49 2019 +0100 @@ -1715,7 +1715,7 @@ includesChangeForClassNamed:aClassName (self changedClasses contains:[:aClass | aClass theNonMetaclass name = aClassName]) ifFalse:[^ false]. - ^ self contains:[:aChange | aChange className = aClassName] + ^ self contains:[:aChange | aChange fullClassName = aClassName] " ChangeSet current includesChangeForClassNamed:'ChangeSet' @@ -1729,16 +1729,16 @@ nameOfMetaclass := aClass theMetaclass name. (self changedClasses contains:[:eachClass | eachClass theNonMetaclass name = nameOfClass]) ifFalse:[ - ^ false. + ^ false. ]. ^ self contains:[:eachChange | - |changeClassName| - - changeClassName := eachChange className. - changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass] - ] + |changeClassName| + + changeClassName := eachChange fullClassName. + changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass] + ] "Modified: / 09-10-2006 / 13:40:29 / cg" ! @@ -1750,18 +1750,18 @@ nameOfMetaclass := aClass theMetaclass name. self do:[:aChange | - |changeClassName changeClass| - - changeClassName := aChange className. - (changeClassName = nameOfClass) ifTrue:[^ true]. - (changeClassName = nameOfMetaclass) ifTrue:[^ true]. - - changeClass := aChange changeClass. - (changeClass notNil - and:[changeClass isPrivate - and:[changeClass owningClass == aClass]]) ifTrue:[ - ^ true - ] + |changeClassName changeClass| + + changeClassName := aChange fullClassName. + (changeClassName = nameOfClass) ifTrue:[^ true]. + (changeClassName = nameOfMetaclass) ifTrue:[^ true]. + + changeClass := aChange changeClass. + (changeClass notNil + and:[changeClass isPrivate + and:[changeClass owningClass == aClass]]) ifTrue:[ + ^ true + ] ]. ^ false @@ -1775,18 +1775,18 @@ namesOfMetaclasses := (aCollectionOfClasses collect:[:eachClass | eachClass theMetaclass name]) asArray. self do:[:aChange | - |changeClassName changeClass| - - changeClassName := aChange className. - (namesOfClasses includes:changeClassName) ifTrue:[^ true]. - (namesOfMetaclasses includes:changeClassName) ifTrue:[^ true]. - - changeClass := aChange changeClass. - (changeClass notNil and:[changeClass isPrivate]) ifTrue:[ - (aCollectionOfClasses includes:changeClass owningClass) ifTrue:[ - ^ true - ]. - ] + |changeClassName changeClass| + + changeClassName := aChange fullClassName. + (namesOfClasses includes:changeClassName) ifTrue:[^ true]. + (namesOfMetaclasses includes:changeClassName) ifTrue:[^ true]. + + changeClass := aChange changeClass. + (changeClass notNil and:[changeClass isPrivate]) ifTrue:[ + (aCollectionOfClasses includes:changeClass owningClass) ifTrue:[ + ^ true + ]. + ] ]. ^ false @@ -1806,7 +1806,9 @@ ! methodDefinitionChangesForClassNamed:aClassName - ^ self select:[:chg | chg isMethodDefinitionChange and:[chg className = aClassName]] as:OrderedCollection. + ^ self + select:[:chg | chg isMethodDefinitionChange and:[chg fullClassName = aClassName]] + as:OrderedCollection. ! selectClassesForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses