--- a/Tools__NewSystemBrowser.st	Sun Aug 15 09:17:32 2010 +0200
+++ b/Tools__NewSystemBrowser.st	Sun Aug 15 14:59:27 2010 +0200
@@ -21356,7 +21356,7 @@
 
     |currentClass box newNameString
      oldSym oldBaseSym cls newOwnerOrNameSpacePath nsOrOwner s nextWord t hardRename
-     answer referingMethods refactoring browser askForNewContainer|
+     answer referingMethods refactoring browser askForNewContainer question|
 
     currentClass := self theSingleSelectedClass.
     currentClass isNil ifTrue:[^ nil].
@@ -21483,12 +21483,19 @@
                           default:#rename
                           onCancel:false.
         ] ifFalse:[
+            referingMethods size == 1 ifTrue:[
+                question := 'There is 1 reference to "%2"\from %4.\\Rename only or Rename and Rewrite to "%3" ?'
+            ] ifFalse:[
+                question := 'There are %1 references to "%2".\\Rename only or Rename and Rewrite to "%3" ?'
+            ].
+
             answer := OptionBox
                           request:(resources 
-                                        stringWithCRs:'There are %1 references to "%2".\\Rename only or Rename and Rewrite to "%3" ?'
+                                        stringWithCRs:question
                                         with:referingMethods size
                                         with:oldSym allBold
-                                        with:newNameString allBold)
+                                        with:newNameString allBold
+                                        with:(referingMethods first whoString))
                           label:(resources string:'Renaming class "%1" to "%2"' with:oldSym with:newNameString)
                           buttonLabels:(resources array:#('Cancel' 'Browse' 'Rename && Browse' 'Rename' 'Rename && Rewrite'  ))
                           values:#(false #browse #renameAndBrowse #rename #renameAndRewrite )
@@ -21515,10 +21522,12 @@
             referingMethods := SystemBrowser 
                             allMethodsIn:(Smalltalk allClasses) 
                             where:(SystemBrowser searchBlockForReferendsOf:newNameString).
-            browser := self 
+            UserInformation ignoreIn:[
+                browser := self 
                             spawnMethodBrowserFor:referingMethods 
                             in:#newBuffer 
                             label:(resources string:'Rewritten Methods now referring to %1' with:newNameString).
+            ].
         ].
         browser notNil ifTrue:[
             browser autoSearchVariable:oldBaseSym.
@@ -21533,7 +21542,7 @@
         ]
     ].
 
-    "Modified: / 08-08-2010 / 13:57:05 / cg"
+    "Modified: / 15-08-2010 / 11:54:23 / cg"
 !
 
 classMenuSaveDocumentationAs
@@ -44573,11 +44582,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1476 2010-08-14 10:06:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1477 2010-08-15 12:59:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1476 2010-08-14 10:06:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1477 2010-08-15 12:59:27 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!