From 1e11ef13cd36cc966076deb17265cd40a0fbfeef Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 27 Sep 2010 18:52:13 -0400 Subject: [PATCH] minor rework of main class selection --- run/SelectMainClass.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/run/SelectMainClass.scala b/run/SelectMainClass.scala index 43e62e1ff..b97373408 100644 --- a/run/SelectMainClass.scala +++ b/run/SelectMainClass.scala @@ -6,15 +6,14 @@ package sbt object SelectMainClass { // Some(SimpleReader.readLine _) - def apply(promptIfMultipleChoices: Option[String => Option[String]], mainClasses: List[String]) = + def apply(promptIfMultipleChoices: Option[String => Option[String]], mainClasses: Seq[String]): Option[String] = { - mainClasses match + mainClasses.toList match { case Nil => None case head :: Nil => Some(head) case multiple => - for(prompt <- promptIfMultipleChoices) yield - { + promptIfMultipleChoices flatMap { prompt => println("\nMultiple main classes detected, select one to run:\n") for( (className, index) <- multiple.zipWithIndex ) println(" [" + (index+1) + "] " + className)