Tools__ChangeSetBrowser2.st
changeset 10658 3c26332add1f
parent 10655 788f21d925ce
child 10665 bbaa7c4154de
--- a/Tools__ChangeSetBrowser2.st	Wed Aug 31 12:05:00 2011 +0200
+++ b/Tools__ChangeSetBrowser2.st	Wed Aug 31 19:00:57 2011 +0200
@@ -639,6 +639,7 @@
     "Do not manually edit this!! If it is corrupted,
      the MenuEditor may not be able to read the specification."
 
+
     "
      MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu
      (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu)) startUp
@@ -759,7 +760,7 @@
           )
          (MenuItem
             enabled: hasSingleChangeSelectedAndCanBrowse:
-            label: 'Browse'
+            label: 'Browse Method(s)'
             itemValue: changeMenuBrowse:
             translateLabel: true
           )
@@ -1476,13 +1477,26 @@
         UserPreferences current systemBrowserClass 
             browseClasses:classes title:'selected monticello classes'.
     ] ifFalse:[
-        methods := (changes collect:[:c | c changeMethod]).
+        methods := OrderedCollection new.
+        changes do:[:each |
+            each isCompositeChange ifTrue:[
+                each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]]
+            ] ifFalse:[
+                each isMethodChange ifTrue:[
+                    methods add:(each changeMethod).
+                ]
+            ]
+        ].
+        (methods includes:nil) ifTrue:[
+            Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
+            methods := methods reject:[:m | m isNil].
+        ].
         UserPreferences current systemBrowserClass 
             browseMethods:methods title:'selected monticello methods' sort:false.
     ].
 
     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 21-08-2011 / 16:48:13 / cg"
+    "Modified: / 31-08-2011 / 11:30:21 / cg"
 !
 
 changeMenuDeleteSelection: changeList
@@ -1779,11 +1793,11 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.14 2011-08-30 14:05:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.15 2011-08-31 17:00:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.14 2011-08-30 14:05:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.15 2011-08-31 17:00:57 cg Exp $'
 !
 
 version_SVN