1633 |
1633 |
1634 |m changeClassName useChangesString selectorString |
1634 |m changeClassName useChangesString selectorString |
1635 singleComparedClass singleComparedClassesName singleComparedMetaclassesName| |
1635 singleComparedClass singleComparedClassesName singleComparedMetaclassesName| |
1636 |
1636 |
1637 (singleComparedClass := self classBeingCompared) notNil ifTrue:[ |
1637 (singleComparedClass := self classBeingCompared) notNil ifTrue:[ |
1638 singleComparedClassesName := singleComparedClass name. |
1638 singleComparedClassesName := singleComparedClass name. |
1639 singleComparedMetaclassesName := singleComparedClass theMetaclass name. |
1639 singleComparedMetaclassesName := singleComparedClass theMetaclass name. |
1640 ]. |
1640 ]. |
1641 |
1641 |
1642 aChange isClassDefinitionChange ifTrue:[ |
1642 aChange isClassDefinitionChange ifTrue:[ |
1643 ^ aChange printStringWithoutClassName |
1643 ^ aChange printStringWithoutClassName |
1644 ]. |
1644 ]. |
1645 aChange isDoIt ifTrue:[ |
1645 aChange isDoIt ifTrue:[ |
1646 ^ aChange source , ' (doIt)' |
1646 ^ aChange source , ' (doIt)' |
1647 ]. |
1647 ]. |
1648 aChange isNameSpaceCreationChange ifTrue:[ |
1648 aChange isNameSpaceCreationChange ifTrue:[ |
1649 ^ aChange source |
1649 ^ aChange source |
1650 ]. |
1650 ]. |
1651 |
1651 |
1652 changeClassName := aChange className. |
1652 changeClassName := aChange className. |
1653 changeClassName isNil ifTrue:[ |
1653 changeClassName isNil ifTrue:[ |
1654 ^ aChange source |
1654 ^ aChange source |
1655 ]. |
1655 ]. |
1656 useChangesString := false. |
1656 useChangesString := false. |
1657 |
1657 |
1658 (changeClassName = singleComparedClassesName) ifTrue:[ |
1658 (changeClassName = singleComparedClassesName) ifTrue:[ |
1659 changeClassName := ''. |
1659 changeClassName := ''. |
1660 useChangesString := true. |
1660 useChangesString := true. |
1661 ] ifFalse:[ |
1661 ] ifFalse:[ |
1662 (changeClassName = singleComparedMetaclassesName) ifTrue:[ |
1662 (changeClassName = singleComparedMetaclassesName) ifTrue:[ |
1663 changeClassName := 'class '. |
1663 changeClassName := 'class '. |
1664 useChangesString := true. |
1664 useChangesString := true. |
1665 ] ifFalse:[ |
1665 ] ifFalse:[ |
1666 ((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[ |
1666 ((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[ |
1667 changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1. |
1667 changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1. |
1668 ]. |
1668 ]. |
1669 ]. |
1669 ]. |
1670 ]. |
1670 ]. |
1671 |
1671 |
1672 selectorString := ''. |
1672 selectorString := ''. |
1673 (aChange isMethodChange |
1673 (aChange isMethodChange) ifTrue:[ |
1674 and:[ aChange changeClass notNil ]) ifTrue:[ |
1674 selectorString := aChange selector. |
1675 selectorString := aChange selector. |
1675 aChange changeClass notNil ifTrue:[ |
1676 m := aChange changeMethod. |
1676 m := aChange changeMethod. |
1677 m notNil ifTrue:[ |
1677 m notNil ifTrue:[ |
1678 m := m originalMethodIfWrapped. |
1678 m := m originalMethodIfWrapped. |
1679 selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass. |
1679 selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass. |
1680 ]. |
1680 ]. |
1681 selectorString := ' ',selectorString |
1681 ]. |
|
1682 selectorString := ' ',selectorString |
1682 ]. |
1683 ]. |
1683 |
1684 |
1684 aChange isMethodCategoryChange ifTrue:[ |
1685 aChange isMethodCategoryChange ifTrue:[ |
1685 ^ changeClassName,selectorString, ' (category)' |
1686 ^ changeClassName,selectorString, ' (category)' |
1686 ]. |
1687 ]. |
1687 ^ changeClassName,selectorString |
1688 ^ changeClassName,selectorString |
1688 |
1689 |
1689 "Modified: / 24-11-2011 / 12:11:02 / cg" |
1690 "Modified: / 01-06-2012 / 11:04:10 / cg" |
1690 ! |
1691 ! |
1691 |
1692 |
1692 resetSelectionHolders |
1693 resetSelectionHolders |
1693 " |
1694 " |
1694 reset all selection holders when a new change set is given. |
1695 reset all selection holders when a new change set is given. |