DEFAULT_NAME" +
" Link to external member gcd"},
{BUG_ID + FS + "C.html",
- "toString in class java.lang.Objecti - a param.@Deprecated" + NL + - "public class DeprecatedClassByAnnotation" + NL + + "public class DeprecatedClassByAnnotation" + NL + "extends java.lang.Object"}, {TARGET_FILE2, "
@Deprecated" + NL +
"public int field" + NL +
- "@Deprecated" + NL +
"public DeprecatedClassByAnnotation()" + NL +
- "@Deprecated" + NL +
"public void method()" + NL +
- "read in class " +
"FilterReaderreadInt in interface " +
"C4<E extends C4<E>>"
+ "public abstract class C4<E extends C4<E>>"
},
};
private static final String[][] NEGATED_TEST =
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
--- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Oct 18 16:34:42 2013 -0700
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 6786690 6820360 8025633
+ * @bug 6786690 6820360 8025633 8026567
* @summary This test verifies the nesting of definition list tags.
* @author Bhavesh Patel
* @library ../lib/
@@ -43,7 +43,7 @@
// for default value.
private static final String[][] TEST_ALL = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "public class " +
- "C1" + NL +
+ "C1" + NL +
"extends java.lang.Object" + NL + "implements java.io.Serializable
"},
{BUG_ID + FS + "pkg1" + FS + "C4.html", "" + NL +
"- Default:
" + NL + "- true
" + NL +
@@ -54,64 +54,64 @@
// enclosing comments, tags and deprecated information.
private static final String[][] TEST_CMNT_DEPR = {
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "" + NL +
- "- Since:
" + NL +
+ "- Since:
" + NL +
"- JDK1.0
" + NL + "
"},
- {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Since:
" + NL +
- "- JDK1.0
" + NL + "- See Also:
" + NL +
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Since:
" + NL +
+ "- JDK1.0
" + NL + "- See Also:
" + NL +
"" +
"C2, " + NL + "" +
"Serialized Form
"},
- {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Since:
" + NL +
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Since:
" + NL +
"- 1.4
" + NL +
- "- See Also:
" + NL + "- " +
+ "
- See Also:
" + NL + "- " +
"" +
"
setUndecorated(boolean) " + NL + "
"},
- {BUG_ID + FS + "pkg1" + FS + "C1.html", ""+ NL + "- Parameters:
" + NL + "title" +
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", ""+ NL + "- Parameters:
" + NL + "title" +
" - the titletest - boolean value" +
- "- Throws:
" + NL +
+ "
- Throws:
" + NL +
"java.lang.IllegalArgumentException - if the " +
"owner's" + NL +
" GraphicsConfiguration is not from a screen " +
"deviceHeadlessException
"},
- {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Parameters:
" + NL + "undecorated" +
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Parameters:
" + NL + "undecorated" +
" - true if no decorations are" + NL +
" to be enabled;" + NL + " false " +
- "if decorations are to be enabled.- Since:" +
+ "if decorations are to be enabled.
- Since:" +
"
" + NL + "- 1.4
" + NL +
- "- See Also:
" + NL + "- " +
+ "
- See Also:
" + NL + "- " +
"
readObject()" +
" " + NL + "
"},
- {BUG_ID + FS + "pkg1" + FS + "C1.html", "" + NL + "- Throws:
" + NL +
- "java.io.IOException- See Also:" +
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "
" + NL + "- Throws:
" + NL +
+ "java.io.IOException- See Also:" +
"
" + NL + "- " +
"
setUndecorated(boolean) " + NL + "
"},
- {BUG_ID + FS + "pkg1" + FS + "C2.html", "" + NL + "- Parameters:" +
- "
" + NL + "set - boolean- " +
+ {BUG_ID + FS + "pkg1" + FS + "C2.html", "
" + NL + "- Parameters:" +
+ "
" + NL + "set - boolean- " +
"Since:
" + NL + "- 1.4
" + NL + "
"},
- {BUG_ID + FS + "serialized-form.html", "" + NL + "- Throws:" +
+ {BUG_ID + FS + "serialized-form.html", "
" + NL + "- Throws:" +
"
" + NL + "" +
- "java.io.IOException- See Also:" +
+ "java.io.IOException
C1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"C1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" +
"IOExceptionjava.io.IOExceptionC2, " + NL + "" +
"Serialized Formtitle - the title" +
- "test - boolean valuejava.lang.IllegalArgumentException" +
" - if the owner's" + NL + " GraphicsConfiguration" +
" is not from a screen device" +
"HeadlessExceptionundecorated - true" +
" if no decorations are" + NL + " to be enabled;" + NL +
" false if decorations are to be enabled." +
- "readObject()java.io.IOExceptionsetUndecorated(boolean)" +
- "java.io.IOExceptionC1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"C1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" +
"IOExceptionjava.io.IOExceptionboolean " + - "undecorated" + NL + "
" +
"setUndecorated(boolean).setUndecorated(boolean).method" +
" in interface " +
"" +
@@ -92,7 +92,7 @@
},
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "- Overrides:
" + NL +
+ "- Overrides:
" + NL +
"method" +
" in class Parent<See Also:getRate(), " + NL +
+ "getRate(), " + NL +
"setRate(double)public final void setRate(double value)" + NL + "
public final double getRate()" + NL + "
rate" + NL +
+ "rate" + NL +
"Timeline is expected to"},
{"./" + BUG_ID + "/C.html",
- "Default value:"},
+ "Default value:"},
{"./" + BUG_ID + "/C.html",
- "Since:" + NL + "Sets the value of the property Property"},
{"./" + BUG_ID + "/C.html",
"
Gets the value of the property Property"},
{"./" + BUG_ID + "/C.html",
- "Property description:"},
+ "Property description:"},
{"./" + BUG_ID + "/C.html",
- "
setTestMethodProperty() setTestMethodProperty() public final double isPaused()" + NL + diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testLegacyTaglet/Check.java --- a/test/com/sun/javadoc/testLegacyTaglet/Check.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testLegacyTaglet/Check.java Fri Oct 18 16:34:42 2013 -0700 @@ -126,7 +126,7 @@ * @param tag the tag representation of this custom tag. */ public String toString(Tag tag) { - return "
public abstract class StringBuilderChild" + NL + + "public abstract class StringBuilderChild" + NL + "extends Object" }, diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4638588 4635809 6256068 6270645 8025633 + * @bug 4638588 4635809 6256068 6270645 8025633 8026567 * @summary Test to make sure that members are inherited properly in the Javadoc. * Verify that inheritence labels are correct. * @author jamieh @@ -72,7 +72,7 @@ // Test overriding/implementing methods with generic parameters. {BUG_ID + FS + "pkg" + FS + "BaseClass.html", - "
" +
"getAnnotation in interface " +
"" +
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
--- a/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4951228 6290760 8025633
+ * @bug 4951228 6290760 8025633 8026567
* @summary Test the case where the overriden method returns a different
* type than the method in the child class. Make sure the
* documentation is inherited but the return type isn't.
@@ -49,7 +49,7 @@
// Check return type in member summary.
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"PublicChild" +
+ "" +
"returnTypeTest()"
},
// Check return type in member detail.
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testNavigation/TestNavigation.java
--- a/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4131628 4664607 7025314 8023700 7198273 8025633
+ * @bug 4131628 4664607 7025314 8023700 7198273 8025633 8026567
* @summary Make sure the Next/Prev Class links iterate through all types.
* Make sure the navagation is 2 columns, not 3.
* @author jamieh
@@ -46,17 +46,17 @@
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html", "- Prev Class
"},
{BUG_ID + FS + "pkg" + FS + "A.html",
- "Next Class"},
+ "Next Class"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- "Prev Class"},
+ "Prev Class"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- "Next Class"},
+ "Next Class"},
{BUG_ID + FS + "pkg" + FS + "E.html",
- "Prev Class"},
+ "Prev Class"},
{BUG_ID + FS + "pkg" + FS + "E.html",
- "Next Class"},
+ "Next Class"},
{BUG_ID + FS + "pkg" + FS + "I.html",
- "Prev Class"},
+ "Prev Class"},
{BUG_ID + FS + "pkg" + FS + "I.html", "- Next Class
"},
// Test for 4664607
{BUG_ID + FS + "pkg" + FS + "I.html",
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
--- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633
+ * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567
* @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.
@@ -53,7 +53,7 @@
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin"},
//Make sure enum signature is correct.
{BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum " +
- "Coin" + NL +
+ "Coin" + NL +
"extends java.lang.Enum<Coin>
"
},
@@ -62,7 +62,7 @@
" "},
//Detail for enum constant
{BUG_ID + FS + "pkg" + FS + "Coin.html",
- "Dime"},
+ "Dime"},
//Automatically insert documentation for values() and valueOf().
{BUG_ID + FS + "pkg" + FS + "Coin.html",
"Returns an array containing the constants of this enum type,"},
@@ -80,11 +80,11 @@
"Class TypeParameters<E>"},
//Check class type parameters section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "- Type Parameters:
" + NL + "E - " +
+ "- Type Parameters:
" + NL + "E - " +
"the type parameter for this class."},
//Type parameters in @see/@link
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "" + NL + "- See Also:
" + NL + "- " +
+ "
" + NL + "- See Also:
" + NL + "- " +
"" +
"
TypeParameters " + NL + "
"},
//Method that uses class type parameter.
@@ -93,7 +93,7 @@
"parameter in TypeParameters\">E param)"},
//Method type parameter section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "Type Parameters:" + NL + "T - This is the first " +
+ "Type Parameters:" + NL + "T - This is the first " +
"type parameter.V - This is the second type " +
"parameter."},
//Signature of method with type parameters
@@ -118,7 +118,7 @@
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
- "public class TypeParameterSubClass<T extends " +
+ "public class TypeParameterSubClass<T extends " +
"java.lang.String>" + NL + "extends " +
"" +
"TypeParameterSuperClass<T>
"},
@@ -168,7 +168,7 @@
"Annotation Type AnnotationType"},
//Make sure the signature is correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "public @interface AnnotationType"},
+ "public @interface AnnotationType"},
//Make sure member summary headings are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"Required Element Summary
"},
@@ -198,7 +198,7 @@
"optional" +
"=\"Class Annotation\"," + NL +
" " +
- "required=1994)" + NL + "public class " +
+ "required=1994)" + NL + "public class " +
"AnnotationTypeUsage" + NL + "extends java.lang.Object"},
//FIELD
@@ -299,7 +299,7 @@
{BUG_ID + FS + "pkg1" + FS + "B.html",
"@A"},
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "public interface B
"},
+ "public interface B"},
//==============================================================
@@ -320,7 +320,7 @@
"Foo "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "ClassUseTest1<T extends " +
"Foo" +
" & " +
@@ -333,8 +333,8 @@
"pkg2\">Foo "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "ClassUseTest1." +
- "ClassUseTest1." +
+ "method" +
"(T t) "
},
@@ -372,7 +372,7 @@
""
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "ClassUseTest1<T extends " +
"Foo" +
" & " +
@@ -386,8 +386,8 @@
""
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "" +
- "ClassUseTest1." +
+ "ClassUseTest1.method" +
"(T t) "
},
@@ -401,7 +401,7 @@
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "ClassUseTest2<T extends " +
"" +
"ParamTest<" +
@@ -415,8 +415,8 @@
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "ClassUseTest2." +
- "ClassUseTest2." +
+ "method" +
"(T t) "
},
@@ -456,7 +456,7 @@
"Foo3 "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "ClassUseTest2<T extends " +
"" +
"ParamTest<" +
@@ -470,8 +470,8 @@
""
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "ClassUseTest2." +
- "ClassUseTest2." +
+ "method" +
"(T t) "
},
@@ -500,7 +500,7 @@
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "ClassUseTest3<T extends " +
"" +
"ParamTest2<java.util.List<? extends " +
@@ -515,8 +515,8 @@
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "ClassUseTest3" +
- ".ClassUseTest3" +
+ ".method(T t) "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
@@ -538,7 +538,7 @@
""
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "ClassUseTest3<T extends " +
"" +
"ParamTest2<java.util.List<? extends " +
@@ -552,8 +552,8 @@
"pkg2\">Foo4 "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "ClassUseTest3." +
- "ClassUseTest3." +
+ "method(T t)" +
" "
},
@@ -586,8 +586,8 @@
"Method and Description " + NL +
"" + NL + "" + NL + "" + NL +
"voidClassUseTest3." +
- "ClassUseTest3." +
+ "method(java." +
"util.Set<Foo4> p) " + NL +
@@ -663,14 +663,14 @@
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "" +
+ "" +
"method(Vector<Object>)"
},
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "" +
+ "" +
"method(Vector<Object>)"
},
};
@@ -679,7 +679,7 @@
// ENUM TESTING
//=================================
//NO constructor section
- {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary"},
+ {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary
"},
//=================================
// TYPE PARAMETER TESTING
//=================================
@@ -698,25 +698,25 @@
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationTypeUndocumented(optional=\"Class Annotation\"," + NL +
" required=1994)" + NL +
- "public class AnnotationTypeUsage- extends java.lang.Object
"},
+ "public class AnnotationTypeUsage- extends java.lang.Object
"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationTypeUndocumented(optional=\"Field Annotation\"," + NL +
" required=1994)" + NL +
- "public int field"},
+ "public int field"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationTypeUndocumented(optional=\"Constructor Annotation\"," + NL +
" required=1994)" + NL +
- "public AnnotationTypeUsage()"},
+ "public AnnotationTypeUsage()"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationTypeUndocumented(optional=\"Method Annotation\"," + NL +
" required=1994)" + NL +
- "public void method()"},
+ "public void method()"},
//=================================
// Make sure annotation types do not
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4368820 8025633
+ * @bug 4368820 8025633 8026567
* @summary Inherited comment should link directly to member, not just
* class
* @author jamieh
@@ -46,7 +46,7 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Description copied from class: " +
+ "Description copied from class: " +
"" +
"BaseClass"
}
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4634891
+ * @bug 4634891 8026567
* @summary Determine if overriden methods are properly documented when
* -protected (default) visibility flag is used.
* @author jamieh
@@ -40,12 +40,12 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "- Overrides:
" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"" +
"publicMethod in class " +
"BaseClass- Overrides:
" + NL +
+ "- Overrides:
" + NL +
"" +
"publicMethod in class " +
"BaseClass- Overrides:
" + NL +
+ "- Overrides:
" + NL +
"" +
"packagePrivateMethod in class " +
"BaseClass- Overrides:
" + NL +
+ "- Overrides:
" + NL +
""},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "- Overrides:
" + NL +
+ "- Overrides:
" + NL +
""},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "- Overrides:
" + NL +
+ "- Overrides:
" + NL +
""},
};
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4634891
+ * @bug 4634891 8026567
* @summary Determine if overriden methods are properly documented when
* -protected (default) visibility flag is used.
* @author jamieh
@@ -40,18 +40,18 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "- Overrides:
" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Overrides:" + NL +
+ "- Overrides:
" + NL +
"Deprecated." + NL +
- "This package is Deprecated." +
+ "Deprecated." + NL +
+ "This package is Deprecated." +
""
},
{BUG_ID + "-1" + FS + "deprecated-list.html",
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
--- a/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4802275 4967243
+ * @bug 4802275 4967243 8026567
* @summary Make sure param tags are still printed even though they do not
* match up with a real parameters.
* Make sure inheritDoc cannot be used in an invalid param tag.
@@ -48,12 +48,12 @@
private static final String[][] TEST = {
//Regular param tags.
{BUG_ID + FS + "pkg" + FS + "C.html",
- "Parameters:" + NL + "param1 - testing 1 2 3.param1 - testing 1 2 3.param2 - testing 1 2 3."
},
//Param tags that don't match with any real parameters.
{BUG_ID + FS + "pkg" + FS + "C.html",
- "Parameters:" + NL + "p1 - testing 1 2 3.p1 - testing 1 2 3.p2 - testing 1 2 3."
},
//{@inherit} doc misuse does not cause doclet to throw exception.
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
--- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4780441 4874845 4978816 8014017 8016328 8025633
+ * @bug 4780441 4874845 4978816 8014017 8016328 8025633 8026567
* @summary Make sure that when the -private flag is not used, members
* inherited from package private class are documented in the child.
*
@@ -112,12 +112,12 @@
private static final String[][] NEGATED_TEST1 = {
// Should not document that a method overrides method from private class.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "Overrides:"},
+ "Overrides:"},
// Should not document that a method specified by private interface.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "Specified by:"},
+ "Specified by:"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
- "Specified by:"},
+ "Specified by:"},
// Should not mention that any documentation was copied.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
"Description copied from"},
@@ -139,7 +139,7 @@
//Do not inherit private interface method with generic parameters.
//This method has been implemented.
{BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
- "hello"},
+ "hello"},
};
// Test output when -private flag is used.
@@ -176,14 +176,14 @@
},
// Should document that a method overrides method from private class.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "- Overrides:
" + NL +
+ "- Overrides:
" + NL +
"" +
"methodOverridenFromParent in class " +
"" +
"PrivateParent- Specified by:
" + NL +
+ "- Specified by:
" + NL +
"" +
"methodInterface in interface " +
"" +
@@ -227,11 +227,11 @@
//Since private flag is used, we can document that private interface method
//with generic parameters has been implemented.
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
- "Description copied from interface: " +
+ "Description copied from interface: " +
"I"},
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
- "- Specified by:
" + NL +
+ "- Specified by:
" + NL +
"hello" +
" in interface " +
"I" +
@@ -240,14 +240,14 @@
//Make sure when no modifier appear in the class signature, the
//signature is displayed correctly without extra space at the beginning.
{BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
- "class PrivateParent"},
+ "class PrivateParent"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "public class PublicChild"},
+ "public class PublicChild"},
};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
- " class PrivateParent"},
+ " class PrivateParent"},
};
/**
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testProfiles/TestProfiles.java
--- a/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8006124 8009684 8016921 8023700 8024096 8008164
+ * @bug 8006124 8009684 8016921 8023700 8024096 8008164 8026567
* @summary Test javadoc support for profiles.
* @author Bhavesh Patel, Evgeniya Stepanova
* @library ../lib/
@@ -122,17 +122,17 @@
},
{PROFILE_BUG_ID + FS + "deprecated-list.html",""
+ "pkg2.Class1Pkg2"
- + NL +"Class1Pkg2. This class is deprecated"
+ + NL +"Class1Pkg2. This class is deprecated"
},
//Test deprecated package in profile
{PROFILE_BUG_ID + FS + "deprecated-list.html"," "
+ "pkgDeprecated"
- + NL +"This package is Deprecated."
+ + NL +"This package is Deprecated."
+ " Use pkg1."
},
{PROFILE_BUG_ID + FS + "pkgDeprecated" + FS + "package-summary.html",
- "Deprecated."
- + NL + "This package is Deprecated."
+ "Deprecated."
+ + NL + "This package is Deprecated."
+ " Use pkg1."
},
// need to add teststring when JDK-8015496 will be fixed
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
--- a/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8006124 8009684 8015663 8015496
+ * @bug 8006124 8009684 8015663 8015496 8026567
* @summary Test javadoc options support for profiles.
* @author Evgeniya Stepanova
* @library ../lib/
@@ -87,7 +87,7 @@
{PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html",
"pkgDeprecated
" + NL + "" +
- "Deprecated."
+ "Deprecated."
}
};
private static final String[][] PROFILES_CONFIGURATION_NEGATED_TEST = {
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
--- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Oct 18 16:34:42 2013 -0700
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 6802694 8025633
+ * @bug 6802694 8025633 8026567
* @summary This test verifies deprecation info in serialized-form.html.
* @author Bhavesh Patel
* @library ../lib/
@@ -42,29 +42,29 @@
// display the inline comments, tags and deprecation information if any.
private static final String[][] TEST_CMNT_DEPR = {
{BUG_ID + FS + "serialized-form.html", "" + NL +
- "- Throws:
" + NL + "" +
- "java.io.IOException- See Also:" +
+ "
- Throws:
" + NL + " " +
+ "java.io.IOException- See Also:" +
"
" + NL + "- " +
"
C1.setUndecorated(boolean) " + NL + "
"},
- {BUG_ID + FS + "serialized-form.html", "Deprecated." +
- " As of JDK version 1.5, replaced by" + NL +
+ {BUG_ID + FS + "serialized-form.html", "Deprecated." +
+ " As of JDK version 1.5, replaced by" + NL +
" " +
"setUndecorated(boolean)." + NL +
"This field indicates whether the C1 " +
"is undecorated." + NL + " " + NL +
- "" + NL + "- Since:
" + NL +
- "- 1.4
" + NL + "- See Also:" +
+ "
" + NL + "- Since:
" + NL +
+ "- 1.4
" + NL + "- See Also:" +
"
" + NL + "- " +
"
C1.setUndecorated(boolean) " + NL + "
"},
- {BUG_ID + FS + "serialized-form.html", "Deprecated." +
- " As of JDK version 1.5, replaced by" + NL +
+ {BUG_ID + FS + "serialized-form.html", "Deprecated." +
+ " As of JDK version 1.5, replaced by" + NL +
" " +
"setUndecorated(boolean).
" + NL +
"Reads the object stream." + NL +
- "" + NL + "- Throws:
" + NL + "" +
+ "" + NL + "- Throws:
" + NL + "" +
"IOExceptionjava.io.IOException
"},
- {BUG_ID + FS + "serialized-form.html", "Deprecated." +
+ {BUG_ID + FS + "serialized-form.html", "Deprecated." +
"
" + NL + "" +
"The name for this class."}};
@@ -73,12 +73,12 @@
// information if any.
private static final String[][] TEST_NOCMNT = {
{BUG_ID + FS + "serialized-form.html", "boolean undecorated
" + NL +
- "Deprecated. " +
+ "Deprecated. " +
"As of JDK version 1.5, replaced by" + NL +
" " +
"setUndecorated(boolean)." + NL + ""},
- {BUG_ID + FS + "serialized-form.html", "" +
- "Deprecated. As of JDK version" +
+ {BUG_ID + FS + "serialized-form.html", "" +
+ "Deprecated. As of JDK version" +
" 1.5, replaced by" + NL +
" " +
"setUndecorated(boolean)." + NL + ""}};
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
--- a/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Oct 18 16:34:42 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, 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 4695326 4750173 4920381
+ * @bug 4695326 4750173 4920381 8026567
* @summary Test the declarartion of simple tags using -tag. Verify that
* "-tag name" is a shortcut for "-tag name:a:Name:". Also verity that
* you can escape the ":" character with a back slash so that it is not
@@ -42,13 +42,13 @@
private static final String[][] TEST =
new String[][] {
{"./" + BUG_ID + "/C.html",
- "Todo:"},
+ "Todo:"},
{"./" + BUG_ID + "/C.html",
- "EJB Beans:"},
+ "EJB Beans:"},
{"./" + BUG_ID + "/C.html",
- "Regular Tag:"},
+ "Regular Tag:"},
{"./" + BUG_ID + "/C.html",
- "Back-Slash-Tag:"},
+ "Back-Slash-Tag:"},
};
private static final String[] ARGS = new String[] {
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java
--- a/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8008768
+ * @bug 8008768 8026567
* @summary Using {@inheritDoc} in simple tag defined via -tag fails
* @library ../lib/
* @build JavadocTester TestSimpleTagInherit
@@ -46,10 +46,10 @@
//Input for string search tests.
private static final String[][] TEST = {
{ BUG_ID + FS + "p" + FS + "TestClass.html",
- "- Custom:
" + NL +
+ "- Custom:
" + NL +
"- doc for BaseClass class
" },
{ BUG_ID + FS + "p" + FS + "TestClass.html",
- "- Custom:
" + NL +
+ "- Custom:
" + NL +
"- doc for BaseClass method
" }
};
private static final String[][] NEGATED_TEST = NO_TEST;
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testSinceTag/TestSinceTag.java
--- a/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7180906
+ * @bug 7180906 8026567
* @summary Test to make sure that the since tag works correctly
* @author Bhavesh Patel
* @library ../lib/
@@ -48,11 +48,11 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "C1.html",
- "" + NL + "- Since:
" + NL +
+ "" + NL + "- Since:
" + NL +
"- JDK1.0
"
},
{BUG_ID + FS + "serialized-form.html",
- "" + NL + "- Since:
" + NL +
+ "" + NL + "- Since:
" + NL +
"- 1.4
"
}
};
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testTagOutput/TestTagOutput.java
--- a/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Oct 18 16:34:42 2013 -0700
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 8026370
+ * @bug 8026370 8026567
* @summary This test checks the generated tag output.
* @author Bhavesh Patel
* @library ../lib/
@@ -38,15 +38,15 @@
private static final String BUG_ID = "8026370";
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html",
- "Deprecated. "},
+ "Deprecated. "},
{BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html",
- "Deprecated. " +
- "Do not use this."}};
+ "Deprecated. " +
+ "Do not use this."}};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html",
- "Deprecated." +
- " "}};
+ "Deprecated." +
+ " "}};
private static final String[] ARGS =
new String[] {
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testTaglets/TestTaglets.java
--- a/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Oct 18 16:34:42 2013 -0700
@@ -55,7 +55,7 @@
//Input for string search tests.
private static final String[][] TEST_4654308 = new String[][] {
- {"4654308" + FS + "C.html", "Foo:" +
+ {"4654308" + FS + "C.html", "Foo:" +
"- my only method is
here" +
"
"}
};
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testTaglets/taglets/Foo.java
--- a/test/com/sun/javadoc/testTaglets/taglets/Foo.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testTaglets/taglets/Foo.java Fri Oct 18 16:34:42 2013 -0700
@@ -50,7 +50,7 @@
*/
public Content getTagletOutput(Tag tag, TagletWriter writer) {
ArrayList inlineTags = new ArrayList();
- inlineTags.add(new TextTag(tag.holder(), "- Foo:
- "));
+ inlineTags.add(new TextTag(tag.holder(), "
- Foo:
- "));
inlineTags.addAll(Arrays.asList(tag.inlineTags()));
inlineTags.add(new TextTag(tag.holder(), "
"));
return writer.commentTagsToOutput(tag,
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
--- a/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Oct 18 16:34:42 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, 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 4530727
+ * @bug 4530727 8026567
* @summary When an exception is declared in the method signature but
* not documented with a throws tag, we generate a link to it in the
* throws section. Make sure that the link is below a Throws heading.
@@ -38,7 +38,7 @@
private static final String BUG_ID = "4530727";
private static final String[][] TEST = {
- {BUG_ID + FS + "C.html", "- Throws:"}
+ {BUG_ID + FS + "C.html", "
- Throws:"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS = new String[] {
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
--- a/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8005091 8009686 8025633
+ * @bug 8005091 8009686 8025633 8026567
* @summary Make sure that type annotations are displayed correctly
* @author Bhavesh Patel
* @library ../lib/
@@ -74,12 +74,12 @@
// Test for type annotations on Class Parameters (ClassParameters.java).
{BUG_ID + FS + "typeannos" + FS + "ExtendsBound.html",
- "class ExtendsBound<K extends ExtendsBound<K extends @ClassParamA java.lang.String>"
},
{BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html",
- "
class ExtendsGeneric<K extends " +
+ "class ExtendsGeneric<K extends " +
"@ClassParamA Unannotated< java.lang.String>>"
},
{BUG_ID + FS + "typeannos" + FS + "TwoBounds.html",
- "class TwoBounds<K extends class TwoBounds<K extends " +
"@ClassParamA java.lang.String,V extends @ClassParamB" +
" java.lang.String>"
},
{BUG_ID + FS + "typeannos" + FS + "Complex1.html",
- "class Complex1<K extends Complex1<K extends " +
"@ClassParamA java.lang.String & java.lang.Runnable>"
},
{BUG_ID + FS + "typeannos" + FS + "Complex2.html",
- "class Complex2<K extends java.lang." +
+ "class Complex2<K extends java.lang." +
"String & @ClassParamB java.lang.Runnable>"
},
{BUG_ID + FS + "typeannos" + FS + "ComplexBoth.html",
- "class ComplexBoth<K extends ComplexBoth<K extends @ClassParamA java.lang.String & @ClassParamA" +
diff -r 7de97abc4a5c -r 130b8c0e570e test/com/sun/javadoc/testValueTag/TestValueTag.java
--- a/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Oct 18 15:03:34 2013 -0700
+++ b/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Oct 18 16:34:42 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4764045 8004825
+ * @bug 4764045 8004825 8026567
* @summary This test ensures that the value tag works in all
* use cases. The explainations for each test case are written below.
* @author jamieh
@@ -94,7 +94,7 @@
"Result: \"Test 17 passes\""},
//Test @value tag used with custom tag.
{BUG_ID + FS + "pkg1" + FS + "CustomTagUsage.html",
- "- Todo:
" + NL +
+ "- Todo:
" + NL +
"- the value of this constant is 55.
"},
//Test @value errors printed dues to invalid use or when used with
//non-constant or with bad references.