Improve diagnostics

Author: mernst

framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java

@@ -452,9 +452,13 @@ private void parseAnnotationFiles(List<String> annotationFiles, AnnotationFileTy
   public @Nullable AnnotationMirrorSet getDeclAnnotations(Element elt) {
     if (stubDebug) {
       if (isParsing()) {
-        System.out.printf("AFET.getDeclAnnotations(%s [%s])%n", elt, elt.getClass());
+        System.out.printf(
+            "AFET.getDeclAnnotations(%s [%s]): isParsing() => true, returning emptySet.%n",
+            elt, elt.getClass());
       } else {
-        System.out.printf("AFET.getDeclAnnotations(%s [%s]) IS NOT PARSING%n", elt, elt.getClass());
+        System.out.printf(
+            "AFET.getDeclAnnotations(%s [%s]): isParsing() => false, proceeding.%n",
+            elt, elt.getClass());
       }
     }
 

framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileParser.java

@@ -770,7 +770,8 @@ private void parseStubUnit(InputStream inputStream) {
 
   /**
    * Process {@link #stubUnit}, which is the AST produced by {@link #parseStubUnit}. Processing
-   * means copying annotations from Stub Parser data structures to {@code #annotationFileAnnos}.
+   * means copying annotations from Stub Parser data structures to argument {@code
+   * annotationFileAnnos}.
    *
    * @param annotationFileAnnos annotations from the file; side-effected by this method
    */
@@ -781,7 +782,7 @@ private void process(AnnotationFileAnnotations annotationFileAnnos) {
   }
 
   /**
-   * Process the given StubUnit: copy its annotations to {@code #annotationFileAnnos}.
+   * Process the given StubUnit: copy its annotations to {@code this.annotationFileAnnos}.
    *
    * @param su the StubUnit to process
    */