diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-13 21:06:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-13 21:06:40 +0000 |
commit | 3ca0194f9821686625fa4804484b7c6c10a15aa9 (patch) | |
tree | d802cf0a66503e77af13fc05924aad1b107e058c | |
parent | 8fba86795dae6885cba15294f0a5c66f8f01fb55 (diff) | |
parent | d92e8a78b52420fea651b398bc207552d72bdba3 (diff) | |
download | doclava-android14-s1-release.tar.gz |
Snap for 10132053 from d92e8a78b52420fea651b398bc207552d72bdba3 to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: I16083bb088387629a20645771bdd12e6cfeb8c06
-rw-r--r-- | doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java | 4 | ||||
-rw-r--r-- | src/com/google/doclava/Stubs.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java index 66be504..20ae382 100644 --- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java +++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/MethodDocImpl.java @@ -61,13 +61,13 @@ class MethodDocImpl extends ExecutableMemberDocImpl implements MethodDoc { public String qualifiedName() { var enclosingClass = executableElement.getEnclosingElement(); return switch (enclosingClass.getKind()) { - case CLASS, INTERFACE, ANNOTATION_TYPE, ENUM -> { + case CLASS, INTERFACE, ANNOTATION_TYPE, ENUM, RECORD -> { var enclosingClassName = ((TypeElement) enclosingClass).getQualifiedName().toString(); yield enclosingClassName + "." + name(); } default -> throw new UnsupportedOperationException("Expected CLASS, INTERFACE, " - + "ANNOTATION_TYPE or ENUM, but got " + enclosingClass.getKind()); + + "ANNOTATION_TYPE, ENUM, or RECORD, but got " + enclosingClass.getKind()); }; } diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java index 930d52c..a90ed6e 100644 --- a/src/com/google/doclava/Stubs.java +++ b/src/com/google/doclava/Stubs.java @@ -53,7 +53,7 @@ public class Stubs { boolean keepStubComments) { // figure out which classes we need final HashSet<ClassInfo> notStrippable = new HashSet<ClassInfo>(); - Collection<ClassInfo> all = Converter.allClasses(); + Collection<ClassInfo> all = List.copyOf(Converter.allClasses()); Map<PackageInfo, List<ClassInfo>> allClassesByPackage = null; PrintStream apiWriter = null; PrintStream dexApiWriter = null; |