diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2011-02-04 19:50:48 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2011-02-04 19:50:48 +0000 |
| commit | c6bfc6ed940229157f3f7aac1246e2661447176f (patch) | |
| tree | 63be67f3018cb6e3b4b8d9d8306b922540a2d552 /src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | |
| parent | 78914b6f23e4b4acb03ed0a6686e384b3a1d14ad (diff) | |
| download | scala-c6bfc6ed940229157f3f7aac1246e2661447176f.tar.gz scala-c6bfc6ed940229157f3f7aac1246e2661447176f.tar.bz2 scala-c6bfc6ed940229157f3f7aac1246e2661447176f.zip | |
[scaladoc] More fixes for broken build. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala index 7b8115b4c1..7583201e75 100644 --- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala @@ -27,16 +27,14 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { thisFactory /** */ def makeModel: Option[Universe] = { - makeRootPackage map { rootPack => - val universe = new Universe { thisUniverse => - thisFactory.universe = thisUniverse - val settings = thisFactory.settings - val rootPackage = rootPack - } - modelFinished = true - thisFactory.universe = null - universe + val universe = new Universe { thisUniverse => + thisFactory.universe = thisUniverse + val settings = thisFactory.settings + private val rootPackageMaybe = makeRootPackage + val rootPackage = rootPackageMaybe getOrElse null } + modelFinished = true + if (universe.rootPackage != null) Some(universe) else None } /** */ |