diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2006-03-15 11:35:20 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2006-03-15 11:35:20 +0000 |
| commit | 88abe6a1e9debcc0773188b0599eb5dbe4b69be8 (patch) | |
| tree | 9f19688083320eb59d7771db664c9366a7745f77 | |
| parent | 886e009e112bf79310af5176c0e06d5959ca7d9b (diff) | |
| download | scala-88abe6a1e9debcc0773188b0599eb5dbe4b69be8.tar.gz scala-88abe6a1e9debcc0773188b0599eb5dbe4b69be8.tar.bz2 scala-88abe6a1e9debcc0773188b0599eb5dbe4b69be8.zip | |
Removed broken navigation links.
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 10 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocUtil.scala | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 01b25b9c49..c467f222d4 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -268,7 +268,11 @@ abstract class DocGenerator extends Models { tree.tpe.symbol != definitions.AnyClass && tree.tpe.symbol != definitions.AllClass) { if (before) nodes.concat(forTree(tree)); - else forTree(tree).concat(nodes); + else { + val ret = forTree(tree).concat(nodes); + //System.err.println("RET: " + ret); + ret; + } } else NodeSeq.Empty; } @@ -365,13 +369,13 @@ abstract class DocGenerator extends Models { final def path = urlFor0(clazz.tree.symbol,clazz.tree.symbol); // <td class="navigation-enabled">{aref("help.html" , "_self", "Help" )}</td> + // <td class="navigation-enabled">{aref("root-page.html", "_self", "Overview")}</td> + // <td class="navigation-enabled">{aref("index.html" , null, "Index" )}</td> def navigation : NodeSeq = <table class="navigation"> <tr> <td valign="top" class="navigation-links"> <table><tr> - <td class="navigation-enabled">{aref("root-page.html", "_self", "Overview")}</td> - <td class="navigation-enabled">{aref("index.html" , "_self", "Index" )}</td> </tr></table> </td> <td align="right" valign="top" style="white-space:nowrap;" rowspan="2"> diff --git a/src/compiler/scala/tools/nsc/doc/DocUtil.scala b/src/compiler/scala/tools/nsc/doc/DocUtil.scala index a085d81300..f98bd5e6ad 100644 --- a/src/compiler/scala/tools/nsc/doc/DocUtil.scala +++ b/src/compiler/scala/tools/nsc/doc/DocUtil.scala @@ -31,11 +31,13 @@ object DocUtil { def aref(href0: String, target: String, text: String): NodeSeq = { val href = Utility.escape(href0) - if (target.indexOf('<') != -1) throw new Error(target) + if (target != null && target.indexOf('<') != -1) throw new Error(target) val t0 = Text(text) - - <a href={(relative + href)} target={(target)}>{t0}</a> + if (target != null) + <a href={(relative + href)} target={(target)}>{t0}</a>; + else + <a href={(relative + href)}>{t0}</a>; } val header = |