From f48b4737957877464bfc486b09d58a855c929fe5 Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 1 May 2007 19:59:14 +0000 Subject: inherited Java methods --- src/compiler/scala/tools/nsc/doc/ModelToXML.scala | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src') 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)) - {name} - 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, "") + {name} + } 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 ++
- {decodeTag(tag)}
++ {xs.flatMap{ + {decodeTag(tag)} ++ {xs.flatMap{ case (option,body) =>
{ if (option == null) NodeSeq.Empty; else decodeOption(tag, option); -- cgit v1.2.3