diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-13 05:11:32 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-13 05:11:32 +0000 |
commit | e8d3782f527dfeca65e4cc2a8844ecca26ec78e8 (patch) | |
tree | d802cf0a66503e77af13fc05924aad1b107e058c | |
parent | 3aade5d68503e1b46f6a6177b038c74510be5a6a (diff) | |
parent | 4da71fe801a58f0c01860e76cffcaa60e2261346 (diff) | |
download | doclava-e8d3782f527dfeca65e4cc2a8844ecca26ec78e8.tar.gz |
Snap for 10130956 from 4da71fe801a58f0c01860e76cffcaa60e2261346 to udc-qpr1-releaseandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release
Change-Id: Ib1d0d364e995b5374f436285294eaa032c0a94a0
-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; |