diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala | 14 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocUtil.scala | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala b/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala index 32ab8d64cd..c4443713cf 100644 --- a/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala +++ b/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala @@ -19,8 +19,8 @@ abstract class DefaultDocDriver extends DocDriver with ModelFrames with ModelToX import global._ import definitions.{AnyClass, AnyRefClass} - val additions = new jcl.LinkedHashSet[Symbol] - val additions0 = new ModelAdditions(global) { + lazy val additions = new jcl.LinkedHashSet[Symbol] + lazy val additions0 = new ModelAdditions(global) { override def addition(sym: global.Symbol) = { super.addition(sym) sym match { @@ -109,7 +109,7 @@ abstract class DefaultDocDriver extends DocDriver with ModelFrames with ModelToX for (pp <- d.sym.tpe.parents) subClasses(pp.typeSymbol) += d } copyResources - val packages0 = sort(allClasses.keySet) + lazy val packages0 = sort(allClasses.keySet) new AllPackagesFrame with Frame { def packages = packages0 } new PackagesContentFrame with Frame { def packages = packages0 } new NavigationFrame with Frame { } @@ -178,12 +178,12 @@ abstract class DefaultDocDriver extends DocDriver with ModelFrames with ModelToX override def classBody(entity: ClassOrObject)(implicit from: Frame): NodeSeq = (subClasses.get(entity.sym) match { case Some(symbols) => - <dl> + (<dl> <dt style="margin:10px 0 0 20px;"><b>Direct Known Subclasses:</b></dt> <dd>{symbols.mkXML("",", ","")(cls => { aref(urlFor(cls.sym), cls.path.map(_.name).mkString("",".","")); })}</dd> - </dl><hr/>; + </dl><hr/>); case None => NodeSeq.Empty })++super.classBody(entity); @@ -208,7 +208,7 @@ abstract class DefaultDocDriver extends DocDriver with ModelFrames with ModelToX val href = path + sym.fullNameString('/') + (if (sym.isModule || sym.isModuleClass) NAME_SUFFIX_OBJECT else "") + "#" + s - <a href={href}>{option}</a> ++ {Text(" - ")}; + (<a href={href}>{option}</a>) ++ {Text(" - ")}; case _ => super.decodeOption(tag,option) } @@ -258,7 +258,7 @@ abstract class DefaultDocDriver extends DocDriver with ModelFrames with ModelToX frame.aref(href, "_self", label) protected def anchor(entity: Symbol)(implicit frame: Frame): NodeSeq = - <a name={Text(frame.docName(entity))}></a> + (<a name={Text(frame.docName(entity))}></a>) object symbols extends jcl.LinkedHashSet[Symbol] diff --git a/src/compiler/scala/tools/nsc/doc/DocUtil.scala b/src/compiler/scala/tools/nsc/doc/DocUtil.scala index 93c83d8dfe..24622250f0 100644 --- a/src/compiler/scala/tools/nsc/doc/DocUtil.scala +++ b/src/compiler/scala/tools/nsc/doc/DocUtil.scala @@ -34,8 +34,8 @@ object DocUtil { // def label = "#PCDATA" //} - def br(nodes: NodeSeq): NodeSeq = nodes ++ <br/> - def hr(nodes: NodeSeq): NodeSeq = nodes ++ <hr/> + def br(nodes: NodeSeq): NodeSeq = nodes ++ (<br/>) + def hr(nodes: NodeSeq): NodeSeq = nodes ++ (<hr/>) trait UrlContext { def relative: String @@ -51,35 +51,35 @@ object DocUtil { val t0 = Text(text) if (target ne null) - <a href={href} target={target}>{t0}</a>; + (<a href={href} target={target}>{t0}</a>); else - <a href={href}>{t0}</a>; + (<a href={href}>{t0}</a>); } val encoding = Properties.encodingString val generator = System.getProperty("doc.generator", "scaladoc (" + Properties.versionString + ")") val header = - <meta http-equiv="content-type" content={"text/html; charset=" + encoding}/> + (<meta http-equiv="content-type" content={"text/html; charset=" + encoding}/> <meta name="generator" content={generator}/> <link rel="stylesheet" type="text/css" href={ relative + "style.css"}/> - <script type="text/javascript" src={relative + "script.js"}></script>; + <script type="text/javascript" src={relative + "script.js"}></script>); def body0(hasBody: Boolean, nodes: NodeSeq): NodeSeq = - if (!hasBody) nodes else <body onload="init()">{nodes}</body>; + if (!hasBody) nodes else (<body onload="init()">{nodes}</body>); val dtype = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">" def page(title: String, body: NodeSeq, hasBody: Boolean): NodeSeq = - <html> - <head><title>{Text(title)}</title> + (<html> + <head><title>{Text(if (title eq null) "null title" else title)}</title> {header} </head> {body0(hasBody, body)} - </html> + </html>) } // UrlContext def div0(title: String): NodeSeq = - <div class="doctitle-larger">{Text(title)}</div>; + (<div class="doctitle-larger">{Text(title)}</div>); def merge[T](ts0: TreeSet[T], ts1: TreeSet[T]): TreeSet[T] = { var ts = ts0 |