Merge "Rename doclava17 to doclet_adapter" am: 34b258f3bb am: dbc3e44752 am: 999617ae91 am: 7fd9e13c0e

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2507519

Change-Id: I54b66b438482fdaf4de9b95cd12c944a04d20e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

123 files changed, 4 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 91a57ca..3bc5dc6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,7 +74,7 @@ java_defaults {
 java_library_host {
     name: "doclava-doclet-adapter",
     srcs: [
-        "doclava17/src/main/java/**/*.java",
+        "doclet_adapter/src/main/java/**/*.java",
     ],
     libs: [
         "guava",
diff --git a/doclava17/build.gradle.kts b/doclet_adapter/build.gradle.kts
index 855d430..855d430 100644
--- a/doclava17/build.gradle.kts
+++ b/doclet_adapter/build.gradle.kts
diff --git a/doclava17/src/main/java/com/google/doclava/annotation/Unused.java b/doclet_adapter/src/main/java/com/google/doclava/annotation/Unused.java
index f2dbc75..f2dbc75 100644
--- a/doclava17/src/main/java/com/google/doclava/annotation/Unused.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/annotation/Unused.java
diff --git a/doclava17/src/main/java/com/google/doclava/annotation/Used.java b/doclet_adapter/src/main/java/com/google/doclava/annotation/Used.java
index ac4550c..ac4550c 100644
--- a/doclava17/src/main/java/com/google/doclava/annotation/Used.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/annotation/Used.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotatedTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotatedTypeImpl.java
index 17dc78a..17dc78a 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotatedTypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotatedTypeImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationDescImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationDescImpl.java
index dcb8695..dcb8695 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationDescImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationDescImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationMethodDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationMethodDocImpl.java
index 8e3813c..8e3813c 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationMethodDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationMethodDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java
index 58bfdfe..58bfdfe 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationTypeDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationValueImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationValueImpl.java
index e3ea5d0..e3ea5d0 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/AnnotationValueImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/AnnotationValueImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ArrayTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ArrayTypeImpl.java
index b7ba0a1..b7ba0a1 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ArrayTypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ArrayTypeImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java
index 8bd6d5e..8bd6d5e 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ClassDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ConstructorDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ConstructorDocImpl.java
index 324cb98..324cb98 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ConstructorDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ConstructorDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/Context.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/Context.java
index cfa3bb8..cfa3bb8 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/Context.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/Context.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/DocErrorReporterImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/DocErrorReporterImpl.java
index 6687365..6687365 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/DocErrorReporterImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/DocErrorReporterImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/DocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/DocImpl.java
index 0ad7c6f..0ad7c6f 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/DocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/DocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/DocletElementUtils.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/DocletElementUtils.java
index 927c572..927c572 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/DocletElementUtils.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/DocletElementUtils.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ErrorTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ErrorTypeImpl.java
index 4ab82a6..4ab82a6 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ErrorTypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ErrorTypeImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java
index 933889d..933889d 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ExecutableMemberDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/FieldDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/FieldDocImpl.java
index 3f61a61..3f61a61 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/FieldDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/FieldDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/MemberDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MemberDocImpl.java
index 670c649..670c649 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/MemberDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MemberDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java
index 50d2894..50d2894 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/PackageDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/PackageDocImpl.java
index 2c60994..2c60994 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/PackageDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/PackageDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ParamTagImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ParamTagImpl.java
index e329cc1..e329cc1 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ParamTagImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ParamTagImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ParameterImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ParameterImpl.java
index 4b32607..4b32607 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ParameterImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ParameterImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ParameterizedTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ParameterizedTypeImpl.java
index 5374947..5374947 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ParameterizedTypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ParameterizedTypeImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java
index 9bab2f7..9bab2f7 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java
index bdf49de..bdf49de 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/RootDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/RootDocImpl.java
index d6e412e..d6e412e 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/RootDocImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/RootDocImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/SeeTagImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/SeeTagImpl.java
index c98d04e..c98d04e 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/SeeTagImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/SeeTagImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/SerialFieldTagImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/SerialFieldTagImpl.java
index 1fbfa88..1fbfa88 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/SerialFieldTagImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/SerialFieldTagImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/SourcePositionImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/SourcePositionImpl.java
index 7813498..7813498 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/SourcePositionImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/SourcePositionImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/TagImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TagImpl.java
index 2aea77e..2aea77e 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/TagImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TagImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/ThrowsTagImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ThrowsTagImpl.java
index fb40697..fb40697 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/ThrowsTagImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ThrowsTagImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/TypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java
index 96b2c2e..96b2c2e 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/TypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/TypeVariableImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeVariableImpl.java
index ccc8aab..ccc8aab 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/TypeVariableImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeVariableImpl.java
diff --git a/doclava17/src/main/java/com/google/doclava/javadoc/WildcardTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/WildcardTypeImpl.java
index 077a70e..077a70e 100644
--- a/doclava17/src/main/java/com/google/doclava/javadoc/WildcardTypeImpl.java
+++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/WildcardTypeImpl.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/AnnotatedType.java b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotatedType.java
index a91eaac..a91eaac 100644
--- a/doclava17/src/main/java/com/sun/javadoc/AnnotatedType.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotatedType.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/AnnotationDesc.java b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationDesc.java
index db4cd8a..db4cd8a 100644
--- a/doclava17/src/main/java/com/sun/javadoc/AnnotationDesc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationDesc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/AnnotationTypeDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationTypeDoc.java
index e090eba..e090eba 100644
--- a/doclava17/src/main/java/com/sun/javadoc/AnnotationTypeDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationTypeDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/AnnotationTypeElementDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationTypeElementDoc.java
index 90536da..90536da 100644
--- a/doclava17/src/main/java/com/sun/javadoc/AnnotationTypeElementDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationTypeElementDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/AnnotationValue.java b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationValue.java
index 2caef62..2caef62 100644
--- a/doclava17/src/main/java/com/sun/javadoc/AnnotationValue.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/AnnotationValue.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ClassDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/ClassDoc.java
index 8318feb..8318feb 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ClassDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ClassDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ConstructorDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/ConstructorDoc.java
index f7f115b..f7f115b 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ConstructorDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ConstructorDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/Doc.java b/doclet_adapter/src/main/java/com/sun/javadoc/Doc.java
index 18f7660..18f7660 100644
--- a/doclava17/src/main/java/com/sun/javadoc/Doc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/Doc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/DocErrorReporter.java b/doclet_adapter/src/main/java/com/sun/javadoc/DocErrorReporter.java
index 1ce0404..1ce0404 100644
--- a/doclava17/src/main/java/com/sun/javadoc/DocErrorReporter.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/DocErrorReporter.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ExecutableMemberDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/ExecutableMemberDoc.java
index 61de275..61de275 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ExecutableMemberDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ExecutableMemberDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/FieldDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/FieldDoc.java
index 6d8dd9b..6d8dd9b 100644
--- a/doclava17/src/main/java/com/sun/javadoc/FieldDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/FieldDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/MemberDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/MemberDoc.java
index 3be364e..3be364e 100644
--- a/doclava17/src/main/java/com/sun/javadoc/MemberDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/MemberDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/MethodDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/MethodDoc.java
index eceaf40..eceaf40 100644
--- a/doclava17/src/main/java/com/sun/javadoc/MethodDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/MethodDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/PackageDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/PackageDoc.java
index 2a03ddd..2a03ddd 100644
--- a/doclava17/src/main/java/com/sun/javadoc/PackageDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/PackageDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ParamTag.java b/doclet_adapter/src/main/java/com/sun/javadoc/ParamTag.java
index 58c3ec7..58c3ec7 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ParamTag.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ParamTag.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/Parameter.java b/doclet_adapter/src/main/java/com/sun/javadoc/Parameter.java
index facfbab..facfbab 100644
--- a/doclava17/src/main/java/com/sun/javadoc/Parameter.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/Parameter.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ParameterizedType.java b/doclet_adapter/src/main/java/com/sun/javadoc/ParameterizedType.java
index 1435175..1435175 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ParameterizedType.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ParameterizedType.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ProgramElementDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/ProgramElementDoc.java
index f6f293b..f6f293b 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ProgramElementDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ProgramElementDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/RootDoc.java b/doclet_adapter/src/main/java/com/sun/javadoc/RootDoc.java
index fc09a95..fc09a95 100644
--- a/doclava17/src/main/java/com/sun/javadoc/RootDoc.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/RootDoc.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/SeeTag.java b/doclet_adapter/src/main/java/com/sun/javadoc/SeeTag.java
index e0c8269..e0c8269 100644
--- a/doclava17/src/main/java/com/sun/javadoc/SeeTag.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/SeeTag.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/SerialFieldTag.java b/doclet_adapter/src/main/java/com/sun/javadoc/SerialFieldTag.java
index 54ac120..54ac120 100644
--- a/doclava17/src/main/java/com/sun/javadoc/SerialFieldTag.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/SerialFieldTag.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/SourcePosition.java b/doclet_adapter/src/main/java/com/sun/javadoc/SourcePosition.java
index 27f1acd..27f1acd 100644
--- a/doclava17/src/main/java/com/sun/javadoc/SourcePosition.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/SourcePosition.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/Tag.java b/doclet_adapter/src/main/java/com/sun/javadoc/Tag.java
index 2a1d4d8..2a1d4d8 100644
--- a/doclava17/src/main/java/com/sun/javadoc/Tag.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/Tag.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/ThrowsTag.java b/doclet_adapter/src/main/java/com/sun/javadoc/ThrowsTag.java
index b24af85..b24af85 100644
--- a/doclava17/src/main/java/com/sun/javadoc/ThrowsTag.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/ThrowsTag.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/Type.java b/doclet_adapter/src/main/java/com/sun/javadoc/Type.java
index 207dfc4..207dfc4 100644
--- a/doclava17/src/main/java/com/sun/javadoc/Type.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/Type.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/TypeVariable.java b/doclet_adapter/src/main/java/com/sun/javadoc/TypeVariable.java
index 2d8db2e..2d8db2e 100644
--- a/doclava17/src/main/java/com/sun/javadoc/TypeVariable.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/TypeVariable.java
diff --git a/doclava17/src/main/java/com/sun/javadoc/WildcardType.java b/doclet_adapter/src/main/java/com/sun/javadoc/WildcardType.java
index 0178463..0178463 100644
--- a/doclava17/src/main/java/com/sun/javadoc/WildcardType.java
+++ b/doclet_adapter/src/main/java/com/sun/javadoc/WildcardType.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotatedTypeImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotatedTypeImplTest.java
index 9e03da8..9e03da8 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotatedTypeImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotatedTypeImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotationMethodDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotationMethodDocImplTest.java
index 5b66f5f..5b66f5f 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotationMethodDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotationMethodDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotationTypeDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotationTypeDocImplTest.java
index f1cdc86..f1cdc86 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotationTypeDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotationTypeDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotationValueImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotationValueImplTest.java
index 357f8eb..357f8eb 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/AnnotationValueImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/AnnotationValueImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ArrayTypeImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ArrayTypeImplTest.java
index 0bdcda6..0bdcda6 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ArrayTypeImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ArrayTypeImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/BaseTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/BaseTest.java
index 96ecfb9..96ecfb9 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/BaseTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/BaseTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ClassDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ClassDocImplTest.java
index ef17e5c..ef17e5c 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ClassDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ClassDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ConstructorDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ConstructorDocImplTest.java
index e4da9be..e4da9be 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ConstructorDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ConstructorDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/DocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/DocImplTest.java
index 27c9309..27c9309 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/DocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/DocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/EmptyDoclet.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/EmptyDoclet.java
index f0c42f8..f0c42f8 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/EmptyDoclet.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/EmptyDoclet.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ExecutableMemberDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ExecutableMemberDocImplTest.java
index 9e4aad3..9e4aad3 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ExecutableMemberDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ExecutableMemberDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/FieldDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/FieldDocImplTest.java
index 0438959..0438959 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/FieldDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/FieldDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/MethodDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/MethodDocImplTest.java
index b504e40..b504e40 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/MethodDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/MethodDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/PackageDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/PackageDocImplTest.java
index d056d14..d056d14 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/PackageDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/PackageDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ParamTagImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ParamTagImplTest.java
index f66a623..f66a623 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ParamTagImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ParamTagImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ParameterImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ParameterImplTest.java
index 8deeafd..8deeafd 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ParameterImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ParameterImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/PrimitiveTypeImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/PrimitiveTypeImplTest.java
index 3a35652..3a35652 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/PrimitiveTypeImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/PrimitiveTypeImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/ProgramElementDocImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ProgramElementDocImplTest.java
index 7063942..7063942 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/ProgramElementDocImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/ProgramElementDocImplTest.java
diff --git a/doclava17/src/test/java/com/google/doclava/javadoc/TagImplTest.java b/doclet_adapter/src/test/java/com/google/doclava/javadoc/TagImplTest.java
index eeae573..eeae573 100644
--- a/doclava17/src/test/java/com/google/doclava/javadoc/TagImplTest.java
+++ b/doclet_adapter/src/test/java/com/google/doclava/javadoc/TagImplTest.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/AbstractEmptyClass.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AbstractEmptyClass.java
index 9f8b811..9f8b811 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/AbstractEmptyClass.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AbstractEmptyClass.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/AbstractEmptyInterface.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AbstractEmptyInterface.java
index 1e4d34b..1e4d34b 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/AbstractEmptyInterface.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AbstractEmptyInterface.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/AllDefaultAnnotation.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AllDefaultAnnotation.java
index dfef62a..dfef62a 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/AllDefaultAnnotation.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AllDefaultAnnotation.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/AnnotatedClass.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AnnotatedClass.java
index 07c450e..07c450e 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/AnnotatedClass.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/AnnotatedClass.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/DefaultAnnotation.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/DefaultAnnotation.java
index 1487b37..1487b37 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/DefaultAnnotation.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/DefaultAnnotation.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/DefaultEnum.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/DefaultEnum.java
index 23d1262..23d1262 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/DefaultEnum.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/DefaultEnum.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/ExtendsExternalizable.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ExtendsExternalizable.java
index 6a81aca..6a81aca 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/ExtendsExternalizable.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ExtendsExternalizable.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/ExtendsSerializable.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ExtendsSerializable.java
index cd73212..cd73212 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/ExtendsSerializable.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ExtendsSerializable.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/FieldsAccessModifiers.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/FieldsAccessModifiers.java
index 11bdaef..11bdaef 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/FieldsAccessModifiers.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/FieldsAccessModifiers.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/ImplementsExternalizable.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ImplementsExternalizable.java
index 2bd5bcb..2bd5bcb 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/ImplementsExternalizable.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ImplementsExternalizable.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/ImplementsSerializable.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ImplementsSerializable.java
index 0b2a9cd..0b2a9cd 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/ImplementsSerializable.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ImplementsSerializable.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/InnerClasses.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/InnerClasses.java
index d6e97f5..d6e97f5 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/InnerClasses.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/InnerClasses.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/MethodsAccessModifiers.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/MethodsAccessModifiers.java
index e5b9641..e5b9641 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/MethodsAccessModifiers.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/MethodsAccessModifiers.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/PackagePrivateClass.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PackagePrivateClass.java
index 13cbbf9..13cbbf9 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/PackagePrivateClass.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PackagePrivateClass.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/ParametrizedAnnotation.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ParametrizedAnnotation.java
index 813ad01..813ad01 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/ParametrizedAnnotation.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/ParametrizedAnnotation.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/PublicAnnotation.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicAnnotation.java
index bc585bd..bc585bd 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/PublicAnnotation.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicAnnotation.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/PublicClass.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicClass.java
index cba3303..cba3303 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/PublicClass.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicClass.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/PublicClassWithNests.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicClassWithNests.java
index 40a16c8..40a16c8 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/PublicClassWithNests.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicClassWithNests.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/PublicEnum.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicEnum.java
index 11d2f2b..11d2f2b 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/PublicEnum.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicEnum.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/PublicInterface.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicInterface.java
index 7f04ebe..7f04ebe 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/PublicInterface.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/PublicInterface.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/SimpleEnum.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/SimpleEnum.java
index 34df999..34df999 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/SimpleEnum.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/SimpleEnum.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/Tags.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/Tags.java
index 1b509b8..1b509b8 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/Tags.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/Tags.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/classes/UniversalAnnotation.java b/doclet_adapter/src/test/resources/sample-project/com/example/classes/UniversalAnnotation.java
index 70dc908..70dc908 100644
--- a/doclava17/src/test/resources/sample-project/com/example/classes/UniversalAnnotation.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/classes/UniversalAnnotation.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/constructors/Constructors.java b/doclet_adapter/src/test/resources/sample-project/com/example/constructors/Constructors.java
index a17e354..a17e354 100644
--- a/doclava17/src/test/resources/sample-project/com/example/constructors/Constructors.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/constructors/Constructors.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/fields/Arrays.java b/doclet_adapter/src/test/resources/sample-project/com/example/fields/Arrays.java
index aba4bd4..aba4bd4 100644
--- a/doclava17/src/test/resources/sample-project/com/example/fields/Arrays.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/fields/Arrays.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/fields/Fields.java b/doclet_adapter/src/test/resources/sample-project/com/example/fields/Fields.java
index 07fee31..07fee31 100644
--- a/doclava17/src/test/resources/sample-project/com/example/fields/Fields.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/fields/Fields.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/OfClass.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/OfClass.java
index 9d50b48..9d50b48 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/OfClass.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/OfClass.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/OfInterface.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/OfInterface.java
index 4a51863..4a51863 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/OfInterface.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/OfInterface.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/override/A.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/A.java
index 55e1081..55e1081 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/override/A.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/A.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/override/B.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/B.java
index 637fc19..637fc19 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/override/B.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/B.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/override/C.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/C.java
index 7e3b426..7e3b426 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/override/C.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/C.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/override/D.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/D.java
index 6460fca..6460fca 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/override/D.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/D.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/methods/override/package-info.java b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/package-info.java
index 67995b3..67995b3 100644
--- a/doclava17/src/test/resources/sample-project/com/example/methods/override/package-info.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/methods/override/package-info.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/packages/Annotation.java b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Annotation.java
index 918bdea..918bdea 100644
--- a/doclava17/src/test/resources/sample-project/com/example/packages/Annotation.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Annotation.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/packages/ClassWithNested.java b/doclet_adapter/src/test/resources/sample-project/com/example/packages/ClassWithNested.java
index 03a5fa7..03a5fa7 100644
--- a/doclava17/src/test/resources/sample-project/com/example/packages/ClassWithNested.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/packages/ClassWithNested.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/packages/Enum.java b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Enum.java
index cd9400f..cd9400f 100644
--- a/doclava17/src/test/resources/sample-project/com/example/packages/Enum.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Enum.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/packages/Error.java b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Error.java
index e17b0d1..e17b0d1 100644
--- a/doclava17/src/test/resources/sample-project/com/example/packages/Error.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Error.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/packages/Exception.java b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Exception.java
index fb77099..fb77099 100644
--- a/doclava17/src/test/resources/sample-project/com/example/packages/Exception.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Exception.java
diff --git a/doclava17/src/test/resources/sample-project/com/example/packages/Interface.java b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Interface.java
index 78834e4..78834e4 100644
--- a/doclava17/src/test/resources/sample-project/com/example/packages/Interface.java
+++ b/doclet_adapter/src/test/resources/sample-project/com/example/packages/Interface.java
diff --git a/print-progress.sh b/print-progress.sh
index 153aaf7..0bab6e8 100755
--- a/print-progress.sh
+++ b/print-progress.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-impl_path="doclava17/src/main/java/com/google/doclava/javadoc"
+impl_path="doclet_adapter/src/main/java/com/google/doclava/javadoc"
 
 used_total=$(printf '%d' $(grep -ri '@Used' $impl_path | wc -l))
 used_implemented=$(printf '%d' $(grep -ri '@Used(implemented = true)' | wc -l))
@@ -25,4 +25,4 @@ Used
 Unused
     total:       ${unused_total}
     implemented: ${unused_implemented}/${unused_total} (${perc_impl_of_unused}%)
-"
\ No newline at end of file
+"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4f34c87..8e4906d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,4 +20,4 @@ rootProject.name = "doclava"
 val ideaActive = System.getProperty("idea.active").toBoolean()
 
 // Uses a custom implementation of com.sun.javadoc using jdk.javadoc.doclet API.
-include("doclava17")
+include("doclet_adapter")