--- a/AbstractLauncherApplication.st	Fri Sep 01 14:16:41 2017 +0200
+++ b/AbstractLauncherApplication.st	Fri Sep 01 14:25:08 2017 +0200
@@ -1457,31 +1457,34 @@
     "/ (i.e. allInstances may return too many)
     filter := [:m | m mclass notNil].
 
-    UserPreferences systemBrowserClass
+    SystemBrowser default
         browseMethods:(Set new
                         addAll:(WrappedMethod allWrappedMethods select:filter);
                         addAll:(MethodWithBreakpoints allBreakpointedMethods select:filter);
                         yourself)
         title:'All breakPointed/traced methods'
+
+    "Modified: / 01-09-2017 / 14:17:20 / cg"
 !
 
 browseContainingString
     "open a browser after asking for a string"
 
-    |browserClass|
-
-    browserClass := UserPreferences systemBrowserClass.
     self withWaitCursorDo:[
-        browserClass new browseMenuMethodsWithString
-    ].
+        SystemBrowser default new browseMenuMethodsWithString
+    ].
+
+    "
+     self basicNew browseContainingString
+    "
+
+    "Modified (comment): / 01-09-2017 / 14:18:28 / cg"
 !
 
 browseImplementors
     "open an implementors- browser after asking for a selector"
 
-    |browserClass selector dialog|
-
-    browserClass := UserPreferences systemBrowserClass.
+    |selector dialog|
 
     Tools::SearchDialog notNil ifTrue:[
         "/ use a better dialog
@@ -1499,7 +1502,7 @@
 
             (classes := dialog classesToSearch) notEmptyOrNil ifTrue:[
                 (selector := dialog selectorToSearch) notEmptyOrNil ifTrue:[
-                    browserClass 
+                    SystemBrowser default
                         browseImplementorsOf:selector 
                         in:classes
                         ignoreCase:(dialog searchIgnoringCase)
@@ -1519,19 +1522,17 @@
 
     selector notEmptyOrNil ifTrue:[
         self withWaitCursorDo:[
-            browserClass browseImplementorsMatching:selector
+            SystemBrowser default browseImplementorsMatching:selector
         ]
     ].
 
-    "Modified: / 14-02-2012 / 14:17:51 / cg"
+    "Modified: / 01-09-2017 / 14:18:52 / cg"
 !
 
 browseReferencesToClass
     "open a browser after asking for a class"
 
-    |browserClass class|
-
-    browserClass := UserPreferences systemBrowserClass.
+    |class|
 
     class := Dialog
                     requestClassName:(resources string:'Browse References to Class named (Tab for Completion):')
@@ -1539,11 +1540,11 @@
                     initialAnswer:''.
     class notNil ifTrue:[
         self withWaitCursorDo:[
-            browserClass browseReferendsOf:class
+            SystemBrowser default browseReferendsOf:class
         ]
     ].
 
-    "Modified: / 14-02-2012 / 14:20:56 / cg"
+    "Modified: / 01-09-2017 / 14:19:03 / cg"
 !
 
 browseResources
@@ -1599,21 +1600,21 @@
             t := t , ' and value ' , value.
         ].
         self withWaitCursorDo:[
-            UserPreferences systemBrowserClass
+            SystemBrowser default
                 browseForResource:rsrc
                 containing:value
                 in:(Smalltalk allClasses)
                 title:t
         ]
     ].
+
+    "Modified: / 01-09-2017 / 14:19:11 / cg"
 !
 
 browseSenders
     "open a senders- browser after asking for a selector"
 
-    |browserClass dialog selector|
-
-    browserClass := UserPreferences systemBrowserClass.
+    |dialog selector|
 
     Tools::SearchDialog notNil ifTrue:[
         "/ use a better dialog
@@ -1631,7 +1632,7 @@
 
             (classes := dialog classesToSearch) notEmptyOrNil ifTrue:[
                 (selector := dialog selectorToSearch) notEmptyOrNil ifTrue:[
-                    browserClass 
+                    SystemBrowser default
                         browseAllCallsOn:selector 
                         in:classes
                         ignoreCase:(dialog searchIgnoringCase)
@@ -1649,32 +1650,36 @@
                     initialAnswer:''.
     selector notEmptyOrNil ifTrue:[
         self withWaitCursorDo:[
-            browserClass browseAllCallsOn:selector
+            SystemBrowser default browseAllCallsOn:selector
         ]
     ].
 
-    "Modified: / 17-02-2017 / 08:25:32 / cg"
+    "Modified: / 01-09-2017 / 14:19:27 / cg"
 !
 
 browseUnboundGlobals
     "open a browser on methods refering to unbound global variables"
 
     self withWaitCursorDo:[
-        UserPreferences systemBrowserClass
+        SystemBrowser default
             browseReferendsOfUnboundGlobalsWithTitle:(resources string:'References to unbound global variables')
             warnIfNone:true
     ]
+
+    "Modified: / 01-09-2017 / 14:19:31 / cg"
 !
 
 browseUndeclared
     "open a browser on methods refering to undeclared variables"
 
     self withWaitCursorDo:[
-        UserPreferences systemBrowserClass
+        SystemBrowser default
             browseReferendsOf:(Smalltalk undeclaredPrefix , '*')
             title:(resources string:'References to undeclared variables')
             warnIfNone:true
     ]
+
+    "Modified: / 01-09-2017 / 14:19:34 / cg"
 !
 
 clearUndeclaredVariables
@@ -1708,7 +1713,9 @@
 startClassBrowser
     "open a classBrowser; asks for class"
 
-    UserPreferences systemBrowserClass askThenBrowseClass
+    SystemBrowser default askThenBrowseClass
+
+    "Modified: / 01-09-2017 / 14:19:37 / cg"
 !
 
 startClassBrowserOnChangedClasses
@@ -1732,13 +1739,17 @@
 startClassHierarchyBrowser
     "open a classHierarchyBrowser; asks for class"
 
-    UserPreferences systemBrowserClass askThenBrowseClassHierarchy
+    SystemBrowser default askThenBrowseClassHierarchy
+
+    "Modified: / 01-09-2017 / 14:19:40 / cg"
 !
 
 startFullClassBrowser
     "open a fullClass systemBrowser; asks for class"
 
-    UserPreferences systemBrowserClass askThenBrowseFullClassProtocol
+    SystemBrowser default askThenBrowseFullClassProtocol
+
+    "Modified: / 01-09-2017 / 14:19:42 / cg"
 !
 
 startMonticelloRepositoryBrowser
@@ -5918,7 +5929,7 @@
                         menu actionAt:#inspect put:[ method inspect ].
                         menu actionAt:#browse put:[ |who|
                                                     who := method who.
-                                                    UserPreferences systemBrowserClass
+                                                    SystemBrowser default
                                                         openInClass:(who methodClass)
                                                         selector:(who methodSelector)
                                                   ].
@@ -6205,6 +6216,7 @@
 
     "Modified: / 17-09-1995 / 16:47:50 / claus"
     "Created: / 19-09-2006 / 19:14:06 / cg"
+    "Modified: / 01-09-2017 / 14:19:47 / cg"
 ! !
 
 !AbstractLauncherApplication::LauncherDialogs class methodsFor:'dialogs-private'!