Allow show annotations on fields and methods.

Change-Id: I2556eae6cd8e84345040ad7a0c0bc7b33dda1536

2 files changed, 16 insertions, 4 deletions

diff --git a/src/com/google/doclava/ClassInfo.java b/src/com/google/doclava/ClassInfo.java
index 24b6b32..6e5aab2 100644
--- a/src/com/google/doclava/ClassInfo.java
+++ b/src/com/google/doclava/ClassInfo.java
@@ -1196,11 +1196,11 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
         return true;
       }
       if (cl.annotations() != null) {
-          for (AnnotationInstanceInfo info : cl.annotations()) {
-              if (Doclava.showAnnotations.contains(info.type().qualifiedName())) {
-                  return false;
-              }
+        for (AnnotationInstanceInfo info : cl.annotations()) {
+          if (Doclava.showAnnotations.contains(info.type().qualifiedName())) {
+            return false;
           }
+        }
       }
       if (cl.comment().isHidden()) {
         return true;
diff --git a/src/com/google/doclava/MemberInfo.java b/src/com/google/doclava/MemberInfo.java
index 5600749..e5cc7a2 100644
--- a/src/com/google/doclava/MemberInfo.java
+++ b/src/com/google/doclava/MemberInfo.java
@@ -42,6 +42,18 @@ public abstract class MemberInfo extends DocInfo implements Comparable, Scoped {
 
   public abstract boolean isExecutable();
 
+  @Override
+  public boolean isHidden() {
+    if (mAnnotations != null) {
+      for (AnnotationInstanceInfo info : mAnnotations) {
+        if (Doclava.showAnnotations.contains(info.type().qualifiedName())) {
+          return false;
+        }
+      }
+    }
+    return super.isHidden();
+  }
+
   public String anchor() {
     if (mSignature != null) {
       return mName + mSignature;