diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-03 07:25:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-03 07:25:21 +0000 |
| commit | 840af0a802521931002c2ea351b970c9c836940c (patch) | |
| tree | ba759e00f28f9031f94026fd750a4d447fdcc1be | |
| parent | 0033a7cfb82b4d66d2801c9d708ff3db09113f34 (diff) | |
| parent | b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b (diff) | |
| download | doclava-840af0a802521931002c2ea351b970c9c836940c.tar.gz | |
Snap for 4759746 from b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b to pi-release
Change-Id: Ifeb4e772d1d012fc26eeb7a094da4072679da0bf
| -rw-r--r-- | res/assets/templates/macros.cs | 15 | ||||
| -rw-r--r-- | src/com/google/doclava/LinkReference.java | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs index e845db2..6590b51 100644 --- a/res/assets/templates/macros.cs +++ b/res/assets/templates/macros.cs @@ -8,7 +8,10 @@ if:dac ?><?cs <?cs # A link to a package ?><?cs def:package_link(pkg) ?> - <a href="<?cs var:toroot ?><?cs var:pkg.link ?>"><?cs var:pkg.name ?></a><?cs + <a href="<?cs + if:!pkg.federatedSite ?><?cs + var:toroot ?><?cs + /if ?><?cs var:pkg.link ?>"><?cs var:pkg.name ?></a><?cs /def ?><?cs # A link to a type, or not if it is a primitive type @@ -245,7 +248,10 @@ def:see_also_tags(also) ?><?cs <p><b>See also:</b></p> <ul class="nolist"><?cs each:tag=also ?><li><?cs - if:tag.kind == "@see" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs + if:tag.kind == "@see" ?><code><a href="<?cs + if:!tag.federatedSite ?><?cs + var:toroot ?><?cs + /if ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?cs elif:tag.kind == "@seeHref" ?><a href="<?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs elif:tag.kind == "@seeJustLabel" ?><?cs var:tag.label ?><?cs @@ -310,7 +316,10 @@ def:description(obj) ?><?cs <p><b>Related XML Attributes:</b></p> <ul class="nolist"><?cs each:attr=obj.attrRefs ?> - <li><a href="<?cs var:toroot ?><?cs var:attr.href ?>"><?cs var:attr.name ?></a></li><?cs + <li><a href="<?cs + if:!attr.federatedSite ?><?cs + var:toroot ?><?cs + /if ?><?cs var:attr.href ?>"><?cs var:attr.name ?></a></li><?cs /each ?> </ul><?cs /if ?><?cs diff --git a/src/com/google/doclava/LinkReference.java b/src/com/google/doclava/LinkReference.java index 0fb7fcb..0bfa42f 100644 --- a/src/com/google/doclava/LinkReference.java +++ b/src/com/google/doclava/LinkReference.java @@ -400,7 +400,14 @@ public class LinkReference { } } if (result.label.length() == 0) { - result.label = result.referencedMemberName; + // Qualify labels that link beyond the base context + final boolean beyondBase = base != null && containing != null + && !base.qualifiedName().equals(containing.qualifiedName()); + if (beyondBase) { + result.label = containing.name() + "." + result.referencedMemberName; + } else { + result.label = result.referencedMemberName; + } } setHref(result, containing, result.memberInfo.anchor()); if (DBG) System.out.println(" ---- member reference"); |