diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-02 21:13:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-02 21:13:40 +0000 |
| commit | b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b (patch) | |
| tree | ba759e00f28f9031f94026fd750a4d447fdcc1be | |
| parent | 85499da13c38512f16bf30f0279a3e247cdc8354 (diff) | |
| parent | 8272936413649b1debf14ec0d78b133a65809e50 (diff) | |
| download | platform_external_doclava-b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b.tar.gz platform_external_doclava-b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b.tar.bz2 platform_external_doclava-b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b.zip | |
Merge "Fully-qualify link labels outside current class." into pi-dev
| -rw-r--r-- | src/com/google/doclava/LinkReference.java | 9 |
1 files changed, 8 insertions, 1 deletions
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"); |