summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-08-13 18:35:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-13 18:35:49 -0700
commit09ce528ec5786254f6f1af6359c344d673ca80ad (patch)
tree6acad14669c3555f03aff231694c6e4b4886cd45
parent864c6b3a9873601593ad12a656de938ac37c7240 (diff)
parent189048062a7df2d2fba4ff075c6416bfbf05a094 (diff)
downloadplatform_external_doclava-09ce528ec5786254f6f1af6359c344d673ca80ad.tar.gz
platform_external_doclava-09ce528ec5786254f6f1af6359c344d673ca80ad.tar.bz2
platform_external_doclava-09ce528ec5786254f6f1af6359c344d673ca80ad.zip
am 18904806: fix doclava to tag enums with \'since\' info
* commit '189048062a7df2d2fba4ff075c6416bfbf05a094': fix doclava to tag enums with 'since' info
-rw-r--r--src/com/google/doclava/ClassInfo.java10
-rw-r--r--src/com/google/doclava/SinceTagger.java3
2 files changed, 12 insertions, 1 deletions
diff --git a/src/com/google/doclava/ClassInfo.java b/src/com/google/doclava/ClassInfo.java
index 6b55487..a7c3775 100644
--- a/src/com/google/doclava/ClassInfo.java
+++ b/src/com/google/doclava/ClassInfo.java
@@ -467,6 +467,12 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
}
}
+ for (FieldInfo enumConst : mEnumConstants) {
+ if (!enumConst.isHidden()) {
+ all.put(enumConst.name(), enumConst);
+ }
+ }
+
mFields = new ArrayList<FieldInfo>(all.values());
}
return mFields;
@@ -1572,6 +1578,10 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
return mApiCheckFields;
}
+ public Map<String, FieldInfo> allEnums() {
+ return mApiCheckEnumConstants;
+ }
+
/**
* Returns all methods defined directly in this class. For a list of all
* methods supported by this class, see {@link #methods()}.
diff --git a/src/com/google/doclava/SinceTagger.java b/src/com/google/doclava/SinceTagger.java
index 4cf8911..a2797c1 100644
--- a/src/com/google/doclava/SinceTagger.java
+++ b/src/com/google/doclava/SinceTagger.java
@@ -178,7 +178,8 @@ public class SinceTagger {
*/
private void versionFields(String versionName, ClassInfo spec, ClassInfo doc) {
for (FieldInfo field : doc.fields()) {
- if (field.getSince() == null && spec.allFields().containsKey(field.name())) {
+ if (field.getSince() == null && (spec.allFields().containsKey(field.name()) ||
+ spec.allEnums().containsKey(field.name()))) {
field.setSince(versionName);
}