diff -r c955fe2bbcb5 -r 7d72201a313c Tools__ChangeSetBrowser2.st --- a/Tools__ChangeSetBrowser2.st Mon Jul 23 13:10:24 2012 +0200 +++ b/Tools__ChangeSetBrowser2.st Mon Jul 23 13:15:10 2012 +0200 @@ -1989,13 +1989,9 @@ changeMenuBrowse: changeList |changes methods classes| - changeList == list1 ifTrue:[ - changes := selection1Holder value. - ] ifFalse:[ - changes := selection2Holder value. - ]. - changes := changes collect:[:c | c change]. + changes := self selectedChangesIn: changeList. "/ changes := changeList listHolder value collect:[:c | c change]. + (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[ classes := (changes collect:[:c | c changeClass]). UserPreferences current systemBrowserClass @@ -2021,18 +2017,13 @@ ]. "Created: / 04-08-2011 / 17:27:20 / Jan Vrany " - "Modified: / 05-09-2011 / 16:17:48 / cg" + "Modified: / 23-07-2012 / 13:13:37 / cg" ! changeMenuBrowseClass: changeList |changes classes addThemChanges cls| - changeList == list1 ifTrue:[ - changes := selection1Holder value. - ] ifFalse:[ - changes := selection2Holder value. - ]. - changes := changes collect:[:eachListEntry | eachListEntry change]. + changes := self selectedChangesIn: changeList. classes := Set new. addThemChanges := @@ -2066,12 +2057,7 @@ addClassName addThemChanges existingClasses allChanges changeSet1 changeSet2 diffSet| - changeList == list1 ifTrue:[ - changes := selection1Holder value. - ] ifFalse:[ - changes := selection2Holder value. - ]. - changes := changes collect:[:eachListEntry | eachListEntry change]. + changes := self selectedChangesIn: changeList. classNameToClassMapping := Dictionary new. classNames := Set new. @@ -2290,6 +2276,17 @@ "Modified: / 29-10-2010 / 13:53:16 / Jan Vrany " "Created: / 04-08-2011 / 17:42:36 / Jan Vrany " +! + +selectedChangesIn: changeList + |changes| + + changes := (changeList == list1 + ifTrue:[ selection1Holder ] + ifFalse:[ selection2Holder ]) value. + ^ changes collect:[:eachListEntry | eachListEntry change]. + + "Created: / 23-07-2012 / 13:13:11 / cg" ! ! !ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'! @@ -2753,11 +2750,11 @@ !ChangeSetBrowser2 class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.34 2012-07-23 11:10:24 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012-07-23 11:15:10 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.34 2012-07-23 11:10:24 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012-07-23 11:15:10 cg Exp $' ! version_SVN