diff options
| author | Scott Main <smain@google.com> | 2014-03-22 02:03:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-22 02:03:49 +0000 |
| commit | 3d7e7785cd472f97082acff52f45516f696a46fa (patch) | |
| tree | fac899b210a1ffb079644c2bb546f8aeb68a82b2 | |
| parent | 16f26d8a40641f99b1f5e6b997c172d0e8c1d294 (diff) | |
| parent | d097b65e19d8cf79af396cb9a2d0c7cefc372577 (diff) | |
| download | android_external_doclava-3d7e7785cd472f97082acff52f45516f696a46fa.tar.gz android_external_doclava-3d7e7785cd472f97082acff52f45516f696a46fa.tar.bz2 android_external_doclava-3d7e7785cd472f97082acff52f45516f696a46fa.zip | |
am d097b65e: am 4ee085a7: fix error in doclava that was causing \'toroot\' variable to show up at the beginning of federated URLs bug: 13512870
* commit 'd097b65e19d8cf79af396cb9a2d0c7cefc372577':
fix error in doclava that was causing 'toroot' variable to show up at the beginning of federated URLs bug: 13512870
| -rw-r--r-- | res/assets/templates/macros.cs | 10 | ||||
| -rw-r--r-- | src/com/google/doclava/SeeTagInfo.java | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs index 867abcd..678710a 100644 --- a/res/assets/templates/macros.cs +++ b/res/assets/templates/macros.cs @@ -70,10 +70,16 @@ def:tag_list(tags) ?><?cs each:tag = tags ?><?cs if:tag.name == "Text" ?><?cs var:tag.text?><?cs elif:tag.kind == "@more" ?><p><?cs - elif:tag.kind == "@see" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?cs + elif: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 - elif:tag.kind == "@value" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.text ?></a></code><?cs + elif:tag.kind == "@value" ?><code><a href="<?cs + if:!tag.federatedSite ?><?cs + var:toroot ?><?cs + /if ?><?cs var:tag.href ?>"><?cs var:tag.text ?></a></code><?cs elif:tag.kind == "@code" ?><code><?cs var:tag.text ?></code><?cs elif:tag.kind == "@samplecode" ?><pre><?cs var:tag.text ?></pre><?cs elif:tag.name == "@sample" ?><pre><?cs var:tag.text ?></pre><?cs diff --git a/src/com/google/doclava/SeeTagInfo.java b/src/com/google/doclava/SeeTagInfo.java index 312e603..34e6aed 100644 --- a/src/com/google/doclava/SeeTagInfo.java +++ b/src/com/google/doclava/SeeTagInfo.java @@ -54,6 +54,7 @@ public class SeeTagInfo extends TagInfo { data.setValue(base + ".label", linkRef.label); if (linkRef.href != null) { data.setValue(base + ".href", linkRef.href); + data.setValue(base + ".federatedSite", linkRef.federatedSite); } if (ClearPage.toroot != null) { |