53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
--- jdk10/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java 2018-01-18 00:25:18.000000000 +0100
|
|
+++ jdk10/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java 2018-01-18 17:45:18.697161064 +0100
|
|
@@ -839,7 +839,7 @@
|
|
}
|
|
|
|
if (!msgOptionSeen) {
|
|
- doclintOpts.add(DocLint.XMSGS_OPTION);
|
|
+ return;
|
|
}
|
|
|
|
String sep = "";
|
|
--- jdk10/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java 2018-01-18 00:25:18.000000000 +0100
|
|
+++ jdk10/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java 2018-01-18 17:45:18.697161064 +0100
|
|
@@ -127,7 +127,7 @@
|
|
}
|
|
|
|
if (!msgOptionSeen) {
|
|
- doclintOpts.add(DocLint.XMSGS_OPTION);
|
|
+ return;
|
|
}
|
|
|
|
String sep = "";
|
|
--- jdk10/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java 2018-01-18 00:25:18.000000000 +0100
|
|
+++ jdk10/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java 2018-01-18 17:49:48.865162085 +0100
|
|
@@ -147,12 +147,12 @@
|
|
files = List.of(new TestJFO("Test.java", code));
|
|
|
|
test(List.of(htmlVersion),
|
|
- Main.Result.ERROR,
|
|
- EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
|
|
+ Main.Result.OK,
|
|
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
|
|
|
|
test(List.of(htmlVersion, rawDiags),
|
|
- Main.Result.ERROR,
|
|
- EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
|
|
+ Main.Result.OK,
|
|
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
|
|
|
|
// test(List.of("-Xdoclint:none"),
|
|
// Main.Result.OK,
|
|
@@ -175,8 +175,8 @@
|
|
EnumSet.of(Message.DL_WRN12));
|
|
|
|
test(List.of(htmlVersion, rawDiags, "-private"),
|
|
- Main.Result.ERROR,
|
|
- EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12));
|
|
+ Main.Result.OK,
|
|
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
|
|
|
|
test(List.of(htmlVersion, rawDiags, "-Xdoclint:syntax", "-private"),
|
|
Main.Result.ERROR,
|