--- a/StandaloneStartup.st	Tue May 24 17:25:16 2011 +0200
+++ b/StandaloneStartup.st	Tue May 24 17:40:50 2011 +0200
@@ -123,7 +123,7 @@
      includedMethodNames excludedMethodNames|
 
 "
- self handleCoverageMeasurementOptionsFromArguments:#('foo' '--coverage' '--foo' '+package:' 'expeccoNET:*')
+ self handleCoverageMeasurementOptionsFromArguments:#('foo' '--coverage' '+package:' 'expeccoNET:*' '-class:' 'ExpeccoNET::ML' 'ExpeccoNET::LicenseString'  )
  self handleCoverageMeasurementOptionsFromArguments:#('foo' '--coverage' '+package:' 'stx:*')
  self handleCoverageMeasurementOptionsFromArguments:#('foo' '--coverage' '+package:' 'stx:libtool*')
  self handleCoverageMeasurementOptionsFromArguments:#('foo' '--coverage' '+class:' 'Tools::*' '-class:' 'Tools::StringSearchTool' )
@@ -137,7 +137,6 @@
     includedMethodNames := Dictionary new.
     excludedMethodNames := Dictionary new.
 
-    (self allowCoverageMeasurementOption) ifFalse:[^ self].
     idx := argv indexOfAny:#('--coverage').
     idx == 0 ifTrue:[^ self ].
 
@@ -256,6 +255,7 @@
     ].
 
     "Created: / 24-05-2011 / 16:30:54 / cg"
+    "Modified: / 24-05-2011 / 17:39:55 / cg"
 ! !
 
 !StandaloneStartup class methodsFor:'defaults'!
@@ -665,31 +665,30 @@
     |scripting idx nextArg portNr allowedScriptingHosts|
 
     scripting := false.
-    (self allowScriptingOption) ifTrue:[
-        idx := argv indexOfAny:#('--scripting').
-        idx ~~ 0 ifTrue:[
-            nextArg := argv at:(idx + 1) ifAbsent:nil.
-            (nextArg notNil and:[ (nextArg startsWith:'-') not ]) ifTrue:[
-                portNr := nextArg asInteger.
-                argv removeAtIndex:idx+1.
-            ].
-            argv removeAtIndex:idx.
 
-            scripting := true
+    idx := argv indexOfAny:#('--scripting').
+    idx ~~ 0 ifTrue:[
+        nextArg := argv at:(idx + 1) ifAbsent:nil.
+        (nextArg notNil and:[ (nextArg startsWith:'-') not ]) ifTrue:[
+            portNr := nextArg asInteger.
+            argv removeAtIndex:idx+1.
         ].
+        argv removeAtIndex:idx.
 
-        allowedScriptingHosts := OrderedCollection new.
+        scripting := true
+    ].
+
+    allowedScriptingHosts := OrderedCollection new.
 
+    idx := argv indexOfAny:#('--allowHost').
+    [idx ~~ 0] whileTrue:[
+        nextArg := argv at:(idx + 1) ifAbsent:nil.
+        nextArg isNil ifTrue:[
+            self usage.
+            AbortOperationRequest raise.
+        ].
+        allowedScriptingHosts add:nextArg.
         idx := argv indexOfAny:#('--allowHost').
-        [idx ~~ 0] whileTrue:[
-            nextArg := argv at:(idx + 1) ifAbsent:nil.
-            nextArg isNil ifTrue:[
-                self usage.
-                AbortOperationRequest raise.
-            ].
-            allowedScriptingHosts add:nextArg.
-            idx := argv indexOfAny:#('--allowHost').
-        ].
     ].
 
     scripting ifTrue:[
@@ -706,6 +705,7 @@
     ].
 
     "Created: / 24-05-2011 / 16:12:02 / cg"
+    "Modified: / 24-05-2011 / 17:40:26 / cg"
 !
 
 loadPatch:fileName
@@ -1023,11 +1023,11 @@
 !StandaloneStartup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.61 2011-05-24 15:25:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.62 2011-05-24 15:40:50 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.61 2011-05-24 15:25:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.62 2011-05-24 15:40:50 cg Exp $'
 ! !
 
 StandaloneStartup initialize!