archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8297879: javadoc link to preview JEP 1000 has grouping character comma

Browse source 
Reviewed-by: jjg, vromero
This commit is contained in:
Pavel Rappo 2024-03-19 15:23:00 +00:00
parent 5f2a92d954
commit f140eb4c3a
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -84,7 +84,7 @@ public @interface PreviewFeature {
/** /**
* A key for testing. * A key for testing.
*/ */
@JEP(number=0, title="Test Feature") @JEP(number=2_147_483_647, title="Test Feature")
TEST, TEST,
; ;
} }

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
View file

@ -83,7 +83,7 @@ public class PreviewListWriter extends SummaryListWriter<PreviewAPIListBuilder>
target.add(HtmlTree.P(contents.getContent("doclet.Preview_API_Checkbox_Label"))); target.add(HtmlTree.P(contents.getContent("doclet.Preview_API_Checkbox_Label")));
Content list = HtmlTree.UL(HtmlStyle.previewFeatureList).addStyle(HtmlStyle.checkboxes); Content list = HtmlTree.UL(HtmlStyle.previewFeatureList).addStyle(HtmlStyle.checkboxes);
for (var jep : jeps) { for (var jep : jeps) {
String jepUrl = resources.getText("doclet.Preview_JEP_URL", jep.number()); String jepUrl = resources.getText("doclet.Preview_JEP_URL", String.valueOf(jep.number()));
Content label = new ContentBuilder(Text.of(jep.number() + ": ")) Content label = new ContentBuilder(Text.of(jep.number() + ": "))
.add(HtmlTree.A(jepUrl, Text.of(jep.title() + " (" + jep.status() + ")"))); .add(HtmlTree.A(jepUrl, Text.of(jep.title() + " (" + jep.status() + ")")));
list.add(HtmlTree.LI(getCheckbox(label, String.valueOf(index++), "feature-"))); list.add(HtmlTree.LI(getCheckbox(label, String.valueOf(index++), "feature-")));

4
test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
View file

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8250768 8261976 8277300 8282452 8287597 8325325 8325874 * @bug 8250768 8261976 8277300 8282452 8287597 8325325 8325874 8297879
* @summary test generated docs for items declared using preview * @summary test generated docs for items declared using preview
* @library ../../lib * @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool * @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -81,7 +81,7 @@ public class TestPreview extends JavadocTester {
<ul class="preview-feature-list checkboxes"> <ul class="preview-feature-list checkboxes">
<li><label for="feature-1"> <li><label for="feature-1">
<input type="checkbox" id="feature-1" disabled checked onclick="toggleGlobal(this, '1', 3)"> <input type="checkbox" id="feature-1" disabled checked onclick="toggleGlobal(this, '1', 3)">
<span>0: <a href="https://openjdk.org/jeps/0">Test Feature (Preview)</a></span></label></li> <span>2147483647: <a href="https://openjdk.org/jeps/2147483647">Test Feature (Preview)</a></span></label></li>
<li><label for="feature-all"> <li><label for="feature-all">
<input type="checkbox" id="feature-all" disabled checked onclick="toggleGlobal(this, 'all', 3)"> <input type="checkbox" id="feature-all" disabled checked onclick="toggleGlobal(this, 'all', 3)">
<span>Toggle all</span></label></li> <span>Toggle all</span></label></li>