diff --git a/util/classpath/ClassLoaders.scala b/util/classpath/ClassLoaders.scala index b308fcd1a..1ee1bfc72 100644 --- a/util/classpath/ClassLoaders.scala +++ b/util/classpath/ClassLoaders.scala @@ -8,7 +8,7 @@ import java.net.{URI, URL, URLClassLoader} /** This is a starting point for defining a custom ClassLoader. Override 'doLoadClass' to define * loading a class that has not yet been loaded.*/ -abstract class LoaderBase(urls: Seq[URL], parent: ClassLoader) extends URLClassLoader(urls.toArray, parent) with NotNull +abstract class LoaderBase(urls: Seq[URL], parent: ClassLoader) extends URLClassLoader(urls.toArray, parent) { require(parent != null) // included because a null parent is legitimate in Java @throws(classOf[ClassNotFoundException]) diff --git a/util/datatype/DatatypeParser.scala b/util/datatype/DatatypeParser.scala index 4350f450f..f47a6a8d9 100644 --- a/util/datatype/DatatypeParser.scala +++ b/util/datatype/DatatypeParser.scala @@ -1,10 +1,11 @@ /* sbt -- Simple Build Tool * Copyright 2009 Mark Harrah */ -package xsbt.api +package xsbt +package api import java.io.File -import xsbt.FileUtilities +import sbt.IO.read import Function.tupled import java.util.regex.Pattern @@ -30,7 +31,7 @@ class DatatypeParser extends NotNull } open ++ closed } - def parseLines(file: File): Seq[Line] = getLines(FileUtilities.read(file)).toList.zipWithIndex.map(tupled(parseLine)) + def parseLines(file: File): Seq[Line] = getLines(read(file)).toList.zipWithIndex.map(tupled(parseLine)) def getLines(content: String): Seq[String] = content split "(?m)$(?s:.)(?!$)*(^|\\Z)" def parseLine(line: String, lineNumber: Int): Line = matchPattern(WhitespacePattern -> processWhitespaceLine _, EnumPattern -> processEnumLine _, diff --git a/util/datatype/Generator.scala b/util/datatype/Generator.scala index 442800776..a6eeec5e7 100644 --- a/util/datatype/Generator.scala +++ b/util/datatype/Generator.scala @@ -5,7 +5,7 @@ package xsbt package api import java.io.File -import xsbt.FileUtilities +import sbt.IO.write import Generator._ @@ -25,10 +25,10 @@ abstract class GeneratorBase(val basePkgName: String, val baseDirectory: File) e def writeSource(name: String, pkgName: String, content: String) { - import Paths._ - val file =baseDirectory / packagePath(pkgName) / (name+ ".java") + import sbt.Paths._ + val file = baseDirectory / packagePath(pkgName) / (name+ ".java") file.getParentFile.mkdirs() - FileUtilities.write(file, "package " + pkgName + ";\n\n" + content) + write(file, "package " + pkgName + ";\n\n" + content) } private def packagePath(pkgName: String) = pkgName.replace('.', File.separatorChar) } diff --git a/util/log/BufferedLogger.scala b/util/log/BufferedLogger.scala index 1a72e022d..689d21b14 100644 --- a/util/log/BufferedLogger.scala +++ b/util/log/BufferedLogger.scala @@ -54,7 +54,7 @@ class BufferedLogger(delegate: AbstractLogger) extends AbstractLogger delegate.setLevel(newLevel) } def getLevel = delegate.getLevel - def traceEnabled = delegate.traceEnabled + def getTrace = delegate.getTrace def setTrace(level: Int) { buffer += new SetTrace(level) diff --git a/util/log/LoggerWriter.scala b/util/log/LoggerWriter.scala index b3b2d54d3..885646973 100644 --- a/util/log/LoggerWriter.scala +++ b/util/log/LoggerWriter.scala @@ -22,7 +22,7 @@ class LoggerWriter(delegate: AbstractLogger, level: Level.Value, nl: String) ext } override def write(content: Array[Char], offset: Int, length: Int): Unit = synchronized { - buffer.append(content, offset, length) + buffer.appendAll(content, offset, length) process() }