diff --git a/cache/CacheIO.scala b/cache/CacheIO.scala index 05768bab9..e5c643c6a 100644 --- a/cache/CacheIO.scala +++ b/cache/CacheIO.scala @@ -6,6 +6,15 @@ import scala.reflect.Manifest object CacheIO { + def toBytes[T](format: Format[T])(value: T)(implicit mf: Manifest[Format[T]]): Array[Byte] = + toBytes[T](value)(format, mf) + def toBytes[T](value: T)(implicit format: Format[T], mf: Manifest[Format[T]]): Array[Byte] = + Operations.toByteArray(value)(stampedFormat(format)) + def fromBytes[T](format: Format[T], default: => T)(bytes: Array[Byte])(implicit mf: Manifest[Format[T]]): T = + fromBytes(default)(bytes)(format, mf) + def fromBytes[T](default: => T)(bytes: Array[Byte])(implicit format: Format[T], mf: Manifest[Format[T]]): T = + if(bytes.isEmpty) default else Operations.fromByteArray(bytes)(stampedFormat(format)) + def fromFile[T](format: Format[T], default: => T)(file: File)(implicit mf: Manifest[Format[T]]): T = fromFile(file, default)(format, mf) def fromFile[T](file: File, default: => T)(implicit format: Format[T], mf: Manifest[Format[T]]): T = diff --git a/interface/src/main/java/xsbti/AnalysisCallbackContainer.java b/interface/src/main/java/xsbti/AnalysisCallbackContainer.java deleted file mode 100644 index 3d0641ed7..000000000 --- a/interface/src/main/java/xsbti/AnalysisCallbackContainer.java +++ /dev/null @@ -1,12 +0,0 @@ -/* sbt -- Simple Build Tool - * Copyright 2009 Mark Harrah - */ -package xsbti; - -/** Provides access to an AnalysisCallback. This is used by the plugin to -* get the callback to use. The scalac Global instance it is passed must -* implement this interface. */ -public interface AnalysisCallbackContainer -{ - public AnalysisCallback analysisCallback(); -} \ No newline at end of file