commit 3acc9d1825a2ed73954d10e0a11f2a0de9dd76e5
author Tim Murray <timmurray@google.com> Thu May 22 19:21:55 2014 +0000
committer Tim Murray <timmurray@google.com> Thu May 22 19:21:55 2014 +0000
tree ced5610c97c2334e1208712c3cda0503c0c08e24
parent e1b2ef4ed6d4ff2aa1506ce8ca2f6a35266c3039

Revert "Warn when showAnnotation is on unhidden element."

This reverts commit e1b2ef4ed6d4ff2aa1506ce8ca2f6a35266c3039.

Change-Id: I64539af1032f919f588fcb5dad853950a2ce1c2e

src/com/google/doclava/ClassInfo.java

diff --git a/src/com/google/doclava/ClassInfo.java b/src/com/google/doclava/ClassInfo.java
index 8e7fd61..3cda7ec 100644
--- a/src/com/google/doclava/ClassInfo.java
+++ b/src/com/google/doclava/ClassInfo.java
@@ -1362,16 +1362,10 @@
   public boolean isHiddenImpl() {
     ClassInfo cl = this;
     while (cl != null) {
-      PackageInfo pkg = cl.containingPackage();
       if (cl.hasShowAnnotation()) {
-        if ((pkg != null && pkg.hasHideComment()) || cl.hasHideComment()) {
-            return false;
-        } else {
-            Errors.error(Errors.SHOW_ANNOTATION_NOT_HIDDEN, position(), "Class "
-                + cl.qualifiedName() + " shown by annotation but not hidden.");
-            return false;
-        }
+        return false;
       }
+      PackageInfo pkg = cl.containingPackage();
       if (pkg != null && pkg.hasHideComment()) {
         return true;
       }
@@ -1419,24 +1413,6 @@
     return isHidden() || isRemoved();
   }
 
-  /**
-   * Used by ClassInfo to determine packages default visability before annoations.
-   */
-  public boolean hasHideComment() {
-    if (mHiddenByComment == -1) {
-      ClassInfo cl = this;
-      while (cl != null) {
-        if (cl.comment().isHidden()) {
-          mHiddenByComment = 1;
-          return true;
-        }
-        cl = cl.containingClass();
-      }
-      mHiddenByComment = 0;
-    }
-    return mHiddenByComment != 0;
-  }
-
   public boolean hasShowAnnotation() {
     if (annotations() != null) {
       for (AnnotationInstanceInfo info : annotations()) {
@@ -1726,9 +1702,6 @@
   private Boolean mHidden = null;
   private Boolean mRemoved = null;
   private Boolean mCheckLevel = null;
-  private int mHidden = -1;
-  private int mHiddenByComment = -1;
-  private int mCheckLevel = -1;
   private String mReasonIncluded;
   private ArrayList<MethodInfo> mNonWrittenConstructors;
   private boolean mIsDeprecated;

src/com/google/doclava/Errors.java

diff --git a/src/com/google/doclava/Errors.java b/src/com/google/doclava/Errors.java
index d8516bb..c0ba831 100644
--- a/src/com/google/doclava/Errors.java
+++ b/src/com/google/doclava/Errors.java
@@ -47,7 +47,7 @@
       String whereText = this.pos == null ? "unknown: " : this.pos.toString() + ':';
       return whereText + this.msg;
     }
-
+    
     public Error error() {
       return error;
     }
@@ -72,7 +72,7 @@
       hadError = true;
     }
   }
-
+  
   public static void clearErrors() {
     hadError = false;
     allErrors.clear();
@@ -81,7 +81,7 @@
   public static void printErrors() {
     printErrors(allErrors);
   }
-
+  
   public static void printErrors(Set<ErrorMessage> errors) {
     for (ErrorMessage m : errors) {
       if (m.error.level == WARNING) {
@@ -94,7 +94,7 @@
       }
     }
   }
-
+  
   public static Set<ErrorMessage> getErrors() {
     return allErrors;
   }
@@ -115,7 +115,7 @@
       this.code = code;
       this.level = level;
     }
-
+    
     public String toString() {
       return "Error #" + this.code;
     }
@@ -171,7 +171,6 @@
   public static final Error BROKEN_SINCE_FILE = new Error(118, ERROR);
   public static final Error INVALID_CONTENT_TYPE = new Error(119, ERROR);
   public static final Error INVALID_SAMPLE_INDEX = new Error(120, ERROR);
-  public static final Error SHOW_ANNOTATION_NOT_HIDDEN = new Error(121, WARNING);
 
   public static final Error[] ERRORS =
       {UNRESOLVED_LINK, BAD_INCLUDE_TAG, UNKNOWN_TAG, UNKNOWN_PARAM_TAG_NAME,

src/com/google/doclava/MemberInfo.java

diff --git a/src/com/google/doclava/MemberInfo.java b/src/com/google/doclava/MemberInfo.java
index df31ed4..800edba 100644
--- a/src/com/google/doclava/MemberInfo.java
+++ b/src/com/google/doclava/MemberInfo.java
@@ -42,25 +42,11 @@
 
   public abstract boolean isExecutable();
 
-  private boolean hasHiddenComment() {
-    PackageInfo pkg = containingClass().containingPackage();
-    boolean pkgHidden = pkg != null ? pkg.hasHideComment() : false;
-    boolean classHidden = containingClass().hasHideComment();
-    boolean memberHidden = comment().isHidden();
-
-    return pkgHidden || classHidden || memberHidden;
-  }
-
   @Override
   public boolean isHidden() {
     if (mAnnotations != null) {
       for (AnnotationInstanceInfo info : mAnnotations) {
         if (Doclava.showAnnotations.contains(info.type().qualifiedName())) {
-          if (!hasHiddenComment()) {
-            Errors.error(Errors.SHOW_ANNOTATION_NOT_HIDDEN, position(), "Member "
-                + mContainingClass.qualifiedName() + "." + name()
-                + " shown by annotation but not @hidden.");
-          }
           return false;
         }
       }