stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8288692: jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java fails after JDK-8288545

Browse Source 
Reviewed-by: prappo
This commit is contained in:
Jonathan Gibbons 2022-06-17 21:48:24 +00:00
parent 97544be5b6
commit f12d044929
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
View File

@ -984,7 +984,13 @@ public class HtmlDocletWriter {
case LINK, LINK_PLAIN -> {
// {@link[plain] reference label...}
LinkTree lt = (LinkTree) see;
refText = lt.getReference().toString();
var linkRef = lt.getReference();
if (linkRef == null) {
messages.warning(ch.getDocTreePath(see),"doclet.link.no_reference");
return invalidTagOutput(resources.getText("doclet.tag.invalid_input", lt.toString()),
Optional.empty());
}
refText = linkRef.toString();
label = lt.getLabel();
}

1
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
View File

@ -102,6 +102,7 @@ doclet.MalformedURL=Malformed URL: {0}
doclet.File_error=Error reading file: {0}
doclet.URL_error=Error fetching URL: {0}
doclet.Resource_error=Error reading resource: {0}
doclet.link.no_reference=no reference given
doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1}
doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1}
doclet.see.nested_link=Tag {0}: nested link

3
test/langtools/jdk/javadoc/doclet/testTagMisuse/TestTagMisuse.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,6 +23,7 @@
/*
* @test
* @bug 8035473 8288692
* @summary Determine if proper warning messages are printed.
* @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool