diff options
| author | Scott Main <smain@google.com> | 2012-11-30 19:10:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 19:10:37 -0800 |
| commit | 55286ea3386c988171ea08ac3a2f712c6516c931 (patch) | |
| tree | 0f56ae032743f388c3b5e2d289a509eb097a0392 | |
| parent | 15b80cd81cbd1f5ad9a4fe71929878be55be3035 (diff) | |
| parent | 4ec568b934dab55eca62a72e4b1ed48924f87460 (diff) | |
| download | android_external_doclava-55286ea3386c988171ea08ac3a2f712c6516c931.tar.gz android_external_doclava-55286ea3386c988171ea08ac3a2f712c6516c931.tar.bz2 android_external_doclava-55286ea3386c988171ea08ac3a2f712c6516c931.zip | |
am 4ec568b9: more fixing for tags: provide proper links for @value tags.
* commit '4ec568b934dab55eca62a72e4b1ed48924f87460':
more fixing for tags: provide proper links for @value tags.
| -rw-r--r-- | res/assets/templates/macros.cs | 2 | ||||
| -rw-r--r-- | src/com/google/doclava/Comment.java | 3 | ||||
| -rw-r--r-- | src/com/google/doclava/TagInfo.java | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs index ee0aa7f..a09b346 100644 --- a/res/assets/templates/macros.cs +++ b/res/assets/templates/macros.cs @@ -73,7 +73,7 @@ def:tag_list(tags) ?><?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 == "@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 class='value'><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?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 == "@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/Comment.java b/src/com/google/doclava/Comment.java index e50ff0a..70f4f30 100644 --- a/src/com/google/doclava/Comment.java +++ b/src/com/google/doclava/Comment.java @@ -204,9 +204,6 @@ public class Comment { // maybe i wanna make this more elegant String tagName = text.substring(start+1, endOfFirstPart); String tagText = text.substring(startOfSecondPart, end-1); - if (tagName.equals("@value")) { - tagText = tagText.replace('#', '.'); - } tag(tagName, tagText, true, pos); } diff --git a/src/com/google/doclava/TagInfo.java b/src/com/google/doclava/TagInfo.java index 09d4e35..ec1f811 100644 --- a/src/com/google/doclava/TagInfo.java +++ b/src/com/google/doclava/TagInfo.java @@ -53,6 +53,10 @@ public class TagInfo { public void makeHDF(Data data, String base) { data.setValue(base + ".name", name()); + + if (name().equals("@value")) { + mText = mText.replace('#', '.'); + } data.setValue(base + ".text", text()); data.setValue(base + ".kind", kind()); } |