annoTypes,
* @param contentTree the content tree that will be printed
* @throws DocFileIOException if there is a problem while writing the document
*/
- public abstract void printDocument(Content contentTree) throws DocFileIOException;
+ void printDocument(Content contentTree) throws DocFileIOException;
/**
* Gets the package summary tree.
* @param summaryContentTree the content tree representing the package summary
* @return a content tree for the package summary
*/
- public abstract Content getPackageSummary(Content summaryContentTree);
-
+ Content getPackageSummary(Content summaryContentTree);
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
index 21c28f31bbe..9a882e4c7fe 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
@@ -46,8 +46,8 @@ public interface PropertyWriter {
* @param memberDetailsTree the content tree representing member details
* @return content tree for the property details header
*/
- public Content getPropertyDetailsTreeHeader(TypeElement typeElement,
- Content memberDetailsTree);
+ Content getPropertyDetailsTreeHeader(TypeElement typeElement,
+ Content memberDetailsTree);
/**
* Get the property documentation tree header.
@@ -56,8 +56,8 @@ public Content getPropertyDetailsTreeHeader(TypeElement typeElement,
* @param propertyDetailsTree the content tree representing property details
* @return content tree for the property documentation header
*/
- public Content getPropertyDocTreeHeader(ExecutableElement property,
- Content propertyDetailsTree);
+ Content getPropertyDocTreeHeader(ExecutableElement property,
+ Content propertyDetailsTree);
/**
* Get the signature for the given property.
@@ -65,7 +65,7 @@ public Content getPropertyDocTreeHeader(ExecutableElement property,
* @param property the property being documented
* @return content tree for the property signature
*/
- public Content getSignature(ExecutableElement property);
+ Content getSignature(ExecutableElement property);
/**
* Add the deprecated output for the given property.
@@ -73,7 +73,7 @@ public Content getPropertyDocTreeHeader(ExecutableElement property,
* @param property the property being documented
* @param propertyDocTree content tree to which the deprecated information will be added
*/
- public void addDeprecated(ExecutableElement property, Content propertyDocTree);
+ void addDeprecated(ExecutableElement property, Content propertyDocTree);
/**
* Add the comments for the given property.
@@ -81,7 +81,7 @@ public Content getPropertyDocTreeHeader(ExecutableElement property,
* @param property the property being documented
* @param propertyDocTree the content tree to which the comments will be added
*/
- public void addComments(ExecutableElement property, Content propertyDocTree);
+ void addComments(ExecutableElement property, Content propertyDocTree);
/**
* Add the tags for the given property.
@@ -89,7 +89,7 @@ public Content getPropertyDocTreeHeader(ExecutableElement property,
* @param property the property being documented
* @param propertyDocTree the content tree to which the tags will be added
*/
- public void addTags(ExecutableElement property, Content propertyDocTree);
+ void addTags(ExecutableElement property, Content propertyDocTree);
/**
* Get the property details tree.
@@ -98,7 +98,7 @@ public Content getPropertyDocTreeHeader(ExecutableElement property,
* @param memberDetailsTree the content tree representing member details
* @return content tree for the property details
*/
- public Content getPropertyDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
+ Content getPropertyDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
/**
* Get the property documentation.
@@ -106,12 +106,12 @@ public Content getPropertyDocTreeHeader(ExecutableElement property,
* @param propertyDocTree the content tree representing property documentation
* @return content tree for the property documentation
*/
- public Content getPropertyDoc(Content propertyDocTree);
+ Content getPropertyDoc(Content propertyDocTree);
/**
* Gets the member header tree.
*
* @return a content tree for the member header
*/
- public Content getMemberTreeHeader();
+ Content getMemberTreeHeader();
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java
index 2be96d48037..ffa1ffa5cf2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java
@@ -50,21 +50,21 @@ public interface SerializedFormWriter {
* @param header the header to write.
* @return the header content tree
*/
- public Content getHeader(String header);
+ Content getHeader(String header);
/**
* Get the serialized form summaries header.
*
* @return the serialized form summary header tree
*/
- public Content getSerializedSummariesHeader();
+ Content getSerializedSummariesHeader();
/**
* Get the package serialized form header.
*
* @return the package serialized form header tree
*/
- public Content getPackageSerializedHeader();
+ Content getPackageSerializedHeader();
/**
* Add the serialized tree per package to the serialized summaries tree.
@@ -72,7 +72,7 @@ public interface SerializedFormWriter {
* @param serializedSummariesTree the serialized tree to which the package serialized tree will be added
* @param packageSerializedTree the serialized tree per package that needs to be added
*/
- public void addPackageSerializedTree(Content serializedSummariesTree, Content packageSerializedTree);
+ void addPackageSerializedTree(Content serializedSummariesTree, Content packageSerializedTree);
/**
* Get the given package header.
@@ -80,14 +80,14 @@ public interface SerializedFormWriter {
* @param packageName the package header to write
* @return a content tree for the package header
*/
- public Content getPackageHeader(String packageName);
+ Content getPackageHeader(String packageName);
/**
* Get the serialized class header.
*
* @return a content tree for the serialized class header
*/
- public Content getClassSerializedHeader();
+ Content getClassSerializedHeader();
/**
* Get the heading for the serializable class.
@@ -95,14 +95,14 @@ public interface SerializedFormWriter {
* @param typeElement the class being processed
* @return a content tree for the class heading
*/
- public Content getClassHeader(TypeElement typeElement);
+ Content getClassHeader(TypeElement typeElement);
/**
* Get the serial UID info header.
*
* @return a content tree for the serial uid info header
*/
- public Content getSerialUIDInfoHeader();
+ Content getSerialUIDInfoHeader();
/**
* Adds the serial UID info.
@@ -111,15 +111,14 @@ public interface SerializedFormWriter {
* @param serialUID the serial UID to print.
* @param serialUidTree the serial UID tree to which the content will be added.
*/
- public void addSerialUIDInfo(String header, String serialUID,
- Content serialUidTree);
+ void addSerialUIDInfo(String header, String serialUID, Content serialUidTree);
/**
* Get the class serialize content header.
*
* @return a content tree for the class serialize content header
*/
- public Content getClassContentHeader();
+ Content getClassContentHeader();
/**
* Return an instance of a SerialFieldWriter for a class.
@@ -127,7 +126,7 @@ public void addSerialUIDInfo(String header, String serialUID,
* @param typeElement the class
* @return an instance of a SerialFieldWriter.
*/
- public SerialFieldWriter getSerialFieldWriter(TypeElement typeElement);
+ SerialFieldWriter getSerialFieldWriter(TypeElement typeElement);
/**
* Return an instance of a SerialMethodWriter for a class.
@@ -135,19 +134,19 @@ public void addSerialUIDInfo(String header, String serialUID,
* @param typeElement the class
* @return an instance of a SerialMethodWriter.
*/
- public SerialMethodWriter getSerialMethodWriter(TypeElement typeElement);
+ SerialMethodWriter getSerialMethodWriter(TypeElement typeElement);
/**
* Add the serialized content to the body content.
*
* @param serializedTreeContent content for serialized data
*/
- public void addSerializedContent(Content serializedTreeContent);
+ void addSerializedContent(Content serializedTreeContent);
/**
* Add the footer.
*/
- public void addFooter();
+ void addFooter();
/**
* Print the serialized form document.
@@ -155,7 +154,7 @@ public void addSerialUIDInfo(String header, String serialUID,
* @param serializedTree the content tree that will be printed
* @throws DocFileIOException if there is a problem while writing the document
*/
- public abstract void printDocument(Content serializedTree) throws DocFileIOException;
+ void printDocument(Content serializedTree) throws DocFileIOException;
/**
* Gets the member tree.
@@ -163,19 +162,19 @@ public void addSerialUIDInfo(String header, String serialUID,
* @param contentTree the tree used to generate the complete member tree
* @return a content tree for the member
*/
- public Content getMemberTree(Content contentTree);
+ Content getMemberTree(Content contentTree);
/**
* Write the serialized form for a given field.
*/
- public interface SerialFieldWriter {
+ interface SerialFieldWriter {
/**
* Get the serializable field header.
*
* @return serialized fields header content tree
*/
- public Content getSerializableFieldsHeader();
+ Content getSerializableFieldsHeader();
/**
* Get the field content header.
@@ -183,7 +182,7 @@ public interface SerialFieldWriter {
* @param isLastContent true if this is the last content to be documented
* @return fields header content tree
*/
- public Content getFieldsContentHeader(boolean isLastContent);
+ Content getFieldsContentHeader(boolean isLastContent);
/**
* Get the fields content.
@@ -192,7 +191,7 @@ public interface SerialFieldWriter {
* @param contentTree content tree to which the heading will be added
* @return serializable fields content tree
*/
- public Content getSerializableFields(String heading, Content contentTree);
+ Content getSerializableFields(String heading, Content contentTree);
/**
* Adds the deprecated information for this member.
@@ -200,7 +199,7 @@ public interface SerialFieldWriter {
* @param field the field to document.
* @param contentTree content tree to which the deprecated information will be added
*/
- public void addMemberDeprecatedInfo(VariableElement field, Content contentTree);
+ void addMemberDeprecatedInfo(VariableElement field, Content contentTree);
/**
* Adds the description text for this member.
@@ -208,7 +207,7 @@ public interface SerialFieldWriter {
* @param field the field to document
* @param contentTree content tree to which the member description will be added
*/
- public void addMemberDescription(VariableElement field, Content contentTree);
+ void addMemberDescription(VariableElement field, Content contentTree);
/**
* Adds the description text for this member represented by the tag.
@@ -217,7 +216,7 @@ public interface SerialFieldWriter {
* @param serialFieldTag the field to document (represented by tag)
* @param contentTree content tree to which the member description will be added
*/
- public void addMemberDescription(VariableElement field, DocTree serialFieldTag, Content contentTree);
+ void addMemberDescription(VariableElement field, DocTree serialFieldTag, Content contentTree);
/**
* Adds the tag information for this member.
@@ -225,7 +224,7 @@ public interface SerialFieldWriter {
* @param field the field to document
* @param contentTree content tree to which the member tags will be added
*/
- public void addMemberTags(VariableElement field, Content contentTree);
+ void addMemberTags(VariableElement field, Content contentTree);
/**
* Adds the member header.
@@ -237,8 +236,8 @@ public interface SerialFieldWriter {
* @param fieldName the name of the field
* @param contentTree content tree to which the member header will be added
*/
- public void addMemberHeader(TypeElement fieldType, String fieldTypeStr,
- String fieldDimensions, String fieldName, Content contentTree);
+ void addMemberHeader(TypeElement fieldType, String fieldTypeStr, String fieldDimensions,
+ String fieldName, Content contentTree);
/**
* Adds the member header.
@@ -247,7 +246,7 @@ public void addMemberHeader(TypeElement fieldType, String fieldTypeStr,
* @param fieldName the name of the field
* @param contentTree content tree to which the member header will be added
*/
- public void addMemberHeader(TypeMirror fieldType, String fieldName, Content contentTree);
+ void addMemberHeader(TypeMirror fieldType, String fieldName, Content contentTree);
/**
* Check to see if overview details should be printed. If
@@ -258,20 +257,20 @@ public void addMemberHeader(TypeElement fieldType, String fieldTypeStr,
* @param field the field to check overview details for
* @return true if overview details need to be printed
*/
- public boolean shouldPrintOverview(VariableElement field);
+ boolean shouldPrintOverview(VariableElement field);
}
/**
* Write the serialized form for a given field.
*/
- public interface SerialMethodWriter {
+ interface SerialMethodWriter {
/**
* Get the serializable method header.
*
* @return serializable methods content tree
*/
- public Content getSerializableMethodsHeader();
+ Content getSerializableMethodsHeader();
/**
* Get the method content header.
@@ -279,7 +278,7 @@ public interface SerialMethodWriter {
* @param isLastContent true if this is the last content to be documented
* @return methods content tree
*/
- public Content getMethodsContentHeader(boolean isLastContent);
+ Content getMethodsContentHeader(boolean isLastContent);
/**
* Write the given heading.
@@ -288,7 +287,7 @@ public interface SerialMethodWriter {
* @param serializableMethodTree content tree which will be added
* @return serializable methods content tree
*/
- public Content getSerializableMethods(String heading, Content serializableMethodTree);
+ Content getSerializableMethods(String heading, Content serializableMethodTree);
/**
* Write a warning that no serializable methods exist.
@@ -296,7 +295,7 @@ public interface SerialMethodWriter {
* @param msg the warning to print
* @return no customization message tree
*/
- public Content getNoCustomizationMsg(String msg);
+ Content getNoCustomizationMsg(String msg);
/**
* Adds the header.
@@ -304,7 +303,7 @@ public interface SerialMethodWriter {
* @param member the member to write the header for
* @param methodsContentTree content tree to which the header will be added
*/
- public void addMemberHeader(ExecutableElement member, Content methodsContentTree);
+ void addMemberHeader(ExecutableElement member, Content methodsContentTree);
/**
* Adds the deprecated information for this member.
@@ -313,7 +312,7 @@ public interface SerialMethodWriter {
* @param methodsContentTree content tree to which the deprecated
* information will be added
*/
- public void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContentTree);
+ void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContentTree);
/**
* Adds the description for this member.
@@ -322,7 +321,7 @@ public interface SerialMethodWriter {
* @param methodsContentTree content tree to which the member
* information will be added
*/
- public void addMemberDescription(ExecutableElement member, Content methodsContentTree);
+ void addMemberDescription(ExecutableElement member, Content methodsContentTree);
/**
* Adds the tag information for this member.
@@ -331,6 +330,6 @@ public interface SerialMethodWriter {
* @param methodsContentTree content tree to which the tags
* information will be added
*/
- public void addMemberTags(ExecutableElement member, Content methodsContentTree);
+ void addMemberTags(ExecutableElement member, Content methodsContentTree);
}
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java
index f3673f8ff0c..1b9d27a13fd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WriterFactory.java
@@ -50,7 +50,7 @@ public interface WriterFactory {
* @return the writer for the constant summary. Return null if this
* writer is not supported by the doclet.
*/
- public abstract ConstantsSummaryWriter getConstantsSummaryWriter();
+ ConstantsSummaryWriter getConstantsSummaryWriter();
/**
* Return the writer for the package summary.
@@ -59,7 +59,7 @@ public interface WriterFactory {
* @return the writer for the package summary. Return null if this
* writer is not supported by the doclet.
*/
- public abstract PackageSummaryWriter getPackageSummaryWriter(PackageElement packageElement);
+ PackageSummaryWriter getPackageSummaryWriter(PackageElement packageElement);
/**
* Return the writer for the module summary.
@@ -68,7 +68,7 @@ public interface WriterFactory {
* @return the writer for the module summary. Return null if this
* writer is not supported by the doclet.
*/
- public abstract ModuleSummaryWriter getModuleSummaryWriter(ModuleElement mdle);
+ ModuleSummaryWriter getModuleSummaryWriter(ModuleElement mdle);
/**
* Return the writer for a class.
@@ -78,7 +78,7 @@ public interface WriterFactory {
* @return the writer for the class. Return null if this
* writer is not supported by the doclet.
*/
- public abstract ClassWriter getClassWriter(TypeElement typeElement, ClassTree classTree);
+ ClassWriter getClassWriter(TypeElement typeElement, ClassTree classTree);
/**
* Return the writer for an annotation type.
@@ -87,7 +87,7 @@ public interface WriterFactory {
* @return the writer for the annotation type. Return null if this
* writer is not supported by the doclet.
*/
- public abstract AnnotationTypeWriter getAnnotationTypeWriter(TypeElement annotationType);
+ AnnotationTypeWriter getAnnotationTypeWriter(TypeElement annotationType);
/**
* Return the method writer for a given class.
@@ -96,7 +96,7 @@ public interface WriterFactory {
* @return the method writer for the give class. Return null if this
* writer is not supported by the doclet.
*/
- public abstract MethodWriter getMethodWriter(ClassWriter classWriter);
+ MethodWriter getMethodWriter(ClassWriter classWriter);
/**
* Return the annotation type field writer for a given annotation type.
@@ -106,9 +106,8 @@ public interface WriterFactory {
* @return the member writer for the given annotation type. Return null if
* this writer is not supported by the doclet.
*/
- public abstract AnnotationTypeFieldWriter
- getAnnotationTypeFieldWriter(
- AnnotationTypeWriter annotationTypeWriter);
+ AnnotationTypeFieldWriter getAnnotationTypeFieldWriter(
+ AnnotationTypeWriter annotationTypeWriter);
/**
* Return the annotation type optional member writer for a given annotation
@@ -119,9 +118,8 @@ public interface WriterFactory {
* @return the member writer for the given annotation type. Return null if
* this writer is not supported by the doclet.
*/
- public abstract AnnotationTypeOptionalMemberWriter
- getAnnotationTypeOptionalMemberWriter(
- AnnotationTypeWriter annotationTypeWriter);
+ AnnotationTypeOptionalMemberWriter getAnnotationTypeOptionalMemberWriter(
+ AnnotationTypeWriter annotationTypeWriter);
/**
* Return the annotation type required member writer for a given annotation type.
@@ -131,9 +129,8 @@ public interface WriterFactory {
* @return the member writer for the given annotation type. Return null if
* this writer is not supported by the doclet.
*/
- public abstract AnnotationTypeRequiredMemberWriter
- getAnnotationTypeRequiredMemberWriter(
- AnnotationTypeWriter annotationTypeWriter);
+ AnnotationTypeRequiredMemberWriter getAnnotationTypeRequiredMemberWriter(
+ AnnotationTypeWriter annotationTypeWriter);
/**
* Return the enum constant writer for a given class.
@@ -142,8 +139,7 @@ public interface WriterFactory {
* @return the enum constant writer for the give class. Return null if this
* writer is not supported by the doclet.
*/
- public abstract EnumConstantWriter getEnumConstantWriter(
- ClassWriter classWriter);
+ EnumConstantWriter getEnumConstantWriter(ClassWriter classWriter);
/**
* Return the field writer for a given class.
@@ -152,7 +148,7 @@ public abstract EnumConstantWriter getEnumConstantWriter(
* @return the field writer for the give class. Return null if this
* writer is not supported by the doclet.
*/
- public abstract FieldWriter getFieldWriter(ClassWriter classWriter);
+ FieldWriter getFieldWriter(ClassWriter classWriter);
/**
* Return the property writer for a given class.
@@ -161,7 +157,7 @@ public abstract EnumConstantWriter getEnumConstantWriter(
* @return the property writer for the give class. Return null if this
* writer is not supported by the doclet.
*/
- public abstract PropertyWriter getPropertyWriter(ClassWriter classWriter);
+ PropertyWriter getPropertyWriter(ClassWriter classWriter);
/**
* Return the constructor writer for a given class.
@@ -170,8 +166,7 @@ public abstract EnumConstantWriter getEnumConstantWriter(
* @return the method writer for the give class. Return null if this
* writer is not supported by the doclet.
*/
- public abstract ConstructorWriter getConstructorWriter(
- ClassWriter classWriter);
+ ConstructorWriter getConstructorWriter(ClassWriter classWriter);
/**
* Return the specified member summary writer for a given class.
@@ -184,8 +179,8 @@ public abstract ConstructorWriter getConstructorWriter(
*
* @see VisibleMemberTable
*/
- public abstract MemberSummaryWriter getMemberSummaryWriter(
- ClassWriter classWriter, VisibleMemberTable.Kind memberType);
+ MemberSummaryWriter getMemberSummaryWriter(ClassWriter classWriter,
+ VisibleMemberTable.Kind memberType);
/**
* Return the specified member summary writer for a given annotation type.
@@ -199,15 +194,15 @@ public abstract MemberSummaryWriter getMemberSummaryWriter(
*
* @see VisibleMemberTable
*/
- public abstract MemberSummaryWriter getMemberSummaryWriter(
- AnnotationTypeWriter annotationTypeWriter, VisibleMemberTable.Kind memberType);
+ MemberSummaryWriter getMemberSummaryWriter(AnnotationTypeWriter annotationTypeWriter,
+ VisibleMemberTable.Kind memberType);
/**
* Return the writer for the serialized form.
*
* @return the writer for the serialized form.
*/
- public SerializedFormWriter getSerializedFormWriter();
+ SerializedFormWriter getSerializedFormWriter();
/**
* Return the handler for doc files.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
index c76637cd346..aa191b84c30 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
@@ -46,9 +46,9 @@
*/
public abstract class AbstractMemberBuilder extends AbstractBuilder {
- final protected TypeElement typeElement;
+ protected final TypeElement typeElement;
- final protected VisibleMemberTable visibleMemberTable;
+ protected final VisibleMemberTable visibleMemberTable;
/**
* Construct a SubBuilder.
@@ -76,7 +76,7 @@ public void build() {
*
* Build the documentation.
*
- * @param contentTree The content tree into which to add the documention
+ * @param contentTree The content tree into which to add the documentation
* @throws DocletException if there is a problem building the documentation
*/
public abstract void build(Content contentTree) throws DocletException;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
index 7641a7fc3f5..d93aafaa2e7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
@@ -136,8 +136,8 @@ protected void buildConstructorDoc(Content memberDetailsTree) throws DocletExcep
memberDetailsTree);
Content constructorDetailsTree = writer.getMemberTreeHeader();
- for (Element contructor : constructors) {
- currentConstructor = (ExecutableElement)contructor;
+ for (Element constructor : constructors) {
+ currentConstructor = (ExecutableElement)constructor;
Content constructorDocTree = writer.getConstructorDocTreeHeader(currentConstructor, constructorDetailsTree);
buildSignature(constructorDocTree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
index f12e1ec15fb..4e21c92ec41 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
@@ -82,7 +82,7 @@ private EnumConstantBuilder(Context context,
* Construct a new EnumConstantsBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
* @return the new EnumConstantsBuilder
*/
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
index 1b350f0ce2b..cb04351cf8b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
@@ -68,7 +68,7 @@ public class FieldBuilder extends AbstractMemberBuilder {
* Construct a new FieldBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
*/
private FieldBuilder(Context context,
@@ -83,7 +83,7 @@ private FieldBuilder(Context context,
* Construct a new FieldBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
* @return the new FieldBuilder
*/
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
index da93b552d88..ea6c3697024 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
@@ -313,7 +313,7 @@ private void buildSummary(MemberSummaryWriter writer,
}
List firstSentenceTags = utils.getFirstSentenceTrees(member);
if (utils.isExecutableElement(member) && firstSentenceTags.isEmpty()) {
- //Inherit comments from overriden or implemented method if
+ //Inherit comments from overridden or implemented method if
//necessary.
DocFinder.Output inheritedDoc =
DocFinder.search(configuration,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
index 7af3ced70dc..6993c6c2a6f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
@@ -71,7 +71,7 @@ public class MethodBuilder extends AbstractMemberBuilder {
* Construct a new MethodBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
*/
private MethodBuilder(Context context,
@@ -86,7 +86,7 @@ private MethodBuilder(Context context,
* Construct a new MethodBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
*
* @return an instance of a MethodBuilder.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
index 031932a6c5b..f8217b694b6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
@@ -68,7 +68,7 @@ public class PropertyBuilder extends AbstractMemberBuilder {
* Construct a new PropertyBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
*/
private PropertyBuilder(Context context,
@@ -83,7 +83,7 @@ private PropertyBuilder(Context context,
* Construct a new PropertyBuilder.
*
* @param context the build context.
- * @param typeElement the class whoses members are being documented.
+ * @param typeElement the class whose members are being documented.
* @param writer the doclet specific writer.
* @return the new PropertyBuilder
*/
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 27c4d76e929..8aacf84588c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -77,7 +77,7 @@ doclet.Other_Packages=Other Packages
doclet.Other_Modules=Other Modules
doclet.Notice_taglet_registered=Registered Taglet {0} ...
doclet.Notice_taglet_unseen=Note: Custom tags that were not seen: {0}
-doclet.Notice_taglet_overriden=Note: Custom tags that override standard tags: {0}
+doclet.Notice_taglet_overridden=Note: Custom tags that override standard tags: {0}
doclet.Notice_taglet_conflict_warn=Note: Custom tags that could override future standard tags: {0}. To avoid potential overrides, use at least one period character (.) in custom tag names.
doclet.Error_taglet_not_registered=Error - Exception {0} thrown while trying to register Taglet {1}...
doclet.Error_invalid_custom_tag_argument=Error - {0} is an invalid argument to the -tag option...
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 6b89f32f3a4..2ddb55f2682 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -68,7 +68,7 @@ doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
doclet.Other_Modules=\u305D\u306E\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB
doclet.Notice_taglet_registered=\u767B\u9332\u3055\u308C\u305F\u30BF\u30B0\u30EC\u30C3\u30C8{0} ...
doclet.Notice_taglet_unseen=\u6CE8\u610F: \u975E\u8868\u793A\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
-doclet.Notice_taglet_overriden=\u6CE8\u610F: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
+doclet.Notice_taglet_overridden=\u6CE8\u610F: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
doclet.Notice_taglet_conflict_warn=\u6CE8\u610F: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u53EF\u80FD\u6027\u306E\u3042\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3092\u907F\u3051\u308B\u305F\u3081\u306B\u3001\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u540D\u306E\u4E2D\u306B\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30D4\u30EA\u30AA\u30C9(.)\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
doclet.Error_taglet_not_registered=\u30A8\u30E9\u30FC - \u30BF\u30B0\u30EC\u30C3\u30C8{1}\u3092\u767B\u9332\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4F8B\u5916{0}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F...
doclet.Error_invalid_custom_tag_argument=\u30A8\u30E9\u30FC - {0}\u306F-tag\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5BFE\u3057\u3066\u7121\u52B9\u306A\u5F15\u6570\u3067\u3059...
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index 33a2a85492e..29766c5eca3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -68,7 +68,7 @@ doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
doclet.Other_Modules=\u5176\u4ED6\u6A21\u5757
doclet.Notice_taglet_registered=\u6CE8\u518C\u7684 Taglet {0}...
doclet.Notice_taglet_unseen=\u6CE8: \u627E\u4E0D\u5230\u7684\u5B9A\u5236\u6807\u8BB0: {0}
-doclet.Notice_taglet_overriden=\u6CE8: \u8986\u76D6\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}
+doclet.Notice_taglet_overridden=\u6CE8: \u8986\u76D6\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}
doclet.Notice_taglet_conflict_warn=\u6CE8: \u53EF\u80FD\u8986\u76D6\u5C06\u6765\u7684\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}\u3002\u4E3A\u4E86\u907F\u514D\u51FA\u73B0\u53EF\u80FD\u7684\u8986\u76D6, \u8BF7\u5728\u5B9A\u5236\u6807\u8BB0\u540D\u79F0\u4E2D\u81F3\u5C11\u4F7F\u7528\u4E00\u4E2A\u53E5\u70B9\u5B57\u7B26 (.)\u3002
doclet.Error_taglet_not_registered=\u9519\u8BEF - \u5C1D\u8BD5\u6CE8\u518C Taglet {1}\u65F6\u629B\u51FA\u5F02\u5E38\u9519\u8BEF{0}...
doclet.Error_invalid_custom_tag_argument=\u9519\u8BEF - \u5BF9\u4E8E -tag \u9009\u9879, {0}\u662F\u65E0\u6548\u53C2\u6570...
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java
index 7f5e542683f..7f137f00448 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/InheritDocTaglet.java
@@ -43,7 +43,7 @@
/**
* An inline Taglet representing the {@code inheritDoc} tag. This tag should only
- * be used with a method. It is used to inherit documentation from overriden
+ * be used with a method. It is used to inherit documentation from overridden
* and implemented methods.
*
* This is NOT part of any supported API.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java
index 181277c3ccc..3d355a2e5a9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/Taglet.java
@@ -165,5 +165,5 @@ class UnsupportedTagletOperationException extends UnsupportedOperationException
public UnsupportedTagletOperationException(String message) {
super(message);
}
- };
+ }
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
index c3de099caab..8afbfa52fe6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
@@ -136,9 +136,9 @@ public class TagletManager {
private final Set standardTagsLowercase;
/**
- * Keep track of overriden standard tags.
+ * Keep track of overridden standard tags.
*/
- private final Set overridenStandardTags;
+ private final Set overriddenStandardTags;
/**
* Keep track of the tags that may conflict
@@ -188,7 +188,7 @@ public class TagletManager {
public TagletManager(boolean nosince, boolean showversion,
boolean showauthor, boolean javafx,
BaseConfiguration configuration) {
- overridenStandardTags = new HashSet<>();
+ overriddenStandardTags = new HashSet<>();
potentiallyConflictingTags = new HashSet<>();
standardTags = new HashSet<>();
standardTagsLowercase = new HashSet<>();
@@ -229,7 +229,7 @@ public Set getAllTagletNames() {
/**
* Initializes the location TAGLET_PATH which is used to locate the custom taglets.
- * @param fileManager the filemanager to load classes and resources.
+ * @param fileManager the file manager to load classes and resources.
* @param tagletPath the path to the custom taglet.
* @throws IOException if an error occurs while setting the location.
*/
@@ -254,7 +254,7 @@ public void initTagletPath(JavaFileManager fileManager, String tagletPath) throw
* Adds a new {@code Taglet}. Print a message to indicate whether or not
* the Taglet was registered properly.
* @param classname the name of the class representing the custom tag.
- * @param fileManager the filemanager to load classes and resources.
+ * @param fileManager the file manager to load classes and resources.
*/
public void addCustomTag(String classname, JavaFileManager fileManager) {
try {
@@ -272,7 +272,7 @@ public void addCustomTag(String classname, JavaFileManager fileManager) {
/**
* Loads taglets from a taglet path using service loader.
- * @param fileManager the filemanager to load the taglets.
+ * @param fileManager the file manager to load the taglets.
* @throws IOException if an error occurs while getting the service loader.
*/
public void loadTaglets(JavaFileManager fileManager) throws IOException {
@@ -333,7 +333,7 @@ public void addNewSimpleCustomTag(String tagName, String header, String location
*/
private void checkTagName(String name) {
if (standardTags.contains(name)) {
- overridenStandardTags.add(name);
+ overriddenStandardTags.add(name);
} else {
if (name.indexOf('.') == -1) {
potentiallyConflictingTags.add(name);
@@ -700,11 +700,11 @@ public boolean isKnownCustomTag(String tagName) {
/**
* Print a list of {@link Taglet}s that might conflict with
* standard tags in the future and a list of standard tags
- * that have been overriden.
+ * that have been overridden.
*/
public void printReport() {
printReportHelper("doclet.Notice_taglet_conflict_warn", potentiallyConflictingTags);
- printReportHelper("doclet.Notice_taglet_overriden", overridenStandardTags);
+ printReportHelper("doclet.Notice_taglet_overridden", overriddenStandardTags);
printReportHelper("doclet.Notice_taglet_unseen", unseenCustomTags);
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java
index 13674bb48dd..acd7ce1776b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java
@@ -49,7 +49,7 @@
*/
public class UserTaglet implements Taglet {
- final private jdk.javadoc.doclet.Taglet userTaglet;
+ private final jdk.javadoc.doclet.Taglet userTaglet;
public UserTaglet(jdk.javadoc.doclet.Taglet t) {
userTaglet = t;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java
index c4295f2877a..a383e1ddb83 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ValueTaglet.java
@@ -45,7 +45,7 @@
* fields. This inline tag has an optional field name parameter. If the name is
* specified, the constant value is retrieved from the specified field. A link
* is also created to the specified field. If a name is not specified, the value
- * is retrieved for the field that the inline tag appears on. The name is specifed
+ * is retrieved for the field that the inline tag appears on. The name is specified
* in the following format: [fully qualified class name]#[constant field name].
*
* This is NOT part of any supported API.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java
index 3ce81987cfc..ba03695db96 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -31,7 +31,7 @@
* common processing, independent of the output format.
* Each doclet must have a taglet writer that takes a taglet
* as input and writes doclet-dependent output. The taglet itself will
- * do the tag processing. For example, suppose we are outputing
+ * do the tag processing. For example, suppose we are outputting
* @throws tags. The taglet would:
*
* - Retrieve the list of throws tags to be documented.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
index ba1c504c966..b312031e3ac 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
@@ -49,7 +49,7 @@ public class DeprecatedAPIListBuilder {
private final Map> deprecatedMap;
private final BaseConfiguration configuration;
private final Utils utils;
- public static enum DeprElementKind {
+ public enum DeprElementKind {
REMOVAL,
MODULE,
PACKAGE,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java
index 705cb88a80a..7cd2811a702 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFileIOException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -52,7 +52,7 @@ public enum Mode {
READ,
/** The file was being opened for writing, or being written when the exception occurred. */
WRITE
- };
+ }
/**
* The file that was in use when the exception occurred.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java
index 4863d1beb2b..172d7f2e88e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java
@@ -210,7 +210,7 @@ public static class Output {
* IOException and the overridden element has throws tags for IOException and
* ZipException, both tags would be inherited because ZipException is a
* subclass of IOException. This subclass of DocFinder.Output allows
- * multiple tag inheritence.
+ * multiple tag inheritance.
*/
public List tagList = new ArrayList<>();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java
index df8cc2a6773..1fe88e849ed 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java
@@ -98,7 +98,7 @@ private class Item {
/**
* The URL or the directory path at which the element documentation will be
- * avaliable.
+ * available.
*/
final DocPath path;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 7d9c0cafda3..5b45170ad40 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -225,7 +225,7 @@ public boolean isSubclassOf(TypeElement t1, TypeElement t2) {
/**
* @param e1 the first method to compare.
* @param e2 the second method to compare.
- * @return true if member1 overrides/hides or is overriden/hidden by member2.
+ * @return true if member1 overrides/hides or is overridden/hidden by member2.
*/
public boolean executableMembersEqual(ExecutableElement e1, ExecutableElement e2) {
@@ -1139,7 +1139,7 @@ public TypeElement visitArray(ArrayType t, Void p) {
@Override
public TypeElement visitTypeVariable(TypeVariable t, Void p) {
- /* TODO, this may not be an optimimal fix.
+ /* TODO, this may not be an optimal fix.
* if we have an annotated type @DA T, then erasure returns a
* none, in this case we use asElement instead.
*/
@@ -1885,7 +1885,7 @@ public Comparator makeTypeMirrorIndexUseComparator() {
}
/**
- * Get the qualified type name of a TypeMiror compatible with the Element's
+ * Get the qualified type name of a TypeMirror compatible with the Element's
* getQualified name, returns the qualified name of the Reference type
* otherwise the primitive name.
* @param t the type whose name is to be obtained.
@@ -2572,7 +2572,7 @@ protected Boolean defaultAction(Element e, Void p) {
@Override
public Boolean visitUnknown(Element e, Void p) {
- throw new AssertionError("unkown element: " + p);
+ throw new AssertionError("unknown element: " + e);
}
};
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
index 5fb27a2b60a..7695b4938b8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
@@ -169,7 +169,7 @@ List getAllSuperinterfaces() {
* a. The list may or may not contain simple overridden methods.
* A simple overridden method is one that overrides a super method
* with no specification changes as indicated by the existence of a
- * sole @inheritDoc or devoid of any API commments.
+ * sole @inheritDoc or devoid of any API comments.
*
* b.The list may contain (extra) members, inherited by inaccessible
* super types, primarily package private types. These members are
@@ -227,7 +227,7 @@ public List getMembers(Kind kind) {
}
/**
- * Returns the overridden method, if it is simply overridding or the
+ * Returns the overridden method, if it is simply overriding or the
* method is a member of a package private type, this method is
* primarily used to determine the location of a possible comment.
*
@@ -305,7 +305,7 @@ public boolean hasVisibleMembers() {
/**
* Returns true if this table contains visible members of
- * the specified kind, including inhertied members.
+ * the specified kind, including inherited members.
*
* @return true if visible members are present.
*/
@@ -901,7 +901,7 @@ public ImplementedMethods(ExecutableElement method) {
/*
* Search for the method in the list of interfaces. If found check if it is
* overridden by any other subinterface method which this class
- * implements. If it is not overidden, add it in the method list.
+ * implements. If it is not overridden, add it in the method list.
* Do this recursively for all the extended interfaces for each interface
* from the list.
*/
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
index a9aa9f885ec..cc6deb73720 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
@@ -87,7 +87,7 @@ protected Content defaultAction(TypeMirror type, LinkInfo linkInfo) {
@Override
public Content visitArray(ArrayType type, LinkInfo linkInfo) {
// keep track of the dimension depth and replace the last dimension
- // specifier with vararags, when the stack is fully unwound.
+ // specifier with varargs, when the stack is fully unwound.
currentDepth++;
linkInfo.type = type.getComponentType();
visit(linkInfo.type, linkInfo);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java
index 42ab39ab75c..f3f8962fb8c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkOutput.java
@@ -40,7 +40,7 @@ public interface LinkOutput {
*
* @param o the object to append.
*/
- public void append(Object o);
+ void append(Object o);
/**
* Insert the given object into the output sequence.
@@ -48,5 +48,5 @@ public interface LinkOutput {
* @param offset the offset.
* @param o the object to be inserted.
*/
- public void insert(int offset, Object o);
+ void insert(int offset, Object o);
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
index 8c7264a40e4..45eb5a0acb1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
@@ -1030,7 +1030,7 @@ protected Boolean defaultAction(Element e, Void p) {
@Override
public Boolean visitUnknown(Element e, Void p) {
- throw new AssertionError("unkown element: " + p);
+ throw new AssertionError("unknown element: " + e);
}
};
}
@@ -1039,7 +1039,7 @@ public Boolean visitUnknown(Element e, Void p) {
@SuppressWarnings("preview")
private class IncludedVisitor extends SimpleElementVisitor14 {
- final private Set includedCache;
+ private final Set includedCache;
public IncludedVisitor() {
includedCache = new LinkedHashSet<>();
@@ -1242,8 +1242,8 @@ static class ModifierFilter {
}
}
- static EnumSet getFilterSet(AccessKind acccessValue) {
- switch (acccessValue) {
+ static EnumSet getFilterSet(AccessKind accessValue) {
+ switch (accessValue) {
case PUBLIC:
return EnumSet.of(AccessKind.PUBLIC);
case PROTECTED:
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
index 0e60fd4329c..317e7186705 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
@@ -221,9 +221,9 @@ public DocletEnvironment getEnvironment(Map files, ListBuffer fileManagerOpts = new LinkedHashMap<>();
diff --git a/src/jdk.javadoc/share/classes/module-info.java b/src/jdk.javadoc/share/classes/module-info.java
index a626cb875a5..5c7ec0c0a63 100644
--- a/src/jdk.javadoc/share/classes/module-info.java
+++ b/src/jdk.javadoc/share/classes/module-info.java
@@ -26,7 +26,7 @@
/**
* Defines the implementation of the
* {@linkplain javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
- * and its command line equivalent, {@index javadoc javadoc tool}.
+ * and its command-line equivalent, {@index javadoc javadoc tool}.
*
* javadoc
*
@@ -71,4 +71,3 @@
provides javax.tools.Tool with
jdk.javadoc.internal.api.JavadocTool;
}
-