From f140eb4c3a47e1479d62fe1eef16bbbea92892bc Mon Sep 17 00:00:00 2001 From: Pavel Rappo Date: Tue, 19 Mar 2024 15:23:00 +0000 Subject: [PATCH] 8297879: javadoc link to preview JEP 1000 has grouping character comma Reviewed-by: jjg, vromero --- .../share/classes/jdk/internal/javac/PreviewFeature.java | 4 ++-- .../internal/doclets/formats/html/PreviewListWriter.java | 2 +- .../langtools/jdk/javadoc/doclet/testPreview/TestPreview.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java index 9404a5c6de5..8549da583c3 100644 --- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java +++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java @@ -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. * * This code is free software; you can redistribute it and/or modify it @@ -84,7 +84,7 @@ public @interface PreviewFeature { /** * A key for testing. */ - @JEP(number=0, title="Test Feature") + @JEP(number=2_147_483_647, title="Test Feature") TEST, ; } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java index 911df132de4..2141f1e7be7 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java @@ -83,7 +83,7 @@ public class PreviewListWriter extends SummaryListWriter target.add(HtmlTree.P(contents.getContent("doclet.Preview_API_Checkbox_Label"))); Content list = HtmlTree.UL(HtmlStyle.previewFeatureList).addStyle(HtmlStyle.checkboxes); 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() + ": ")) .add(HtmlTree.A(jepUrl, Text.of(jep.title() + " (" + jep.status() + ")"))); list.add(HtmlTree.LI(getCheckbox(label, String.valueOf(index++), "feature-"))); diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java index 247ca0f7874..d5107f7598f 100644 --- a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java +++ b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java @@ -23,7 +23,7 @@ /* * @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 * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -81,7 +81,7 @@ public class TestPreview extends JavadocTester {