--- a/Tools__NewSystemBrowser.st	Fri Apr 27 15:33:33 2012 +0200
+++ b/Tools__NewSystemBrowser.st	Sat Apr 28 18:13:27 2012 +0200
@@ -18669,14 +18669,15 @@
     |holder|
 
     (holder := builder bindingAt:#sortByNameAndInheritance) isNil ifTrue:[
-        holder := (AspectAdaptor forAspect: #sortAndIndentClassesByInheritance)
-                    subject: UserPreferences current.
+        "now: I do not want that to be automatically forwarded to the prefs"
+        holder := (UserPreferences current sortAndIndentClassesByInheritance) asValue.
         builder aspectAt:#sortByNameAndInheritance put: holder.
     ].
     ^ holder
 
     "Created: / 04-07-2011 / 18:40:19 / cg"
     "Modified: / 08-07-2011 / 10:01:56 / jv"
+    "Modified (format): / 27-04-2012 / 20:02:24 / cg"
 !
 
 sortVariablesByName
@@ -42926,10 +42927,10 @@
 !
 
 selectorMenuSaveRemove
-    "check for senders (and windowSpec/menuSpec refs) to methods selector,
+    "check for senders (and windowSpec/menuSpec refs) to method's selector,
      then confirm removal of the selected methods"
 
-    |selectorsToRemove selectorsToCheckForInvokation selectorsToCheckForSelectorUse
+    |selectorsToRemove methodsToRemove selectorsToCheckForInvokation selectorsToCheckForSelectorUse
      possiblyInvoked possiblyUsedAsSelector msg isAre answer selInfo methods brwsr numVersionMethods|
 
     selectorsToRemove := IdentitySet new.
@@ -42949,6 +42950,8 @@
     possiblyInvoked := IdentitySet new.
     possiblyUsedAsSelector := IdentitySet new.
 
+    methodsToRemove := self selectedMethodsValue copy.
+
     self withSearchCursorDo:[
         "/ search through all of the system
         Smalltalk allMethodsDo:[:mthd |
@@ -42970,7 +42973,7 @@
                 selectorsToRemove do:[:eachSelectorToRemove |
                     sent := mthd messagesSent.
                    (sent includes:eachSelectorToRemove) ifTrue:[
-                       (self selectedMethodsValue includesIdentical:mthd) ifFalse:[
+                       (methodsToRemove includesIdentical:mthd) ifFalse:[
                            possiblyInvoked add:mthd.
                        ]
                    ]
@@ -42980,7 +42983,7 @@
                 newFound := IdentitySet new.
                 selectorsToRemove do:[:eachSelectorToRemove |
                     (mthd refersToLiteral:eachSelectorToRemove) ifTrue:[
-                        (self selectedMethodsValue includesIdentical:mthd) ifFalse:[
+                        (methodsToRemove includesIdentical:mthd) ifFalse:[
                             possiblyUsedAsSelector add:mthd.
                         ]
                     ].
@@ -43023,17 +43026,19 @@
     ].
 
     answer := OptionBox
-                  request:((resources string:msg with:possiblyInvoked size printString with:possiblyUsedAsSelector size printString)
+                  request:((resources string:msg 
+                                        with:possiblyInvoked size 
+                                        with:possiblyUsedAsSelector size)
                            , '\\Really remove ?') withCRs
                   label:(resources string:'Attention')
                   image:(WarningBox iconBitmap)
-                  buttonLabels:(resources array:#( 'Cancel' 'Remove' 'Browse Methods'))
-                  values:#(false true #browse)
+                  buttonLabels:(resources array:#( 'Cancel' 'Remove' 'Remove then Browse Senders' 'Browse Senders'))
+                  values:#(false true #removeAndBrowse #browse )
                   default:#browse
                   onCancel:false.
 
      answer == false ifTrue:[^ self].
-     answer == #browse ifTrue:[
+     (answer == #browse or:[answer == #removeAndBrowse]) ifTrue:[
         methods := IdentitySet new.
         methods addAll:possiblyInvoked.
         methods addAll:possiblyUsedAsSelector.
@@ -43045,12 +43050,12 @@
         selectorsToRemove size == 1 ifTrue:[
             brwsr autoSearchPattern:selInfo
         ].
-        ^ self
+        answer == #browse ifTrue:[ ^ self ].
+        "/ fall into remove
      ].
-
-     self doRemoveSelectedMethodsUnconfirmed
-
-    "Modified: / 28-02-2012 / 16:30:03 / cg"
+     self doRemoveMethodsUnconfirmed:methodsToRemove
+
+    "Modified: / 28-04-2012 / 11:12:03 / cg"
 !
 
 selectorMenuSelectMethodsWithString
@@ -55820,7 +55825,7 @@
             arguments:#().
         ^ true
     ].
-    (rawKey == #Delete) ifTrue:[
+    ((key == #Cut) or:[rawKey == #Delete]) ifTrue:[
         self
             enqueueMessage:#classMenuRemove
             for:self
@@ -55835,6 +55840,8 @@
         ^ true
     ].
     ^ false
+
+    "Modified: / 27-04-2012 / 13:08:06 / cg"
 !
 
 keyInCodeView:key rawKey:rawKey
@@ -55907,9 +55914,9 @@
             arguments:#().
         ^ true
     ].
-    (rawKey == #Delete) ifTrue:[
+    ((key == #Cut) or:[rawKey == #Delete]) ifTrue:[
         self
-            enqueueMessage:#selectorMenuRemove
+            enqueueMessage:#selectorMenuSaveRemove
             for:self
             arguments:#().
         ^ true
@@ -55944,6 +55951,8 @@
     "/        ^ true
     "/    ].
     ^ false
+
+    "Modified: / 27-04-2012 / 13:08:15 / cg"
 !
 
 keyInProjectListView:key rawKey:rawKey
@@ -55973,7 +55982,7 @@
 
     |variablesToRemove|
 
-    (rawKey == #Delete) ifTrue:[
+    ((key == #Cut) or:[rawKey == #Delete]) ifTrue:[
         variablesToRemove := self selectedVariables value.
         variablesToRemove size > 0 ifTrue:[
             self
@@ -55991,6 +56000,8 @@
         ^ true
     ].
     ^ false
+
+    "Modified: / 27-04-2012 / 13:08:35 / cg"
 !
 
 processEvent:anEvent
@@ -56236,11 +56247,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1740 2012-04-26 12:19:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1741 2012-04-28 16:13:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1740 2012-04-26 12:19:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1741 2012-04-28 16:13:27 cg Exp $'
 !
 
 version_SVN