# HG changeset patch # User bpatel # Date 1489619540 25200 # Node ID e03f5fb3714b6715a361217f114b4719010336e6 # Parent e9bbaeab6f49b12625faeddb262a50840a91e472 8175200: Long method signatures disturb Method Summary table Reviewed-by: jjg, ksrini diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -199,6 +199,7 @@ */ protected void addParameters(ExecutableElement member, boolean includeAnnotations, Content htmltree, int indentSize) { + htmltree.addContent(Contents.ZERO_WIDTH_SPACE); htmltree.addContent("("); String sep = ""; List parameters = member.getParameters(); diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -48,6 +48,7 @@ */ public class Contents { public static final Content SPACE = RawHtml.nbsp; + public static final Content ZERO_WIDTH_SPACE = RawHtml.zws; public final Content allClassesLabel; public final Content allImplementedInterfacesLabel; diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2017, 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 @@ -47,6 +47,8 @@ public static final Content nbsp = new RawHtml(" "); + public static final Content zws = new RawHtml("​"); + /** * Constructor to construct a RawHtml object. * diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java --- a/langtools/test/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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,7 +23,7 @@ /* * @test - * @bug 8163800 + * @bug 8163800 8175200 * @summary The fix for JDK-8072052 shows up other minor incorrect use of styles * @library ../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -51,11 +51,11 @@ checkOutput("p/C1.html", true, "C2", - "C1()"); + "C1​()"); checkOutput("p/C2.html", true, "C3", - "C2()"); + "C2​()"); checkOutput("p/C3.html", true, "I1, " @@ -63,7 +63,7 @@ + "I2, " + "IT1<T>, " + "IT2<java.lang.String>", - "C3()"); + "C3​()"); checkOutput("p/I1.html", true, "C3", diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testConstructors/TestConstructors.java --- a/langtools/test/jdk/javadoc/doclet/testConstructors/TestConstructors.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testConstructors/TestConstructors.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2017, 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,7 +23,7 @@ /* * @test - * @bug 8025524 8031625 8081854 + * @bug 8025524 8031625 8081854 8175200 * @summary Test for constructor name which should be a non-qualified name. * @author Bhavesh Patel * @library ../lib @@ -58,21 +58,21 @@ + "Outer(int), " + "" + "NestedInner(int)", - "Outer()", + "Outer​()", "", - "Outer(int i)", + "Outer​(int i)", ""); checkOutput("pkg1/Outer.Inner.html", true, - "Inner()", + "Inner​()", "", - "Inner(int i)", + "Inner​(int i)", ""); checkOutput("pkg1/Outer.Inner.NestedInner.html", true, - "NestedInner()", + "NestedInner​()", "", - "NestedInner(int i)", + "NestedInner​(int i)", ""); checkOutput("pkg1/Outer.Inner.html", false, diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java --- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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,7 +23,7 @@ /* * @test - * @bug 4927552 8026567 8071982 8162674 + * @bug 4927552 8026567 8071982 8162674 8175200 * @summary * @author jamieh * @library ../lib @@ -83,10 +83,10 @@ + "public int field\n" + "
Deprecated, for removal: This API element is subject to removal in a future version.  
", "
@Deprecated(forRemoval=true)\n"
-                + "public DeprecatedClassByAnnotation()
\n" + + "public DeprecatedClassByAnnotation​()\n" + "
Deprecated, for removal: This API element is subject to removal in a future version.  
", "
@Deprecated\n"
-                + "public void method()
\n" + + "public void method​()\n" + "
Deprecated. 
"); checkOutput("pkg/TestAnnotationType.html", true, @@ -117,7 +117,7 @@ + "public class TestClass\n" + "extends java.lang.Object", "
@Deprecated(forRemoval=true)\n"
-                + "public TestClass()
\n" + + "public TestClass​()\n" + "
Deprecated, for removal: This API element is subject to removal in a future version.  " + "class_test3 passes.
"); diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java --- a/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, 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,7 +23,7 @@ /* * @test - * @bug 6786690 6820360 8025633 8026567 + * @bug 6786690 6820360 8025633 8026567 8175200 * @summary This test verifies the nesting of definition list tags. * @author Bhavesh Patel * @library ../lib @@ -367,12 +367,12 @@ // Test with -nocomment and -nodeprecated options. The ClassDocs whould // not display definition lists for any member details. checkOutput("pkg1/C1.html", expectFound, - "
public void readObject()\n" +
+                "
public void readObject​()\n" +
                 "                throws java.io.IOException
