diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:17:13 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:17:13 +0000 |
commit | 8d8ccf9874d85bf832890151a599f30dbee112bf (patch) | |
tree | d802cf0a66503e77af13fc05924aad1b107e058c | |
parent | 6f30209cb9043c3b4a926daf2a77f6dd021a9c2c (diff) | |
parent | 28702590e52bd2e92646a37e82df21825a99ff8c (diff) | |
download | doclava-aml_rkp_341311000.tar.gz |
Snap for 10453563 from 28702590e52bd2e92646a37e82df21825a99ff8c to mainline-rkpd-releaseaml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000
Change-Id: Ie655f8bc891a752ef5b95c119670926b9035d1f2
-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; |