src/Tools/jEdit/src/scala_console.scala
changeset 48409 0d2114eb412a
parent 47992 7700f0e9618c
child 48412 dbd75cbb84ba
     1.1 --- a/src/Tools/jEdit/src/scala_console.scala	Fri Jul 20 21:05:47 2012 +0200
     1.2 +++ b/src/Tools/jEdit/src/scala_console.scala	Fri Jul 20 22:29:25 2012 +0200
     1.3 @@ -15,7 +15,7 @@
     1.4  import org.gjt.sp.jedit.MiscUtilities
     1.5  
     1.6  import java.lang.System
     1.7 -import java.io.{File, OutputStream, Writer, PrintWriter}
     1.8 +import java.io.{File => JFile, OutputStream, Writer, PrintWriter}
     1.9  
    1.10  import scala.tools.nsc.{GenericRunnerSettings, NewLinePrintWriter, ConsoleWriter}
    1.11  import scala.tools.nsc.interpreter.IMain
    1.12 @@ -30,11 +30,11 @@
    1.13    {
    1.14      def find_jars(start: String): List[String] =
    1.15        if (start != null)
    1.16 -        Standard_System.find_files(new File(start),
    1.17 +        Standard_System.find_files(new JFile(start),
    1.18            entry => entry.isFile && entry.getName.endsWith(".jar")).map(_.getAbsolutePath)
    1.19        else Nil
    1.20      val path = find_jars(jEdit.getSettingsDirectory) ::: find_jars(jEdit.getJEditHome)
    1.21 -    path.mkString(File.pathSeparator)
    1.22 +    path.mkString(JFile.pathSeparator)
    1.23    }
    1.24  
    1.25