diff --git a/util/collection/IDSet.scala b/util/collection/IDSet.scala index 683c7a76b..447082d8b 100644 --- a/util/collection/IDSet.scala +++ b/util/collection/IDSet.scala @@ -37,7 +37,7 @@ object IDSet def += (t: T) = backing.put(t, Dummy) def ++=(t: Iterable[T]) = t foreach += def -= (t:T) = if(backing.remove(t) eq null) false else true - def all = collection.JavaConversions.asScalaIterable(backing.keySet) + def all = collection.JavaConversions.collectionAsScalaIterable(backing.keySet) def isEmpty = backing.isEmpty def process[S](t: T)(ifSeen: S)(ifNew: => S) = if(contains(t)) ifSeen else { this += t ; ifNew } override def toString = backing.toString diff --git a/util/collection/Util.scala b/util/collection/Util.scala index c36bb6443..5aede5f0d 100644 --- a/util/collection/Util.scala +++ b/util/collection/Util.scala @@ -5,6 +5,8 @@ package sbt object Util { + def makeList[T](size: Int, value: T): List[T] = List.fill(size)(value) + def separateE[A,B](ps: Seq[Either[A,B]]): (Seq[A], Seq[B]) = separate(ps)(Types.idFun) diff --git a/util/complete/JLineCompletion.scala b/util/complete/JLineCompletion.scala index 8eabd0ea5..d41f47b85 100644 --- a/util/complete/JLineCompletion.scala +++ b/util/complete/JLineCompletion.scala @@ -131,7 +131,7 @@ object JLineCompletion if(line.charAt(line.length - 1) != '\n') reader.printNewline() } - reader.printColumns(JavaConversions.asJavaList(columns.map(_.trim))) + reader.printColumns(JavaConversions.seqAsJavaList(columns.map(_.trim))) } def hasNewline(s: String): Boolean = s.indexOf('\n') >= 0 def shouldPrint(cs: Seq[String], reader: ConsoleReader): Boolean = diff --git a/util/complete/Parser.scala b/util/complete/Parser.scala index a10d1bdcb..a994e0658 100644 --- a/util/complete/Parser.scala +++ b/util/complete/Parser.scala @@ -5,7 +5,7 @@ package sbt.complete import Parser._ import sbt.Types.{const, left, right, some} - import sbt.Util.separate + import sbt.Util.{makeList,separate} sealed trait Parser[+T] { @@ -676,7 +676,7 @@ private final class Repeat[T](partial: Option[Parser[T]], repeated: Parser[T], m else // forced determinism for(value <- repeated.resultEmpty) yield - List.make(min, value) + makeList(min, value) } override def toString = "repeat(" + min + "," + max +"," + partial + "," + repeated + ")" } \ No newline at end of file