--- a/Tools__ChangeSetBrowser2.st	Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st	Wed Jul 25 10:51:30 2012 +0100
@@ -2231,7 +2231,9 @@
 
     "Created: / 07-09-2011 / 15:54:03 / cg"
     "Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+ !
 
 !ChangeSetBrowser2 methodsFor:'aspects-queries'!
 
@@ -2600,13 +2602,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 
@@ -2632,18 +2630,13 @@
     ].
 
     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "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 := 
@@ -2677,12 +2670,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.
@@ -2691,7 +2679,7 @@
 
     addClassName := 
         [:nmArg |
-            |nm ns existingClass goodAnswer|
+            |nm ns existingClass goodAnswer cls|
 
             nm := nmArg.
             existingClass := Smalltalk classNamed:nm.
@@ -2707,16 +2695,16 @@
                 ] ifFalse:[                
                     goodAnswer := nm.
                     (lastNameSpace notNil 
-                        and:[ lastNameSpace isNamespace 
-                        and:[(lastNameSpace classNamed:nm) notNil ]]
+                        and:[ lastNameSpace isNameSpace 
+                        and:[(cls := lastNameSpace classNamed:nm) notNil ]]
                     ) ifTrue:[
-                        goodAnswer := (lastNameSpace classNamed:nm) name.
+                        goodAnswer := cls name.
                     ] ifFalse:[
                         (lastNameSpace notNil 
                             and:[ lastNameSpace isBehavior 
-                            and:[(lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
+                            and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
                         ) ifTrue:[
-                            goodAnswer := (lastNameSpace privateClassesAt:nm asSymbol) name.
+                            goodAnswer := cls name.
                         ]
                     ].
                 ].
@@ -2951,6 +2939,17 @@
 
     "Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+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'!
@@ -3473,13 +3472,13 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+    ^ '$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.32 2012/03/20 18:18:17 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012/07/23 11:15:10 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8022 2012-07-25 09:51:30Z vranyj1 $'
 ! !