am 09ce528e: am 18904806: fix doclava to tag enums with \'since\' info

* commit '09ce528ec5786254f6f1af6359c344d673ca80ad':
  fix doclava to tag enums with 'since' info

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);
       }