--- a/Tools__TestRunner2.st	Fri Feb 27 23:42:43 2015 +0100
+++ b/Tools__TestRunner2.st	Fri Feb 27 23:56:58 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
  Copyright (c) 2009-2010 eXept Software AG
@@ -1255,7 +1257,7 @@
 
     selectedTestCaseHasCoveredClasses :=
         self selectedTestCases 
-            conform:[:eachClass | eachClass asTestCase coveredClasses notEmpty].
+            contains:[:eachClass | eachClass asTestCase coveredClasses notEmpty].
 
     (builder componentAt:#RunCoverage) enabled:selectedTestCaseHasCoveredClasses.
     self selectedTestCaseHasCoveredClassesHolder value:selectedTestCaseHasCoveredClasses.
@@ -1305,14 +1307,17 @@
 !
 
 runCoverageAction
-    | allCoveredClasses browser result|
+    | coveredClasses allCoveredClasses browser result|
+
+    coveredClasses := Set new.
+    self selectedTestCases do:[:eachClass | 
+        eachClass coveredClasses do:[:cls | cls autoload].
+        coveredClasses addAll:eachClass coveredClasses.
+    ].
 
     allCoveredClasses := Set new.
-    self selectedTestCases do:[:eachClass | 
-        eachClass coveredClasses do:[:cls | cls autoload].
-        eachClass coveredClasses do:[:eachCoveredClass |
-            allCoveredClasses addAll:(eachCoveredClass withAllPrivateClasses).
-        ].
+    coveredClasses do:[:eachCoveredClass | 
+        allCoveredClasses addAll:(eachCoveredClass withAllPrivateClasses).
     ].
 
     (lastBrowser notNil 
@@ -1328,8 +1333,10 @@
     browser selectClasses:allCoveredClasses.
     browser window topView raise.
 
-    allCoveredClasses do:[:eachClass |
-        browser recompileClassWithInstrumentation:eachClass
+    self withWaitCursorDo:[
+        allCoveredClasses do:[:eachClass |
+            browser recompileClassWithInstrumentation:eachClass
+        ].
     ].
 
     browser infoLabelHolder value:nil.
@@ -1919,7 +1926,7 @@
 !TestRunner2::ClassList class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.60 2015-02-24 11:48:51 cg Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.61 2015-02-27 22:56:58 cg Exp $'
 ! !
 
 !TestRunner2::ClassList methodsFor:'private'!
@@ -2424,15 +2431,15 @@
 !TestRunner2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.60 2015-02-24 11:48:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.61 2015-02-27 22:56:58 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.60 2015-02-24 11:48:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.61 2015-02-27 22:56:58 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__TestRunner2.st,v 1.60 2015-02-24 11:48:51 cg Exp $'
+    ^ '$Id: Tools__TestRunner2.st,v 1.61 2015-02-27 22:56:58 cg Exp $'
 ! !