From feb1ba8ab3fed03d498ab768e07e0a27805a5f58 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 14 May 2011 20:47:22 +0000 Subject: Confusingly, I am restoring the method "getArch... Confusingly, I am restoring the method "getArchive" which has been gone from trunk since February 2010 but is suddenly necessary for the sbt build (as its "compiler-interface" won't compile without it.) I am sure it all makes perfect sense. No review. --- project/build.properties | 2 +- src/compiler/scala/tools/nsc/io/ZipArchive.scala | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 39dc158e14..4775404a76 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,7 +2,7 @@ #Sun Apr 11 14:24:47 CEST 2010 project.name=scala def.scala.version=2.7.7 -sbt.version=0.7.5.RC0 +sbt.version=0.7.7 copyright=Copyright 2002-2011, LAMP/EPFL build.scala.versions=2.7.7 project.initialize=false diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index 2de0ac8285..67a03b6094 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -66,6 +66,8 @@ trait ZipArchive extends AbstractFile { sealed abstract class Entry(path: String) extends VirtualFile(baseName(path), path) { def zipEntry: ZipEntry def parent: DirEntry + // have to keep this apparently for compat with sbt's compiler-interface + def getArchive: ZipFile = null override def container: DirEntry = parent override def underlyingSource = Some(self) @@ -89,6 +91,7 @@ trait ZipArchive extends AbstractFile { } class FileEntry(path: String, archive: ZipFile, val zipEntry: ZipEntry) extends Entry(path) { def parent = getDir(path) + override def getArchive: ZipFile = archive override def input = archive getInputStream zipEntry override def lastModified = zipEntry.getTime() override def sizeOption = Some(zipEntry.getSize().toInt) -- cgit v1.2.3