From 94b9299ba1b9128edf1ed34d8e6fd8582f095d7f Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Wed, 29 Apr 2020 12:33:58 -0700 Subject: Fix broken links to inner class constructors. This reverts aosp/166050 which added this workaround. It is no longer needed since we have updated all of the usages to the correct syntax. Bug: 6963924 Bug: 18051133 Test: make doc-comment-check-docs Exempt-From-Owner-Approval: cherry-picked from master Change-Id: Iab578046a562d110be0833f51c762224baa2745e Merged-In: Iab578046a562d110be0833f51c762224baa2745e --- src/com/google/doclava/Converter.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java index a6f803b..cf14237 100644 --- a/src/com/google/doclava/Converter.java +++ b/src/com/google/doclava/Converter.java @@ -501,23 +501,9 @@ public class Converter { return result; } else { ConstructorDoc m = (ConstructorDoc) o; - // Workaround for a JavaDoc behavior change introduced in OpenJDK 8 that breaks - // links in documentation and the content of API files like current.txt. - // http://b/18051133. - String name = m.name(); - ClassDoc containingClass = m.containingClass(); - if (containingClass.containingClass() != null) { - // This should detect the new behavior and be bypassed otherwise. - if (!name.contains(".")) { - // Constructors of inner classes do not contain the name of the enclosing class - // with OpenJDK 8. This simulates the old behavior: - name = containingClass.name(); - } - } - // End of workaround. MethodInfo result = new MethodInfo(m.getRawCommentText(), new ArrayList(Arrays.asList(Converter.convertTypes(m.typeParameters()))), - name, m.signature(), Converter.obtainClass(m.containingClass()), Converter + m.name(), m.signature(), Converter.obtainClass(m.containingClass()), Converter .obtainClass(m.containingClass()), m.isPublic(), m.isProtected(), m .isPackagePrivate(), m.isPrivate(), m.isFinal(), m.isStatic(), m.isSynthetic(), false, m.isSynchronized(), m.isNative(), false/*isDefault*/, false, "constructor", m.flatSignature(), -- cgit v1.2.3 From 3ccda354e7a0672f089a23dabe38c6cc5048375f Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Tue, 28 Apr 2020 12:22:47 -0700 Subject: Stop suppressing @see tags in frameworks/base. All broken @see references have been fixed. Bug: 6963924 Test: make doc-comment-check-docs Exempt-From-Owner-Approval: cherry-picked from master Change-Id: Ibd92bbf8702862f3d7e1f95d448f45c24d436404 Merged-In: Ibd92bbf8702862f3d7e1f95d448f45c24d436404 (cherry picked from commit da0c247abfd7553f692162154d82cfd0d91c6cde) --- src/com/google/doclava/SeeTagInfo.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/com/google/doclava/SeeTagInfo.java b/src/com/google/doclava/SeeTagInfo.java index eddc595..fee8ce2 100644 --- a/src/com/google/doclava/SeeTagInfo.java +++ b/src/com/google/doclava/SeeTagInfo.java @@ -35,16 +35,8 @@ public class SeeTagInfo extends TagInfo { protected LinkReference linkReference() { if (mLink == null) { - // If this is a @see reference in frameworks/base, suppress errors about broken references. - // Outside of frameworks/base, and the generated android/R file, all such - // errors have been fixed, see b/80570421. - boolean suppressableSeeReference = - "@see".equals(name()) && - (position().file.contains("frameworks/base/") - || position().file.endsWith("android/R.java")); - mLink = - LinkReference.parse(text(), mBase, position(), !suppressableSeeReference - && (mBase != null ? mBase.checkLevel() : true)); + mLink = LinkReference.parse(text(), mBase, position(), + mBase != null ? mBase.checkLevel() : true); } return mLink; } -- cgit v1.2.3