diff options
| author | michelou <michelou@epfl.ch> | 2008-02-21 11:11:15 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2008-02-21 11:11:15 +0000 |
| commit | 573e90041ead9d241dc1bbd725003cdf9c169f87 (patch) | |
| tree | cc048c9f0b8b6f9b1c33851c2bfd115a62c98ddc | |
| parent | 9495c8bcd12654eb5f4a065350d341948cd84795 (diff) | |
| download | scala-573e90041ead9d241dc1bbd725003cdf9c169f87.tar.gz scala-573e90041ead9d241dc1bbd725003cdf9c169f87.tar.bz2 scala-573e90041ead9d241dc1bbd725003cdf9c169f87.zip | |
fixed broken build (scaladoc)
4 files changed, 10 insertions, 15 deletions
diff --git a/src/compiler/scala/tools/ant/Scaladoc.scala b/src/compiler/scala/tools/ant/Scaladoc.scala index 997b9140df..b197dd0bc8 100644 --- a/src/compiler/scala/tools/ant/Scaladoc.scala +++ b/src/compiler/scala/tools/ant/Scaladoc.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala Ant Tasks ** -** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2005-2008, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -18,7 +18,7 @@ import org.apache.tools.ant.types.{Path, Reference} import org.apache.tools.ant.util.{FileUtils, GlobPatternMapper} import scala.tools.nsc.{Global, Settings} -import scala.tools.nsc.doc.DocDriver +import scala.tools.nsc.doc.DefaultDocDriver import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} /** <p> @@ -572,7 +572,7 @@ class Scaladoc extends MatchingTask { try { val run = new compiler.Run run.compile(sourceFiles.map (_.toString)) - object generator extends DocDriver { + object generator extends DefaultDocDriver { val global: compiler.type = compiler def settings = commandSettings } diff --git a/src/compiler/scala/tools/nsc/doc/DocDriver.scala b/src/compiler/scala/tools/nsc/doc/DocDriver.scala index ceb252dff6..417b54fb7f 100644 --- a/src/compiler/scala/tools/nsc/doc/DocDriver.scala +++ b/src/compiler/scala/tools/nsc/doc/DocDriver.scala @@ -6,19 +6,14 @@ package scala.tools.nsc.doc -import java.util.zip.ZipFile - -import scala.collection.jcl -import symtab.Flags._ -import scala.xml._ - /** - * @author Geoffrey Washburn * This is an abstract class for documentation plugins. + * + * @author Geoffrey Washburn */ abstract class DocDriver { val global: Global import global._ - def process(settings: Settings, units: Iterator[CompilationUnit]) : Unit + def process(settings: Settings, units: Iterator[CompilationUnit]): Unit } diff --git a/src/library/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala index 83187c15f8..214166e823 100644 --- a/src/library/scala/collection/mutable/HashTable.scala +++ b/src/library/scala/collection/mutable/HashTable.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2003-2008, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://www.scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ diff --git a/src/library/scala/collection/mutable/Scriptable.scala b/src/library/scala/collection/mutable/Scriptable.scala index 313450ce6d..a624cc9260 100644 --- a/src/library/scala/collection/mutable/Scriptable.scala +++ b/src/library/scala/collection/mutable/Scriptable.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2003-2008, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://www.scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ |