summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-04-30 14:01:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 14:01:39 -0700
commitab4b1bfd89849b59f2c485d5fc620bdc0a3a8ade (patch)
tree66c0a365f71ffd5561b2426a9f7d73d7a259199b
parentb343c5e32cbf4d48afad50c9adb2e66a6b0fd74b (diff)
parent68a238ae4243e6f0f2a370b8b915ef0686ca0b37 (diff)
downloadandroid_external_doclava-ab4b1bfd89849b59f2c485d5fc620bdc0a3a8ade.tar.gz
android_external_doclava-ab4b1bfd89849b59f2c485d5fc620bdc0a3a8ade.tar.bz2
android_external_doclava-ab4b1bfd89849b59f2c485d5fc620bdc0a3a8ade.zip
am 68a238ae: add deprecated true/false to lists.js to help sort search suggestions
* commit '68a238ae4243e6f0f2a370b8b915ef0686ca0b37': add deprecated true/false to lists.js to help sort search suggestions
-rw-r--r--res/assets/templates/lists.cs2
-rw-r--r--src/com/google/doclava/DocInfo.java4
-rw-r--r--src/com/google/doclava/Doclava.java2
3 files changed, 7 insertions, 1 deletions
diff --git a/res/assets/templates/lists.cs b/res/assets/templates/lists.cs
index 0af32b2..dcbf8e5 100644
--- a/res/assets/templates/lists.cs
+++ b/res/assets/templates/lists.cs
@@ -1,5 +1,5 @@
var DATA = [
<?cs each:page = docs.pages
-?> { id:<?cs var: page.id ?>, label:"<?cs var:page.label ?>", link:"<?cs var:page.link ?>", type:"<?cs var:page.type ?>" }<?cs if:!last(page) ?>,<?cs /if ?>
+?> { id:<?cs var: page.id ?>, label:"<?cs var:page.label ?>", link:"<?cs var:page.link ?>", type:"<?cs var:page.type ?>", deprecated:"<?cs var:page.deprecated ?>" }<?cs if:!last(page) ?>,<?cs /if ?>
<?cs /each ?>
];
diff --git a/src/com/google/doclava/DocInfo.java b/src/com/google/doclava/DocInfo.java
index 935bbda..714beb8 100644
--- a/src/com/google/doclava/DocInfo.java
+++ b/src/com/google/doclava/DocInfo.java
@@ -93,6 +93,10 @@ public abstract class DocInfo {
return mDeprecatedSince;
}
+ public boolean isDeprecated() {
+ return mDeprecatedSince != null ? true : false;
+ }
+
public final void addFederatedReference(FederatedSite source) {
mFederatedReferences.add(source);
}
diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 30ef4da..d916161 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -833,10 +833,12 @@ public class Doclava {
PackageInfo pkg = (PackageInfo) o;
data.setValue("docs.pages." + i + ".link", pkg.htmlPage());
data.setValue("docs.pages." + i + ".type", "package");
+ data.setValue("docs.pages." + i + ".deprecated", pkg.isDeprecated() ? "true" : "false");
} else if (o instanceof ClassInfo) {
ClassInfo cl = (ClassInfo) o;
data.setValue("docs.pages." + i + ".link", cl.htmlPage());
data.setValue("docs.pages." + i + ".type", "class");
+ data.setValue("docs.pages." + i + ".deprecated", cl.isDeprecated() ? "true" : "false");
}
i++;
}