\n" +
                 "");
 
         checkOutput("pkg1/C2.html", expectFound,
-                "
public C2()
\n" +
+                "
public C2​()
\n" +
                 "");
 
         checkOutput("pkg1/C1.ModalExclusionType.html", expectFound,
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testIndentation/TestIndentation.java
--- a/langtools/test/jdk/javadoc/doclet/testIndentation/TestIndentation.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testIndentation/TestIndentation.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug      8011288 8062647
+ * @bug      8011288 8062647 8175200
  * @summary  Erratic/inconsistent indentation of signatures
  * @library  ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -46,7 +46,7 @@
         checkExit(Exit.OK);
 
         checkOutput("p/Indent.html", true,
-                "
public <T> void m(T t1,",
+                "
public <T> void m​(T t1,",
                 "\n"
                 + "                  T t2)",
                 "\n"
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testInterface/TestInterface.java
--- a/langtools/test/jdk/javadoc/doclet/testInterface/TestInterface.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testInterface/TestInterface.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug      4682448 4947464 5029946 8025633 8026567 8035473 8139101
+ * @bug      4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200
  * @summary  Verify that the public modifier does not show up in the
  *           documentation for public methods, as recommended by the JLS.
  *           If A implements I and B extends A, B should be in the list of
@@ -64,7 +64,7 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/Interface.html", true,
-                "
int method()
",
+                "
int method​()
",
                 "
static final int field
",
                 // Make sure known implementing class list is correct and omits type parameters.
                 "
\n"
@@ -119,7 +119,7 @@
                 + "
");
 
         checkOutput("pkg/Interface.html", false,
-                "public int method()",
+                "public int method​()",
                 "public static final int field");
 
         checkOutput("pkg/ClassWithStaticMethod.html", false,
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
--- a/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Wed Mar 15 16:12:20 2017 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363 8167967 8172528
+ * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363 8167967 8172528 8175200
  * @summary Test of the JavaFX doclet features.
  * @author jvalenta
  * @library ../lib
@@ -53,11 +53,11 @@
                 + "
getRate(), \n"
                 + ""
                 + "setRate(double)
",
-                "
public final void setRate(double value)
\n"
+                "
public final void setRate​(double value)
\n"
                 + "
Sets the value of the property rate.
\n"
                 + "
\n"
                 + "
Property description:
",
-                "
public final double getRate()
\n"
+                "
public final double getRate​()
\n"
                 + "
Gets the value of the property rate.
\n"
                 + "
\n"
                 + "
Property description:
",
@@ -77,7 +77,7 @@
                 "Property description:",
                 ""
                 + ""
-                + "setTestMethodProperty()",
+                + "setTestMethodProperty​()",
                 ""
                 + "paused\n"
                 + "\n"
@@ -87,10 +87,10 @@
                 + "title=\"class in pkg1\">C.BooleanProperty pausedProperty
\n"
                 + "
Defines if paused. The second line.
",
                 "
isPaused
\n"
-                + "
public final double isPaused()
\n"
+                + "
public final double isPaused​()
\n"
                 + "
Gets the value of the property paused.
",
                 "
setPaused
\n"
-                + "
public final void setPaused(boolean value)
\n"
+                + "
public final void setPaused​(boolean value)
\n"
                 + "
Sets the value of the property paused.
\n"
                 + "
\n"
                 + "
Property description:
\n"
@@ -98,7 +98,7 @@
                 + "
Default value:
\n"
                 + "
false
",
                 "
isPaused
\n"
-                + "
public final double isPaused()
\n"
+                + "
public final double isPaused​()
\n"
                 + "
Gets the value of the property paused.
\n"
                 + "
\n"
                 + "
Property description:
\n"
@@ -112,7 +112,7 @@
                 + "Timeline is expected to\n"
                 + " be played. This is the second line.",
                 "
setRate
\n"
-                + "
public final void setRate(double value)
\n"
+                + "
public final void setRate​(double value)
\n"
                 + "
Sets the value of the property rate.
\n"
                 + "
\n"
                 + "
Property description:
\n"
@@ -123,7 +123,7 @@
                 + "
Since:
\n"
                 + "
JavaFX 8.0
",
                 "
getRate
\n"
-                + "
public final double getRate()
\n"
+                + "
public final double getRate​()
\n"
                 + "
Gets the value of the property rate.
\n"
                 + "
\n"
                 + "
Property description:
\n"
@@ -239,26 +239,26 @@
                 + "<T> java.lang.Object\n"
                 + ""
                 + "alphaProperty"
-                + "(java.util.List<T> foo)\n"
+                + "​(java.util.List<T> foo)\n"
                 + " \n"
                 + "\n"
                 + "\n"
                 + "java.lang.Object\n"
                 + ""
-                + "betaProperty()\n"
+                + "betaProperty​()\n"
                 + " \n"
                 + "\n"
                 + "\n"
                 + "java.util.List<java.util.Set<? super java.lang.Object>>"
                 + "\n"
                 + ""
-                + "deltaProperty()\n"
+                + "deltaProperty​()\n"
                 + " \n"
                 + "\n"
                 + "\n"
                 + "java.util.List<java.lang.String>\n"
                 + ""
-                + "gammaProperty()\n"
+                + "gammaProperty​()\n"
                 + " "
         );
     }
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java
--- a/langtools/test/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug      8004893 8022738 8029143
+ * @bug      8004893 8022738 8029143 8175200
  * @summary  Make sure that the lambda feature changes work fine in
  *           javadoc.
  * @author   bpatel
@@ -55,7 +55,7 @@
 
         checkOutput("pkg/A.html", true,
                 "default void",
-                "
default void defaultMethod()
",
+                "
default void defaultMethod​()
",
                 ""
                 + "All Methods "
                 + ""
@@ -83,7 +83,7 @@
 
         checkOutput("pkg/A.html", false,
                 "default default void",
-                "
default default void defaultMethod()
");
+                "
default default void defaultMethod​()
");
 
         checkOutput("pkg/B.html", false,
                 "default void",
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java
--- a/langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug      8002387 8014636 8078320
+ * @bug      8002387 8014636 8078320 8175200
  * @summary  Improve rendered HTML formatting for {@code}
  * @library  ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -47,19 +47,19 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/Test.html", true,
-                "no_pre()
\n"
+                "no_pre​()
\n" + "
abcdefghi
", - "no_pre_extra_whitespace()\n" + "no_pre_extra_whitespace​()\n" + "
abc def ghi
", - "in_pre()\n" + "in_pre​()\n" + "
 abc def  ghi
", - "pre_after_text()\n" + "pre_after_text​()\n" + "
xyz 
 abc def  ghi
", - "after_pre()\n" + "after_pre​()\n" + "
xyz 
 pqr
abc def ghi
", - "back_in_pre()\n" + "back_in_pre​()\n" + "
xyz 
 pqr
mno 
 abc def  ghi
", - "typical_usage_code()\n" + "typical_usage_code​()\n" + "
Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" + " Example: 
\n"
                 + "   line 0 @Override\n"
@@ -68,7 +68,7 @@
                 + "   line 3 }\n"
                 + "
\n" + " and so it goes.
", - "typical_usage_literal()\n" + "typical_usage_literal​()\n" + "
Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" + " Example: 
\n"
                 + "   line 0 @Override\n"
@@ -77,7 +77,7 @@
                 + "   line 3 }\n"
                 + "
\n" + " and so it goes.
", - "recommended_usage_literal()\n" + "recommended_usage_literal​()\n" + "
Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" + " Example: 
\n"
                 + "   line 0 @Override\n"
@@ -89,7 +89,7 @@
                 + " 
\n"
                 + " id           \n"
                 + "
", - "
public void htmlAttrInPre1()
\n" + "
public void htmlAttrInPre1​()
\n" + "
More html tag outliers.\n" + " 
\n"
                 + " @Override\n"
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java
--- a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 4638588 4635809 6256068 6270645 8025633 8026567 8162363
+ * @bug 4638588 4635809 6256068 6270645 8025633 8026567 8162363 8175200
  * @summary Test to make sure that members are inherited properly in the Javadoc.
  *          Verify that inheritence labels are correct.
  * @author jamieh
@@ -92,7 +92,7 @@
                 "static java.time.Period\n"
                 + ""
                 + ""
-                + "between(java.time.LocalDate startDateInclusive,\n"
+                + "between​(java.time.LocalDate startDateInclusive,\n"
                 + "       java.time.LocalDate endDateExclusive)",
                 // check the inherited from interfaces
                 "
Methods inherited from interface pkg1.PublicChild\n"
                 + ""
-                + "returnTypeTest()",
+                + "returnTypeTest​()",
                 // Check return type in member detail.
                 "
public "
-                + "PublicChild returnTypeTest()
");
+                + "PublicChild returnTypeTest​()
"); // Legacy anchor dimensions (6290760) checkOutput("pkg2/A.html", true, diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java --- a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -24,6 +24,7 @@ /* * @test * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567 8162363 + * 8175200 * @summary Run Javadoc on a set of source files that demonstrate new * language features. Check the output to ensure that the new * language features are properly documented. @@ -80,7 +81,7 @@ "Overloaded valueOf() method has correct documentation.", "Overloaded values method has correct documentation.", "
public static Coin" +
-                " valueOf(java.lang.String name)
\n" + + " valueOf​(java.lang.String name)\n" + "
Returns the enum constant of this type with the specified name.\n" + "The string must match exactly an identifier used to declare an\n" + "enum constant in this type. (Extraneous whitespace characters are \n" + @@ -136,17 +137,17 @@ + "title=\"type parameter in TypeParameters\">E[]\n" + "" + "" - + "methodThatReturnsTypeParameterA(​(E[] e)", "
public E[] "
-                + "methodThatReturnsTypeParameterA(E[] e)
\n", "<T extends java.lang.Object & java.lang.Comparable<? super T>>" + "
T\n" + "" + "" - + "methodtThatReturnsTypeParametersB(java.util.Collection<? extends T> coll)", + + "methodtThatReturnsTypeParametersB​(java.util.Collection<? extends T> coll)", "
Returns TypeParameters
\n", // Method takes a TypeVariable "<X extends java.lang.Throwable>
" @@ -154,7 +155,7 @@ + "\n" + "" + "" - + "orElseThrow(java.util.function.Supplier<? extends X> exceptionSupplier)" + + "orElseThrow​(java.util.function.Supplier<? extends X> exceptionSupplier)" ); checkOutput("pkg/Wildcards.html", true, @@ -208,7 +209,7 @@ // Handle multiple bounds. //============================================================== checkOutput("pkg/MultiTypeParameters.html", true, - "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)"); + "public <T extends java.lang.Number & java.lang.Runnable> T foo​(T t)"); //============================================================== // Test Class-Use Documentation for Type Parameters. @@ -231,7 +232,7 @@ "ClassUseTest1." + "method" - + "(T t)", + + "​(T t)", "Fields in pkg2 with type parameters of " + "type " @@ -272,7 +273,7 @@ "" + "ClassUseTest1.method" - + "(T t)" + + "​(T t)" ); // ClassUseTest2: > @@ -295,7 +296,7 @@ "ClassUseTest2." + "method" - + "(T t)", + + "​(T t)", "Fields in pkg2 declared as ParamTest" @@ -336,7 +337,7 @@ "ClassUseTest2." + "method" - + "(T t)", + + "​(T t)", "Methods in pkg2 that return types with " + "arguments of type ", "ClassUseTest3" + ".method(T t)", + + "html#method-T-\">method​(T t)", "<T extends " + "ParamTest2<java.util.List<? extends Foo4 ", "ClassUseTest3." + "method(T t)" + + "html#method-T-\">method​(T t)" + "", "Methods in pkg2 that return types with " @@ -433,7 +434,7 @@ + "void\n" + "ClassUseTest3." + "method(java." + + "html#method-java.util.Set-\">method​(java." + "util.Set<Foo4> p)", "Constructor parameters in " + "required=1994)\n" - + "public AnnotationTypeUsage()", + + "public AnnotationTypeUsage​()", // METHOD "
@AnnotationType("
@@ -556,9 +557,9 @@
                 + "=\"Method Annotation\",\n"
                 + "                "
                 + "required=1994)\n"
-                + "public void method()
", + + "public void method​()", // METHOD PARAMS - "
public void methodWithParams("
+                "
public void methodWithParams​("
                 + ""
                 + "@AnnotationType("
                 + "optional=\"Parameter Annotation\",",
                 // CONSTRUCTOR PARAMS
-                "
public AnnotationTypeUsage(public AnnotationTypeUsage​("
                 + "@AnnotationType("
                 + "optional=\"Constructor Param Annotation\",@AnnotationTypeUndocumented(optional=\"Constructor Annotation\",\n"
                 + "                required=1994)\n"
-                + "public AnnotationTypeUsage()",
+                + "public AnnotationTypeUsage​()",
                 // METHOD
                 "@AnnotationTypeUndocumented(optional=\"Method Annotation\",\n"
                 + "                required=1994)\n"
-                + "public void method()");
+                + "public void method​()");
 
         //=================================
         // Make sure annotation types do not
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java
--- a/langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testOptions/TestOptions.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug      4749567 8071982
+ * @bug      4749567 8071982 8175200
  * @summary  Test the output for -header, -footer, -nooverview, -nodeprecatedlist, -nonavbar, -notree, -stylesheetfile options.
  * @author   Bhavesh Patel
  * @library  ../lib
@@ -148,7 +148,7 @@
                 "
public java.lang.Object someProperty
",
                 "
public java.lang.Object someProperty()
");
+                + "\"../src-html/linksource/Properties.html#line.31\">someProperty​()
");
 
         checkOutput("src-html/linksource/Properties.html", true,
                 "Source code",
@@ -161,9 +161,9 @@
                 "
public int "
                 + "field
",
                 "
public "
-                + "SomeClass()
",
+                + "SomeClass​()
",
                 "
public int "
-                + "method()
");
+                + "method​()
"); checkOutput("src-html/linksource/SomeClass.html", true, "Source code", diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java --- a/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java Wed Mar 15 16:12:20 2017 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8174839 + * @bug 8174839 8175200 * @summary Bad overriding method should not crash * @library ../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -52,7 +52,7 @@ checkOutput("pkg4/Foo.html", true, "
  • \n" + "

    toString

    \n" - + "
    public void toString()
    \n" + + "
    public void toString​()
    \n" + "
    Why can't I do this ?
    \n" + "
    • "); } diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java --- a/langtools/test/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java Wed Mar 15 14:18:28 2017 -0700 +++ b/langtools/test/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java Wed Mar 15 16:12:20 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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,7 +23,7 @@ /* * @test - * @bug 4780441 4874845 4978816 8014017 8016328 8025633 8026567 + * @bug 4780441 4874845 4978816 8014017 8016328 8025633 8026567 8175200 * @summary Make sure that when the -private flag is not used, members * inherited from package private class are documented in the child. * @@ -74,7 +74,7 @@ + "\n" + "", // Method is documented as though it is declared in the inheriting method. - "
    public void methodInheritedFromParent(int p1)",
+                "
    public void methodInheritedFromParent​(int p1)",
                 "
    \n"
                 + "
    All Implemented Interfaces:
    \n"
                 + "
    "
@@ -96,12 +96,12 @@
                 // Should not document comments from private inherited interfaces
                 "" +
                 "" +
-                "methodInterface(int p1)\n" +
+                "methodInterface​(int p1)\n" +
                 "
    Comment from interface.
    \n",
                 // and similarly one more
                 "" +
                 "" +
-                "methodInterface2(int p1)\n" +
+                "methodInterface2​(int p1)\n" +
                 "
    Comment from interface.
    \n"
         );
 
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
--- a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java	Wed Mar 15 16:12:20 2017 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8005091 8009686 8025633 8026567 6469562 8071982 8071984 8162363
+ * @bug      8005091 8009686 8025633 8026567 6469562 8071982 8071984 8162363 8175200
  * @summary  Make sure that type annotations are displayed correctly
  * @author   Bhavesh Patel
  * @library  ../lib
@@ -155,17 +155,17 @@
         checkOutput("typeannos/MtdDefaultScope.html", true,
                 "
    public <T> @MRtnA java.lang.String"
-                + " method()
    ",
+                + " method​()
    ",
 
                 // When JDK-8068737 is fixed, we should change the order
                 "
    "
                 + "@MRtnA java.lang.String "
                 + "@MRtnB [] "
                 + "@MRtnA []"
-                + " array2Deep()
    ",
+                + " array2Deep​()
    ", "
    @MRtnA java.lang.String[][] array2()
    "); + + "typeannos\">@MRtnA java.lang.String[][] array2​()"); checkOutput("typeannos/MtdModifiedScoped.html", true, "
    public final @MRtnB java.lang.String>,@MRtnB java."
-                + "lang.String> nestedMtdParameterized()
    "); + + "lang.String> nestedMtdParameterized​()"); // Test for type annotations on method type parameters (MethodTypeParameters.java). checkOutput("typeannos/UnscopedUnmodified.html", true, "
    <K extends @MTyParamA java.lang.String>"
-                + " void methodExtends()
    ", + + " void methodExtends​()", "
    <K extends @MTyParamA "
                 + "MtdTyParameterized<@MTyParamB java.lang.String"
-                + ">> void nestedExtends()
    "); + + ">> void nestedExtends​()"); checkOutput("typeannos/PublicModifiedMethods.html", true, "
    public final <K extends @MTyParamA "
-                + "java.lang.String> void methodExtends()
    ", + + "java.lang.String> void methodExtends​()", "
    public final <K extends @MTyParamA "
@@ -204,16 +204,16 @@
                 + "typeannos/MtdTyParameterized.html\" title=\"class in typeannos\">"
                 + "MtdTyParameterized<@MTyParamB java.lang.String"
-                + ">> void dual()
    "); + + ">> void dual​()"); // Test for type annotations on parameters (Parameters.java). checkOutput("typeannos/Parameters.html", true, - "
    void unannotated(void unannotated​("
                 + "ParaParameterized<java.lang.String,java.lang.String>"
                 + " a)
    ", - "
    void nestedParaParameterized(void nestedParaParameterized​("
                 + "ParaParameterized<@ParamA  java.lang.String> a)
    ", // When JDK-8068737 is fixed, we should change the order - "
    void array2Deep(void array2Deep​(@ParamA java.lang.String "
                 + ""
                 + "@ParamB [] "
@@ -236,34 +236,34 @@
 
         // Test for type annotations on throws (Throws.java).
         checkOutput("typeannos/ThrDefaultUnmodified.html", true,
-                "
    void oneException()\n"
+                "
    void oneException​()\n"
                 + "           throws @ThrA java.lang.Exception
    ",
 
-                "
    void twoExceptions()\n"
+                "
    void twoExceptions​()\n"
                 + "            throws @ThrA java.lang.RuntimeException,\n"
                 + "                   @ThrA java.lang.Exception
    ");
 
         checkOutput("typeannos/ThrPublicModified.html", true,
-                "
    public final void oneException(java.lang.String a)\n"
+                "
    public final void oneException​(java.lang.String a)\n"
                 + "                        throws @ThrA java.lang.Exception
    ",
 
-                "
    public final void twoExceptions(java.lang.String a)\n"
+                "
    public final void twoExceptions​(java.lang.String a)\n"
                 + "                         throws @ThrA java.lang.RuntimeException,\n"
                 + "                                @ThrA java.lang.Exception
    ");
 
         checkOutput("typeannos/ThrWithValue.html", true,
-                "
    void oneException()\n"
+                "
    void oneException​()\n"
                 + "           throws @ThrB("
                 + "\"m\") java.lang.Exception
    ",
 
-                "
    void twoExceptions()\n"
+                "
    void twoExceptions​()\n"
                 + "            throws @ThrB("
                 + "\"m\") java.lang.RuntimeException,\n"
@@ -275,12 +275,12 @@
                 "
    <K,"
                 + "@TyParaA V extends @TyParaA "
-                + "java.lang.String> void secondAnnotated()
    "
+                + "java.lang.String> void secondAnnotated​()
    "
         );
 
         // Test for type annotations on wildcard type (Wildcards.java).
         checkOutput("typeannos/BoundTest.html", true,
-                "
    void wcExtends(void wcExtends​(MyList<? extends @WldA"
                 + " java.lang.String> l)
    ",
@@ -288,10 +288,10 @@
                 "
    MyList<? super @WldA java.lang.String>"
-                + " returnWcSuper()
    ");
+                + " returnWcSuper​()
    ");
 
         checkOutput("typeannos/BoundWithValue.html", true,
-                "
    void wcSuper(void wcSuper​(MyList<? super @WldB("
                 + "\"m\") java.lang."
@@ -301,41 +301,41 @@
                 + "typeannos\">MyList<? extends @WldB("
                 + "\"m\") java.lang.String"
-                + "> returnWcExtends()
    ");
+                + "> returnWcExtends​()
    ");
 
         // Test for receiver annotations (Receivers.java).
         checkOutput("typeannos/DefaultUnmodified.html", true,
-                "
    void withException(void withException​(@RcvrA "
                 + "DefaultUnmodified this)\n"
                 + "            throws java."
                 + "lang.Exception
    ",
 
-                "
    java.lang.String nonVoid(java.lang.String nonVoid​(@RcvrA @RcvrB"
                 + "(\"m\")"
                 + " DefaultUnmodified this)
    ",
 
-                "
    <T extends java.lang.Runnable> void accept("
+                "
    <T extends java.lang.Runnable> void accept​("
                 + "@RcvrA DefaultUnmodified this,\n"
                 + "                                           T r)\n"
                 + "                                    throws java.lang.Exception
    ");
 
         checkOutput("typeannos/PublicModified.html", true,
-                "
    public final java.lang.String nonVoid(public final java.lang.String nonVoid​("
                 + "@RcvrA PublicModified this)
    ",
 
                 "
    public final <T extends java.lang.Runnable> "
-                + "void accept(@RcvrA PublicModified this,\n"
                 + "                                                        T r)\n"
                 + "                                                 throws java.lang.Exception
    ");
 
         checkOutput("typeannos/WithValue.html", true,
-                "
    <T extends java.lang.Runnable> void accept("
+                "
    <T extends java.lang.Runnable> void accept​("
                 + "@RcvrB("
                 + "\"m\") WithValue this,\n"
@@ -343,17 +343,17 @@
                 + "                                    throws java.lang.Exception
    ");
 
         checkOutput("typeannos/WithFinal.html", true,
-                "
    java.lang.String nonVoid(java.lang.String nonVoid​(@RcvrB(\"m\") "
                 + ""
                 + "WithFinal afield)
    ");
 
         checkOutput("typeannos/WithBody.html", true,
-                "
    void field(void field​(@RcvrA WithBody this)
    ");
 
         checkOutput("typeannos/Generic2.html", true,
-                "
    void test2(void test2​(@RcvrA Generic2<X> this)
    ");
 
 
@@ -396,7 +396,7 @@
                 + "\"../typeannos/RepConstructorB.html\" title=\"annotation in typeannos"
                 + "\">@RepConstructorB @RepConstructorB\n"
-                + "RepeatingOnConstructor()
    ",
+                + "RepeatingOnConstructor​()
    ",
 
                 "
    @RepConstructorA @RepConstructorB @RepConstructorB\n"
-                + "RepeatingOnConstructor(int i,\n                       int j)
    ",
+                + "RepeatingOnConstructor​(int i,\n                       int j)
    ",
 
                 "
    @RepAllContextsA @RepAllContextsB @RepAllContextsB\n"
-                + "RepeatingOnConstructor(int i,\n                       int j,\n"
+                + "RepeatingOnConstructor​(int i,\n                       int j,\n"
                 + "                       int k)
    ",
 
-                "
    RepeatingOnConstructor(RepeatingOnConstructor​(@RepParameterA @RepParameterA Inner"
-                + "(java.lang.String parameter,\n     java.lang.String "
                 + "@RepTypeUseA @RepTypeUseA "
                 + "@RepTypeUseB ... vararg)",
 
-                "Inner("
+                "Inner​("
                 + "@RepTypeUseA @RepTypeUseA @RepTypeUseB (package private) java.lang.String\n"
                 + "test1()",
+                + "\"../typeannos/RepeatingOnMethod.html#test1--\">test1​()",
 
                 "(package private) @RepTypeUseA @RepTypeUseB java.lang.String"
                 + "\n"
                 + "test2"
-                + "()",
+                + "​()",
 
                 "(package private) @RepTypeUseA @RepTypeUseB java.lang.String"
                 + "\n"
                 + "test3"
-                + "()",
+                + "​()",
 
                 "(package private) @RepAllContextsA "
                 + "@RepAllContextsB java.lang.String\n"
                 + "test4()",
+                + "#test4--\">test4​()",
 
                 "test5"
-                + "(java.lang.String parameter,\n     java.lang.String "
                 + "@RepTypeUseA @RepTypeUseA @RepMethodA\n@RepMethodB "
-                + "@RepMethodB\njava.lang.String test1()",
+                + "@RepMethodB\njava.lang.String test1​()",
 
                 ""
                 + "@RepTypeUseA @RepTypeUseA @RepTypeUseB @RepTypeUseB java.lang.String test2()",
+                + "title=\"annotation in typeannos\">@RepTypeUseB java.lang.String test2​()",
 
                 ""
                 + "@RepMethodA @RepTypeUseA "
                 + "@RepTypeUseB @RepTypeUseB java.lang.String test3()",
+                + "\"annotation in typeannos\">@RepTypeUseB java.lang.String test3​()",
 
                 ""
                 + "@RepAllContextsA @RepAllContextsA "
                 + "@RepAllContextsB @RepAllContextsB java.lang.String test4()",
+                + "title=\"annotation in typeannos\">@RepAllContextsB java.lang.String test4​()",
 
-                "java.lang.String test5(@RepTypeUseA "
                 + "@RepTypeUseA (package private) <T> java.lang.String\n"
                 + "genericMethod(T t)",
+                + "genericMethod-T-\">genericMethod​(T t)",
 
                 "(package private) <T> java.lang.String\n"
                 + "genericMethod2(genericMethod2​(@RepTypeUseA @RepTypeUseA @RepTypeUseB (package private) java.lang.String\n"
                 + "test()",
+                + "test--\">test​()",
 
-                "java.lang.String test(@RepTypeUseA "
                 + "@RepTypeUseA @RepMethodA\n@RepMethodB "
-                + "@RepMethodB\nvoid test()");
+                + "@RepMethodB\nvoid test​()");
     }
 }
diff -r e9bbaeab6f49 -r e03f5fb3714b langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java
--- a/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java	Wed Mar 15 14:18:28 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java	Wed Mar 15 16:12:20 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363
+ * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200
  * @summary A simple test to ensure class-use files are correct.
  * @author jamieh
  * @library ../lib
@@ -134,7 +134,7 @@
             "void\nC1."
             + "methodInC1ThrowsThrowable"
-            + "()"
+            + "​()"
         );
     }