luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use java.util.Linked* instead of scala's

This commit is contained in:
Mark Harrah 2011-01-22 16:21:22 -05:00
parent 2d394c7551
commit 72261548ef
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/pending/ClasspathProject.scala
View File

@ -11,7 +11,6 @@ package sbt
import Path._
import Types._
import scala.xml.{Node => XNode,NodeSeq}
import scala.collection.mutable.{LinkedHashMap, LinkedHashSet}
trait ClasspathProject
{
@ -244,7 +243,7 @@ object ClasspathProject
parseSimpleConfigurations(mapping getOrElse default).getOrElse(c, errMsg)
def internalDependencies(project: Project): Classpath =
TaskMap { (conf: Configuration) =>
val visited = new LinkedHashSet[(Project,String)]
val visited = asSet(new java.util.LinkedHashSet[(Project,String)])
def visit(p: Project, c: String)
{
val applicableConfigs = allConfigs(p, c)
@ -260,7 +259,7 @@ object ClasspathProject
}
visit(project, conf.name)
val productsTasks = new LinkedHashSet[Task[Seq[Attributed[File]]]]
val productsTasks = asSet(new java.util.LinkedHashSet[Task[Seq[Attributed[File]]]])
for( (dep: ClasspathProject, c) <- visited )
if( (dep ne project) || conf.name != c )
productsTasks += products(dep, c)

6
util/classpath/ClasspathUtilities.scala
View File

@ -8,8 +8,8 @@ import java.lang.ref.{Reference, SoftReference, WeakReference}
import java.io.File
import java.net.{URI, URL, URLClassLoader}
import java.util.Collections
import scala.collection.Set
import scala.collection.mutable.{HashSet, LinkedHashSet, ListBuffer}
import scala.collection.{mutable, JavaConversions, Set}
import mutable.{HashSet, ListBuffer}
import IO.{createTemporaryDirectory, write}
object ClasspathUtilities
@ -124,7 +124,7 @@ object ClasspathUtilities
}
private def linkedSet[T](s: Iterable[T]): Set[T] =
{
val set = new LinkedHashSet[T]
val set: mutable.Set[T] = JavaConversions.asScalaSet(new java.util.LinkedHashSet[T])
set ++= s
set
}