equal
deleted
inserted
replaced
1987 ! |
1987 ! |
1988 |
1988 |
1989 changeMenuBrowse: changeList |
1989 changeMenuBrowse: changeList |
1990 |changes methods classes| |
1990 |changes methods classes| |
1991 |
1991 |
1992 changeList == list1 ifTrue:[ |
1992 changes := self selectedChangesIn: changeList. |
1993 changes := selection1Holder value. |
|
1994 ] ifFalse:[ |
|
1995 changes := selection2Holder value. |
|
1996 ]. |
|
1997 changes := changes collect:[:c | c change]. |
|
1998 "/ changes := changeList listHolder value collect:[:c | c change]. |
1993 "/ changes := changeList listHolder value collect:[:c | c change]. |
|
1994 |
1999 (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[ |
1995 (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[ |
2000 classes := (changes collect:[:c | c changeClass]). |
1996 classes := (changes collect:[:c | c changeClass]). |
2001 UserPreferences current systemBrowserClass |
1997 UserPreferences current systemBrowserClass |
2002 browseClasses:classes title:'selected monticello classes'. |
1998 browseClasses:classes title:'selected monticello classes'. |
2003 ] ifFalse:[ |
1999 ] ifFalse:[ |
2019 UserPreferences current systemBrowserClass |
2015 UserPreferences current systemBrowserClass |
2020 browseMethods:methods title:'selected monticello methods' sort:false. |
2016 browseMethods:methods title:'selected monticello methods' sort:false. |
2021 ]. |
2017 ]. |
2022 |
2018 |
2023 "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2019 "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2024 "Modified: / 05-09-2011 / 16:17:48 / cg" |
2020 "Modified: / 23-07-2012 / 13:13:37 / cg" |
2025 ! |
2021 ! |
2026 |
2022 |
2027 changeMenuBrowseClass: changeList |
2023 changeMenuBrowseClass: changeList |
2028 |changes classes addThemChanges cls| |
2024 |changes classes addThemChanges cls| |
2029 |
2025 |
2030 changeList == list1 ifTrue:[ |
2026 changes := self selectedChangesIn: changeList. |
2031 changes := selection1Holder value. |
|
2032 ] ifFalse:[ |
|
2033 changes := selection2Holder value. |
|
2034 ]. |
|
2035 changes := changes collect:[:eachListEntry | eachListEntry change]. |
|
2036 |
2027 |
2037 classes := Set new. |
2028 classes := Set new. |
2038 addThemChanges := |
2029 addThemChanges := |
2039 [:c | |
2030 [:c | |
2040 c isClassDefinitionChange ifTrue:[ |
2031 c isClassDefinitionChange ifTrue:[ |
2064 changeMenuCompareClass: changeList |
2055 changeMenuCompareClass: changeList |
2065 |changes classNames classNameToClassMapping lastNameSpace |
2056 |changes classNames classNameToClassMapping lastNameSpace |
2066 addClassName addThemChanges existingClasses |
2057 addClassName addThemChanges existingClasses |
2067 allChanges changeSet1 changeSet2 diffSet| |
2058 allChanges changeSet1 changeSet2 diffSet| |
2068 |
2059 |
2069 changeList == list1 ifTrue:[ |
2060 changes := self selectedChangesIn: changeList. |
2070 changes := selection1Holder value. |
|
2071 ] ifFalse:[ |
|
2072 changes := selection2Holder value. |
|
2073 ]. |
|
2074 changes := changes collect:[:eachListEntry | eachListEntry change]. |
|
2075 |
2061 |
2076 classNameToClassMapping := Dictionary new. |
2062 classNameToClassMapping := Dictionary new. |
2077 classNames := Set new. |
2063 classNames := Set new. |
2078 allChanges := ChangeSet new. |
2064 allChanges := ChangeSet new. |
2079 existingClasses := Set new. |
2065 existingClasses := Set new. |
2288 |
2274 |
2289 self selectionDo:[:chg|chg removed: false] |
2275 self selectionDo:[:chg|chg removed: false] |
2290 |
2276 |
2291 "Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2277 "Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2292 "Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2278 "Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2279 ! |
|
2280 |
|
2281 selectedChangesIn: changeList |
|
2282 |changes| |
|
2283 |
|
2284 changes := (changeList == list1 |
|
2285 ifTrue:[ selection1Holder ] |
|
2286 ifFalse:[ selection2Holder ]) value. |
|
2287 ^ changes collect:[:eachListEntry | eachListEntry change]. |
|
2288 |
|
2289 "Created: / 23-07-2012 / 13:13:11 / cg" |
2293 ! ! |
2290 ! ! |
2294 |
2291 |
2295 !ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'! |
2292 !ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'! |
2296 |
2293 |
2297 changeMenuApplyChange: aChange |
2294 changeMenuApplyChange: aChange |
2751 ! ! |
2748 ! ! |
2752 |
2749 |
2753 !ChangeSetBrowser2 class methodsFor:'documentation'! |
2750 !ChangeSetBrowser2 class methodsFor:'documentation'! |
2754 |
2751 |
2755 version |
2752 version |
2756 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.34 2012-07-23 11:10:24 cg Exp $' |
2753 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012-07-23 11:15:10 cg Exp $' |
2757 ! |
2754 ! |
2758 |
2755 |
2759 version_CVS |
2756 version_CVS |
2760 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.34 2012-07-23 11:10:24 cg Exp $' |
2757 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012-07-23 11:15:10 cg Exp $' |
2761 ! |
2758 ! |
2762 |
2759 |
2763 version_SVN |
2760 version_SVN |
2764 ^ '§Id: Tools__ChangeSetBrowser.st 7486 2009-10-26 22:06:24Z vranyj1 §' |
2761 ^ '§Id: Tools__ChangeSetBrowser.st 7486 2009-10-26 22:06:24Z vranyj1 §' |
2765 ! ! |
2762 ! ! |