diff options
author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2010-04-21 14:38:57 +0000 |
---|---|---|
committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2010-04-21 14:38:57 +0000 |
commit | cf26f620707be4bd9f8bc30a733eb4a987894421 (patch) | |
tree | 79b4fa593007af56bec55fc35f499e1468385f0b /src | |
parent | 326065c5eccba595cb44b3cc53089fbe769c7466 (diff) | |
download | scala-cf26f620707be4bd9f8bc30a733eb4a987894421.tar.gz scala-cf26f620707be4bd9f8bc30a733eb4a987894421.tar.bz2 scala-cf26f620707be4bd9f8bc30a733eb4a987894421.zip |
[scaladoc] Slight change to design of how Comme...
[scaladoc] Slight change to design of how CommentFactory and
ModelFactory are mixed together. Okayed by Pedro.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocFactory.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocFactory.scala b/src/compiler/scala/tools/nsc/doc/DocFactory.scala index ca72f6581b..7fd6538566 100644 --- a/src/compiler/scala/tools/nsc/doc/DocFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/DocFactory.scala @@ -52,7 +52,7 @@ class DocFactory(val reporter: Reporter, val settings: doc.Settings) { processor compiler.addSourceless assert(settings.docformat.value == "html") if (!reporter.hasErrors) { - val modelFactory = (new model.ModelFactory(compiler, settings)) + val modelFactory = (new model.ModelFactory(compiler, settings) with model.comment.CommentFactory) val docModel = modelFactory.makeModel println("model contains " + modelFactory.templatesCount + " documentable templates") (new html.HtmlFactory(docModel)) generate docModel diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala index d7e1e2fe1a..3b0cc4df67 100644 --- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala @@ -13,7 +13,7 @@ import symtab.Flags import model.{ RootPackage => RootPackageEntity } /** This trait extracts all required information for documentation from compilation units */ -class ModelFactory(val global: Global, val settings: doc.Settings) extends CommentFactory { thisFactory => +class ModelFactory(val global: Global, val settings: doc.Settings) { thisFactory: ModelFactory with CommentFactory => import global._ import definitions.{ ObjectClass, ScalaObjectClass, RootPackage, EmptyPackage, NothingClass, AnyClass, AnyRefClass } |