From b65a7078f106d8bf361275a863d58c40516686df Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <eugene.vigdorchik@gmail.com>
Date: Tue, 17 Jul 2012 21:09:42 +0400
Subject: [PATCH] Fix compilation error for 2.10.0-M5 for all but main project.

---
 util/collection/Dag.scala   | 6 +++---
 util/collection/IDSet.scala | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/collection/Dag.scala b/util/collection/Dag.scala
index 14a418f26..4250b0f10 100644
--- a/util/collection/Dag.scala
+++ b/util/collection/Dag.scala
@@ -11,15 +11,15 @@ trait Dag[Node <: Dag[Node]]{
 }
 object Dag
 {
-	import scala.collection.{mutable, JavaConversions};
-	import JavaConversions.{asIterable, asSet}
+	import scala.collection.{mutable, JavaConverters}
+	import JavaConverters.asScalaSetConverter
 
 	def topologicalSort[T](root: T)(dependencies: T => Iterable[T]): List[T] = topologicalSort(root :: Nil)(dependencies)
 	
 	def topologicalSort[T](nodes: Iterable[T])(dependencies: T => Iterable[T]): List[T] =
 	{
 		val discovered = new mutable.HashSet[T]
-		val finished = asSet(new java.util.LinkedHashSet[T])
+		val finished = (new java.util.LinkedHashSet[T]).asScala
 
 		def visitAll(nodes: Iterable[T]) = nodes foreach visit
 		def visit(node : T){
diff --git a/util/collection/IDSet.scala b/util/collection/IDSet.scala
index 29ecf469d..683c7a76b 100644
--- a/util/collection/IDSet.scala
+++ b/util/collection/IDSet.scala
@@ -37,9 +37,9 @@ 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.asIterable(backing.keySet)
+		def all = collection.JavaConversions.asScalaIterable(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
 	}
-}
\ No newline at end of file
+}