diff options
| author | Paul Phillips <paulp@improving.org> | 2009-12-15 00:07:59 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-12-15 00:07:59 +0000 |
| commit | 8a89b68903d77b44471fa216561488efbf16bed7 (patch) | |
| tree | 6abe59b6550f3e8a0cc0153bcf3097bab0b3ac36 /src/partest | |
| parent | cb1c0cf0a90287bef339f881f19eb0f32c2e4a3d (diff) | |
| download | scala-8a89b68903d77b44471fa216561488efbf16bed7.tar.gz scala-8a89b68903d77b44471fa216561488efbf16bed7.tar.bz2 scala-8a89b68903d77b44471fa216561488efbf16bed7.zip | |
Another round of deprecation warning elimination.
Diffstat (limited to 'src/partest')
3 files changed, 10 insertions, 10 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index a85d04d9bd..b67653d900 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -145,7 +145,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler { class ReflectiveCompiler(val fileManager: ConsoleFileManager) extends SimpleCompiler { import fileManager.{latestCompFile, latestPartestFile} - val sepUrls = Array(latestCompFile.toURL, latestPartestFile.toURL) + val sepUrls = Array(latestCompFile.toURI.toURL, latestPartestFile.toURI.toURL) //NestUI.verbose("constructing URLClassLoader from URLs "+latestCompFile+" and "+latestPartestFile) val sepLoader = new java.net.URLClassLoader(sepUrls, null) diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala index c0612531ed..bcedaa38be 100644 --- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala +++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala @@ -47,7 +47,7 @@ class ReflectiveRunner extends RunnerUtils { val files = Array(latestCompFile, latestLibFile, latestActFile, latestPartestFile, latestFjbgFile) - val sepUrls = files map { _.toURL } + val sepUrls = files map { _.toURI.toURL } val sepLoader = new URLClassLoader(sepUrls, null) if (fileManager.debug) diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 7828c24611..37a98860ad 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -122,10 +122,10 @@ class Worker(val fileManager: FileManager) extends Actor { latestPartestFile} val classpath: List[URL] = - outDir.toURL :: - //List(file.getParentFile.toURL) ::: - List(latestCompFile.toURL, latestLibFile.toURL, latestActFile.toURL, latestPartestFile.toURL) ::: - ((CLASSPATH split File.pathSeparatorChar).toList map (x => new File(x).toURL)) + outDir.toURI.toURL :: + //List(file.getParentFile.toURI.toURL) ::: + List(latestCompFile.toURI.toURL, latestLibFile.toURI.toURL, latestActFile.toURI.toURL, latestPartestFile.toURI.toURL) ::: + ((CLASSPATH split File.pathSeparatorChar).toList map (x => new File(x).toURI.toURL)) NestUI.verbose("ObjectRunner classpath: "+classpath) @@ -469,11 +469,11 @@ class Worker(val fileManager: FileManager) extends Actor { NestUI.verbose("compilation of "+file+" succeeded\n") val libs = new File(fileManager.LIB_DIR) - val scalacheckURL = new File(libs, "ScalaCheck.jar") toURL - val outURL = outDir.getCanonicalFile.toURL + val scalacheckURL = (new File(libs, "ScalaCheck.jar")).toURI.toURL + val outURL = outDir.getCanonicalFile.toURI.toURL val classpath: List[URL] = - List(outURL, scalacheckURL, latestCompFile.toURL, latestLibFile.toURL, - latestActFile.toURL, latestPartestFile.toURL).removeDuplicates + List(outURL, scalacheckURL, latestCompFile.toURI.toURL, latestLibFile.toURI.toURL, + latestActFile.toURI.toURL, latestPartestFile.toURI.toURL).removeDuplicates // XXX this is a big cut-and-paste mess, but the revamp is coming val logOut = new FileOutputStream(logFile) |