diff options
author | michelou <michelou@epfl.ch> | 2007-05-01 19:59:14 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-05-01 19:59:14 +0000 |
commit | f48b4737957877464bfc486b09d58a855c929fe5 (patch) | |
tree | d537d87cc230221095f3e695e676adad703b9b9c | |
parent | b5adf7938c6fe1e6b1d84c0a45e8eed9b02cd825 (diff) | |
download | scala-f48b4737957877464bfc486b09d58a855c929fe5.tar.gz scala-f48b4737957877464bfc486b09d58a855c929fe5.tar.bz2 scala-f48b4737957877464bfc486b09d58a855c929fe5.zip |
inherited Java methods
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/ModelToXML.scala | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala index 63c8990c56..3561d314cd 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala @@ -28,12 +28,20 @@ trait ModelToXML extends ModelExtractor { // nothing to do but be verbose. if (url == null) { val name = entity.owner.fullNameString('.') + '.' + entity.nameString - if (entity.hasFlag(symtab.Flags.JAVA)) - <a class={name.replace('.', '/')} href="" target="contentFrame">{name}</a> - else + if (entity.hasFlag(symtab.Flags.JAVA)) { + def sig(sym: Symbol): String = + sym.nameString + "(" + (sym.tpe match { + case MethodType(pt, _) => pt.mkString(", ") + case _ => "" + }) + ")" + val ownerName = entity.owner.fullNameString('/') + val (name0, anchor) = + if (entity.isMethod) (ownerName, "#" + sig(entity)) + else (ownerName + "/" + entity.nameString, "") + <a class={name0} href={anchor} target="contentFrame">{name}</a> + } else Text(name) - } - else + } else aref(url, entity.nameString) } @@ -141,7 +149,7 @@ trait ModelToXML extends ModelExtractor { cmnt.decodeAttributes.foreach{ case (tag,xs) => seq = seq ++ <dt style="margin:10px 0 0 20px;"> - {decodeTag(tag)}</dt> ++ {xs.flatMap{ + <b>{decodeTag(tag)}</b></dt> ++ {xs.flatMap{ case (option,body) => <dd>{ if (option == null) NodeSeq.Empty; else decodeOption(tag, option); |