changeset 38617:d93a7f64e231

8157606: deprecate com.sun.javadoc API Reviewed-by: ksrini
author jjg
date Fri, 27 May 2016 13:06:58 -0700
parents 31e503b8ea65
children f14423456446
files langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
diffstat 224 files changed, 563 insertions(+), 197 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java	Fri May 27 13:06:58 2016 -0700
@@ -36,7 +36,12 @@
  *
  * @author Mahmood Ali
  * @since 1.8
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface AnnotatedType extends Type {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java	Fri May 27 13:06:58 2016 -0700
@@ -32,7 +32,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface AnnotationDesc {
 
     /**
@@ -65,7 +71,13 @@
      *
      * @author Scott Seligman
      * @since 1.5
+     *
+     * @deprecated
+     *   The declarations in this package have been superseded by those
+     *   in the package {@code jdk.javadoc.doclet}.
+     *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
      */
+    @Deprecated
     public interface ElementValuePair {
 
         /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -31,7 +31,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface AnnotationTypeDoc extends ClassDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -31,7 +31,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface AnnotationTypeElementDoc extends MethodDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java	Fri May 27 13:06:58 2016 -0700
@@ -31,7 +31,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface AnnotationValue {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -40,7 +40,13 @@
  * @since 1.2
  * @author Kaiyang Liu (original)
  * @author Robert Field (rewrite)
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -30,6 +30,12 @@
  *
  * @since 1.2
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ConstructorDoc extends ExecutableMemberDoc {
 }
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java	Fri May 27 13:06:58 2016 -0700
@@ -37,7 +37,13 @@
  * @since 1.2
  * @author Robert Field
  * @author Scott Seligman (generics, enums, annotations)
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface Doc extends Comparable<Object> {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java	Fri May 27 13:06:58 2016 -0700
@@ -30,7 +30,13 @@
  *
  * @since 1.2
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface DocErrorReporter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java	Fri May 27 13:06:58 2016 -0700
@@ -47,7 +47,13 @@
  * <p> To start the doclet, pass
  * {@code -doclet} followed by the fully-qualified
  * name of the starting class on the javadoc tool command line.
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public abstract class Doclet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -30,7 +30,13 @@
  *
  * @since 1.2
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ExecutableMemberDoc extends MemberDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -32,7 +32,13 @@
  *
  * @since 1.2
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface FieldDoc extends MemberDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java	Fri May 27 13:06:58 2016 -0700
@@ -36,7 +36,13 @@
  * affecting doclets is 1.5.
  *
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public enum LanguageVersion {
 
     /** 1.1 added nested classes and interfaces. */
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -37,7 +37,13 @@
  *
  * @author Kaiyang Liu (original)
  * @author Robert Field (rewrite)
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface MemberDoc extends ProgramElementDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -30,7 +30,13 @@
  *
  * @since 1.2
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface MethodDoc extends ExecutableMemberDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -36,7 +36,13 @@
  * @since 1.2
  * @author Kaiyang Liu (original)
  * @author Robert Field (rewrite)
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface PackageDoc extends Doc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java	Fri May 27 13:06:58 2016 -0700
@@ -33,7 +33,12 @@
  *
  * @author Robert Field
  *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ParamTag extends Tag {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java	Fri May 27 13:06:58 2016 -0700
@@ -30,7 +30,13 @@
  * This includes a parameter type and parameter name.
  *
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface Parameter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java	Fri May 27 13:06:58 2016 -0700
@@ -42,7 +42,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ParameterizedType extends Type {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -35,7 +35,13 @@
  * @see ClassDoc
  *
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ProgramElementDoc extends Doc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java	Fri May 27 13:06:58 2016 -0700
@@ -34,7 +34,13 @@
  *
  * @since 1.2
  * @author Robert Field
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface RootDoc extends Doc, DocErrorReporter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java	Fri May 27 13:06:58 2016 -0700
@@ -41,7 +41,12 @@
  * @author Robert Field (rewrite)
  * @author Atul M Dambalkar
  *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface SeeTag extends Tag {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java	Fri May 27 13:06:58 2016 -0700
@@ -42,7 +42,13 @@
  * @author Joe Fialli
  *
  * @see java.io.ObjectStreamField
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface SerialFieldTag extends Tag, Comparable<Object> {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java	Fri May 27 13:06:58 2016 -0700
@@ -33,7 +33,13 @@
  *
  * @since 1.4
  * @author Neal M Gafter
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface SourcePosition {
     /** The source file. Returns null if no file information is
      *  available.
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java	Fri May 27 13:06:58 2016 -0700
@@ -44,7 +44,12 @@
  * @see SerialFieldTag
  * @see Doc#tags()
  *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface Tag {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java	Fri May 27 13:06:58 2016 -0700
@@ -34,7 +34,12 @@
  * @author Atul M Dambalkar
  * @see ExecutableMemberDoc#throwsTags()
  *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface ThrowsTag extends Tag {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java	Fri May 27 13:06:58 2016 -0700
@@ -35,7 +35,13 @@
  * @author Kaiyang Liu (original)
  * @author Robert Field (rewrite)
  * @author Scott Seligman (generics)
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface Type {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java	Fri May 27 13:06:58 2016 -0700
@@ -35,7 +35,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface TypeVariable extends Type {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java	Fri May 27 13:06:58 2016 -0700
@@ -38,7 +38,13 @@
  *
  * @author Scott Seligman
  * @since 1.5
+ *
+ * @deprecated
+ *   The declarations in this package have been superseded by those
+ *   in the package {@code jdk.javadoc.doclet}.
+ *   For more information, see the <i>Migration Guide</i> in the documentation for that package.
  */
+@Deprecated
 public interface WildcardType extends Type {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java	Fri May 27 13:06:58 2016 -0700
@@ -27,6 +27,7 @@
 <p style="font-style: italic; font-size:larger">
 <b>Note:</b> The declarations in this package have been superseded by those
 in the package {@code jdk.javadoc.doclet}.
+For more information, see the <i>Migration Guide</i> in the documentation for that package.
 </p>
 
 The Doclet API (also called the Javadoc API) provides a mechanism
@@ -149,4 +150,5 @@
 @see com.sun.javadoc.Doclet
 @see com.sun.javadoc.RootDoc
 */
+@Deprecated
 package com.sun.javadoc;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java	Fri May 27 13:06:58 2016 -0700
@@ -64,8 +64,11 @@
  *
  * @since 1.4
  * @author Jamie Ho
+ *
+ * @deprecated
+ *   This interface has been superseded by one in the new package {@code jdk.javadoc.doclet.taglet}.
  */
-
+@Deprecated
 public interface Taglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public abstract class AbstractExecutableMemberWriter extends AbstractMemberWriter {
 
     public AbstractExecutableMemberWriter(SubWriterHolderWriter writer,
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -50,6 +50,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class AbstractIndexWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -47,6 +47,7 @@
  * @author Jamie Ho (Re-write)
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public abstract class AbstractMemberWriter {
 
     protected final ConfigurationImpl configuration;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public abstract class AbstractTreeWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -48,6 +48,7 @@
  * @author Doug Kramer
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class AllClassesFrameWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
     implements AnnotationTypeFieldWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Jamie Ho
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class AnnotationTypeOptionalMemberWriterImpl extends
         AnnotationTypeRequiredMemberWriterImpl
     implements AnnotationTypeOptionalMemberWriter, MemberSummaryWriter {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Jamie Ho
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
     implements AnnotationTypeRequiredMemberWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -51,6 +51,7 @@
  * @author Robert Field
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class AnnotationTypeWriterImpl extends SubWriterHolderWriter
         implements AnnotationTypeWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -52,6 +52,7 @@
  * @author Robert G. Field
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class ClassUseWriter extends SubWriterHolderWriter {
 
     final ClassDoc classdoc;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -55,6 +55,7 @@
  * @author Robert Field
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class ClassWriterImpl extends SubWriterHolderWriter
         implements ClassWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -65,6 +65,7 @@
  * @author Jamie Ho
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class ConfigurationImpl extends Configuration {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.4
  */
+@Deprecated
 public class ConstantsSummaryWriterImpl extends HtmlDocletWriter
         implements ConstantsSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
     implements ConstructorWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class DeprecatedListWriter extends SubWriterHolderWriter {
 
     private static final String[] ANCHORS = new String[] {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Jamie Ho
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class EnumConstantWriterImpl extends AbstractMemberWriter
     implements EnumConstantWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Jamie Ho (rewrite)
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class FieldWriterImpl extends AbstractMemberWriter
     implements FieldWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -48,6 +48,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class FrameOutputWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class HelpWriter extends HtmlDocletWriter {
 
     HtmlTree mainTree = HtmlTree.MAIN();
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Jamie Ho
  *
  */
+@Deprecated
 public class HtmlDoclet extends AbstractDoclet {
     // An instance will be created by validOptions, and used by start.
     private static HtmlDoclet docletToStart = null;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -53,6 +53,7 @@
  * @author Robert Field
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class HtmlDocletWriter extends HtmlDocWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Joe Fialli
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class HtmlSerialFieldWriter extends FieldWriterImpl
         implements SerializedFormWriter.SerialFieldWriter {
     ProgramElementDoc[] members = null;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Joe Fialli
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class HtmlSerialMethodWriter extends MethodWriterImpl implements
         SerializedFormWriter.SerialMethodWriter{
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public class LinkFactoryImpl extends LinkFactory {
 
     private HtmlDocletWriter m_writer;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class LinkInfoImpl extends LinkInfo {
 
     public enum Kind {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -38,6 +38,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public class LinkOutputImpl implements LinkOutput {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Jamie Ho (rewrite)
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class MethodWriterImpl extends AbstractExecutableMemberWriter
         implements MethodWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Jamie Ho (rewrite)
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class NestedClassWriterImpl extends AbstractMemberWriter
     implements MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class PackageFrameWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class PackageIndexWriter extends AbstractPackageIndexWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class PackageTreeWriter extends AbstractTreeWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Robert G. Field
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class PackageUseWriter extends SubWriterHolderWriter {
 
     final PackageDoc pkgdoc;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class PackageWriterImpl extends HtmlDocletWriter
     implements PackageSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Jamie Ho (rewrite)
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class PropertyWriterImpl extends AbstractMemberWriter
     implements PropertyWriter, MemberSummaryWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java	Fri May 27 13:06:58 2016 -0700
@@ -33,6 +33,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class SearchIndexItem {
 
     private String label = "";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java	Fri May 27 13:06:58 2016 -0700
@@ -35,6 +35,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public enum SectionName {
 
     ANNOTATION_TYPE_ELEMENT_DETAIL("annotation.type.element.detail"),
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class SerializedFormWriterImpl extends SubWriterHolderWriter
     implements SerializedFormWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class SingleIndexWriter extends AbstractIndexWriter {
 
     private List<Object> elements;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java	Fri May 27 13:06:58 2016 -0700
@@ -47,6 +47,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.4
  */
+@Deprecated
 public class SourceToHTMLConverter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class SplitIndexWriter extends AbstractIndexWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -53,6 +53,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -49,6 +49,7 @@
  * @author Bhavesh Patel (Modified)
  */
 
+@Deprecated
 public class TagletWriterImpl extends TagletWriter {
 
     private final HtmlDocletWriter htmlWriter;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -47,6 +47,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class TreeWriter extends AbstractTreeWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public class WriterFactoryImpl implements WriterFactory {
 
     private final ConfigurationImpl configuration;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class Comment extends Content {
 
     private String commentText;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -35,6 +35,7 @@
 /**
  * A sequence of Content nodes.
  */
+@Deprecated
 public class ContentBuilder extends Content {
     protected List<Content> contents = Collections.<Content>emptyList();
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class DocType extends Content {
 
     private String docType;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public enum HtmlAttr {
     ALT,
     CLASS,
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class HtmlConstants {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -53,6 +53,7 @@
  * @author Atul M Dambalkar
  * @author Robert Field
  */
+@Deprecated
 public abstract class HtmlDocWriter extends HtmlWriter {
 
     public static final String CONTENT_TYPE = "text/html";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class HtmlDocument extends Content {
 
     private List<Content> docContent = Collections.<Content>emptyList();
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java	Fri May 27 13:06:58 2016 -0700
@@ -35,6 +35,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public enum HtmlStyle {
     aboutLanguage,
     activeTableTab,
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public enum HtmlTag {
     A(BlockType.INLINE, EndTag.END),
     BLOCKQUOTE,
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class HtmlTree extends Content {
 
     private HtmlTag htmlTag;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java	Fri May 27 13:06:58 2016 -0700
@@ -30,6 +30,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public enum HtmlVersion {
     HTML4,
     HTML5,
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Atul M Dambalkar
  * @author Bhavesh Patel (Modified)
  */
+@Deprecated
 public class HtmlWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class RawHtml extends Content {
 
     private String rawHtmlContent;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public class StringContent extends Content {
 
     private StringBuilder stringContent;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Jamie Ho
  */
+@Deprecated
 public abstract class AbstractDoclet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.8
  */
 
+@Deprecated
 public interface AnnotationTypeFieldWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface AnnotationTypeOptionalMemberWriter extends
         AnnotationTypeRequiredMemberWriter {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface AnnotationTypeRequiredMemberWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface AnnotationTypeWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface ClassWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Fri May 27 13:06:58 2016 -0700
@@ -54,6 +54,7 @@
  * @author Atul Dambalkar.
  * @author Jamie Ho
  */
+@Deprecated
 public abstract class Configuration {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface ConstantsSummaryWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface ConstructorWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public abstract class Content {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface EnumConstantWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface FieldWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface MemberSummaryWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface MethodWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface NestedClassWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface PackageSummaryWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.7
  */
 
+@Deprecated
 public interface PropertyWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public interface SerializedFormWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public interface WriterFactory {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -52,6 +52,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public abstract class AbstractBuilder {
     public static class Context {
         /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public abstract class AbstractMemberBuilder extends AbstractBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class AnnotationTypeBuilder extends AbstractBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Bhavesh Patel
  * @since 1.8
  */
+@Deprecated
 public class AnnotationTypeFieldBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class AnnotationTypeOptionalMemberBuilder extends
         AnnotationTypeRequiredMemberBuilder {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class AnnotationTypeRequiredMemberBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public class BuilderFactory {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class ClassBuilder extends AbstractBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class ConstantsSummaryBuilder extends AbstractBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class ConstructorBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class EnumConstantBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class FieldBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Fri May 27 13:06:58 2016 -0700
@@ -49,6 +49,7 @@
  * @since 1.5
  * @see SAXParser
  */
+@Deprecated
 public class LayoutParser extends DefaultHandler {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class MemberSummaryBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class MethodBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class PackageSummaryBuilder extends AbstractBuilder {
     /**
      * The root element of the package summary XML is {@value}.
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.7
  */
+@Deprecated
 public class PropertyBuilder extends AbstractMemberBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Bhavesh Patel (Modified)
  * @since 1.5
  */
+@Deprecated
 public class SerializedFormBuilder extends AbstractBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java	Fri May 27 13:06:58 2016 -0700
@@ -38,6 +38,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class XMLNode {
     XMLNode(XMLNode parent, String qname) {
         this.parent = parent;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
 public abstract class BaseExecutableMemberTaglet extends BaseTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public abstract class BaseInlineTaglet extends BaseTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -38,6 +38,7 @@
  *  deletion without notice.</b>
  *
  */
+@Deprecated
 public abstract class BasePropertyTaglet extends BaseTaglet {
 
     public BasePropertyTaglet() {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -39,6 +39,7 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
 public abstract class BaseTaglet implements Taglet {
 
     protected String name = "Default";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -50,6 +50,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class CodeTaglet extends BaseInlineTaglet {
 
     private static final String NAME = "code";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class DeprecatedTaglet extends BaseTaglet{
 
     public DeprecatedTaglet() {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public class DocRootTaglet extends BaseInlineTaglet {
 
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  * @author Bhavesh Patel
  */
 
+@Deprecated
 public class IndexTaglet extends BaseInlineTaglet {
 
     private static final String NAME = "index";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public class InheritDocTaglet extends BaseInlineTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -39,6 +39,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public interface InheritableTaglet extends Taglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -47,6 +47,7 @@
  * @author Jamie Ho
  */
 
+@Deprecated
 public class LegacyTaglet implements Taglet {
 
     private com.sun.tools.doclets.Taglet legacyTaglet;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -49,6 +49,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class LiteralTaglet extends BaseInlineTaglet {
 
     private static final String NAME = "literal";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
 public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -34,6 +34,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class PropertyGetterTaglet extends BasePropertyTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -34,6 +34,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class PropertySetterTaglet extends BasePropertyTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
 public class ReturnTaglet extends BaseExecutableMemberTaglet
         implements InheritableTaglet {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
 public class SeeTaglet extends BaseTaglet implements InheritableTaglet {
 
     public SeeTaglet() {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @author Jamie Ho
  */
 
+@Deprecated
 public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java	Fri May 27 13:06:58 2016 -0700
@@ -60,6 +60,7 @@
  * @author Jamie Ho
  */
 
+@Deprecated
 public interface Taglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Fri May 27 13:06:58 2016 -0700
@@ -49,6 +49,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public class TagletManager {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @author Jamie Ho
  */
 
+@Deprecated
 public abstract class TagletWriter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
 public class ThrowsTaglet extends BaseExecutableMemberTaglet
     implements InheritableTaglet {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java	Fri May 27 13:06:58 2016 -0700
@@ -50,6 +50,7 @@
  * @since 1.4
  */
 
+@Deprecated
 public class ValueTaglet extends BaseInlineTaglet {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java	Fri May 27 13:06:58 2016 -0700
@@ -44,31 +44,31 @@
  * @author Jamie Ho
  * @since 1.4
  */
+@Deprecated
+public class ClassDocCatalog {
 
- public class ClassDocCatalog {
+    /**
+     * Stores the set of packages that the classes specified on the command line
+     * belong to.  Note that the default package is "".
+     */
+    private Set<String> packageSet;
 
-     /**
-      * Stores the set of packages that the classes specified on the command line
-      * belong to.  Note that the default package is "".
-      */
-     private Set<String> packageSet;
 
+    /**
+     * Stores all classes for each package
+     */
+    private Map<String,Set<ClassDoc>> allClasses;
 
-     /**
-      * Stores all classes for each package
-      */
-     private Map<String,Set<ClassDoc>> allClasses;
+    /**
+     * Stores ordinary classes (excluding Exceptions and Errors) for each
+     * package
+     */
+    private Map<String,Set<ClassDoc>> ordinaryClasses;
 
-     /**
-      * Stores ordinary classes (excluding Exceptions and Errors) for each
-      * package
-      */
-     private Map<String,Set<ClassDoc>> ordinaryClasses;
-
-     /**
-      * Stores exceptions for each package
-      */
-     private Map<String,Set<ClassDoc>> exceptions;
+    /**
+     * Stores exceptions for each package
+     */
+    private Map<String,Set<ClassDoc>> exceptions;
 
     /**
      * Stores enums for each package.
@@ -80,57 +80,57 @@
      */
     private Map<String,Set<ClassDoc>> annotationTypes;
 
-     /**
-      * Stores errors for each package
-      */
-     private Map<String,Set<ClassDoc>> errors;
+    /**
+     * Stores errors for each package
+     */
+    private Map<String,Set<ClassDoc>> errors;
 
-     /**
-      * Stores interfaces for each package
-      */
-     private Map<String,Set<ClassDoc>> interfaces;
+    /**
+     * Stores interfaces for each package
+     */
+    private Map<String,Set<ClassDoc>> interfaces;
 
-     private Configuration configuration;
-     private Utils utils;
+    private Configuration configuration;
+    private Utils utils;
 
-     /**
-      * Construct a new ClassDocCatalog.
-      *
-      * @param classdocs the array of ClassDocs to catalog
-      */
-     public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) {
-         init();
-         this.configuration = config;
-         this.utils = config.utils;
-         for (ClassDoc classdoc : classdocs) {
-             addClassDoc(classdoc);
-         }
-     }
+    /**
+     * Construct a new ClassDocCatalog.
+     *
+     * @param classdocs the array of ClassDocs to catalog
+     */
+    public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) {
+        init();
+        this.configuration = config;
+        this.utils = config.utils;
+        for (ClassDoc classdoc : classdocs) {
+            addClassDoc(classdoc);
+        }
+    }
 
-     /**
-      * Construct a new ClassDocCatalog.
-      *
-      */
-     public ClassDocCatalog () {
-         init();
-     }
+    /**
+     * Construct a new ClassDocCatalog.
+     *
+     */
+    public ClassDocCatalog () {
+        init();
+    }
 
-     private void init() {
-         allClasses = new HashMap<>();
-         ordinaryClasses = new HashMap<>();
-         exceptions = new HashMap<>();
-         enums = new HashMap<>();
-         annotationTypes = new HashMap<>();
-         errors = new HashMap<>();
-         interfaces = new HashMap<>();
-         packageSet = new HashSet<>();
-     }
+    private void init() {
+        allClasses = new HashMap<>();
+        ordinaryClasses = new HashMap<>();
+        exceptions = new HashMap<>();
+        enums = new HashMap<>();
+        annotationTypes = new HashMap<>();
+        errors = new HashMap<>();
+        interfaces = new HashMap<>();
+        packageSet = new HashSet<>();
+    }
 
-     /**
-      * Add the given class to the catalog.
-      * @param classdoc the ClassDoc to add to the catelog.
-      */
-      public void addClassDoc(ClassDoc classdoc) {
+    /**
+     * Add the given class to the catalog.
+     * @param classdoc the ClassDoc to add to the catelog.
+     */
+    public void addClassDoc(ClassDoc classdoc) {
         if (classdoc == null) {
             return;
         }
@@ -148,139 +148,139 @@
         } else if (classdoc.isInterface()) {
             addClass(classdoc, interfaces);
         }
-      }
+    }
 
-      /**
-       * Add the given class to the given map.
-       * @param classdoc the ClassDoc to add to the catelog.
-       * @param map the Map to add the ClassDoc to.
-       */
-      private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) {
+    /**
+     * Add the given class to the given map.
+     * @param classdoc the ClassDoc to add to the catelog.
+     * @param map the Map to add the ClassDoc to.
+     */
+    private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) {
 
-          PackageDoc pkg = classdoc.containingPackage();
-          if (pkg.isIncluded() || (configuration.nodeprecated && utils.isDeprecated(pkg))) {
-              //No need to catalog this class if it's package is
-              //included on the command line or if -nodeprecated option is set
-              // and the containing package is marked as deprecated.
-              return;
-          }
-          String key = utils.getPackageName(pkg);
-          Set<ClassDoc> s = map.get(key);
-          if (s == null) {
-              packageSet.add(key);
-              s = new HashSet<>();
-          }
-          s.add(classdoc);
-          map.put(key, s);
+        PackageDoc pkg = classdoc.containingPackage();
+        if (pkg.isIncluded() || (configuration.nodeprecated && utils.isDeprecated(pkg))) {
+            //No need to catalog this class if it's package is
+            //included on the command line or if -nodeprecated option is set
+            // and the containing package is marked as deprecated.
+            return;
+        }
+        String key = utils.getPackageName(pkg);
+        Set<ClassDoc> s = map.get(key);
+        if (s == null) {
+            packageSet.add(key);
+            s = new HashSet<>();
+        }
+        s.add(classdoc);
+        map.put(key, s);
 
-      }
+    }
 
-      private ClassDoc[] getArray(Map<String,Set<ClassDoc>> m, String key) {
-          Set<ClassDoc> s = m.get(key);
-          if (s == null) {
-              return new ClassDoc[] {};
-          } else {
-              return s.toArray(new ClassDoc[] {});
-          }
-      }
+    private ClassDoc[] getArray(Map<String,Set<ClassDoc>> m, String key) {
+        Set<ClassDoc> s = m.get(key);
+        if (s == null) {
+            return new ClassDoc[] {};
+        } else {
+            return s.toArray(new ClassDoc[] {});
+        }
+    }
 
-      /**
-       * Return all of the classes specified on the command-line that
-       * belong to the given package.
-       * @param pkgDoc the package to return the classes for.
-       */
-      public ClassDoc[] allClasses(PackageDoc pkgDoc) {
-          return pkgDoc.isIncluded() ?
-                pkgDoc.allClasses() :
-                getArray(allClasses, utils.getPackageName(pkgDoc));
-      }
+    /**
+     * Return all of the classes specified on the command-line that
+     * belong to the given package.
+     * @param pkgDoc the package to return the classes for.
+     */
+    public ClassDoc[] allClasses(PackageDoc pkgDoc) {
+        return pkgDoc.isIncluded() ?
+              pkgDoc.allClasses() :
+              getArray(allClasses, utils.getPackageName(pkgDoc));
+    }
 
-      /**
-       * Return all of the classes specified on the command-line that
-       * belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] allClasses(String packageName) {
-          return getArray(allClasses, packageName);
-      }
+    /**
+     * Return all of the classes specified on the command-line that
+     * belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] allClasses(String packageName) {
+        return getArray(allClasses, packageName);
+    }
 
-     /**
-      * Return the array of package names that this catalog stores
-      * ClassDocs for.
-      */
-     public String[] packageNames() {
-         return packageSet.toArray(new String[] {});
-     }
+    /**
+     * Return the array of package names that this catalog stores
+     * ClassDocs for.
+     */
+    public String[] packageNames() {
+        return packageSet.toArray(new String[] {});
+    }
 
-     /**
-      * Return true if the given package is known to this catalog.
-      * @param packageName the name to check.
-      * @return true if this catalog has any information about
-      * classes in the given package.
-      */
-     public boolean isKnownPackage(String packageName) {
-         return packageSet.contains(packageName);
-     }
+    /**
+     * Return true if the given package is known to this catalog.
+     * @param packageName the name to check.
+     * @return true if this catalog has any information about
+     * classes in the given package.
+     */
+    public boolean isKnownPackage(String packageName) {
+        return packageSet.contains(packageName);
+    }
 
 
-      /**
-       * Return all of the errors specified on the command-line
-       * that belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] errors(String packageName) {
-          return getArray(errors, packageName);
-      }
+    /**
+     * Return all of the errors specified on the command-line
+     * that belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] errors(String packageName) {
+        return getArray(errors, packageName);
+    }
 
-      /**
-       * Return all of the exceptions specified on the command-line
-       * that belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] exceptions(String packageName) {
-          return getArray(exceptions, packageName);
-      }
+    /**
+     * Return all of the exceptions specified on the command-line
+     * that belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] exceptions(String packageName) {
+        return getArray(exceptions, packageName);
+    }
 
-      /**
-       * Return all of the enums specified on the command-line
-       * that belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] enums(String packageName) {
-          return getArray(enums, packageName);
-      }
+    /**
+     * Return all of the enums specified on the command-line
+     * that belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] enums(String packageName) {
+        return getArray(enums, packageName);
+    }
 
-      /**
-       * Return all of the annotation types specified on the command-line
-       * that belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] annotationTypes(String packageName) {
-          return getArray(annotationTypes, packageName);
-      }
+    /**
+     * Return all of the annotation types specified on the command-line
+     * that belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] annotationTypes(String packageName) {
+        return getArray(annotationTypes, packageName);
+    }
 
-      /**
-       * Return all of the interfaces specified on the command-line
-       * that belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] interfaces(String packageName) {
-          return getArray(interfaces, packageName);
-      }
+    /**
+     * Return all of the interfaces specified on the command-line
+     * that belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] interfaces(String packageName) {
+        return getArray(interfaces, packageName);
+    }
 
-      /**
-       * Return all of the ordinary classes specified on the command-line
-       * that belong to the given package.
-       * @param packageName the name of the package specified on the
-       * command-line.
-       */
-      public ClassDoc[] ordinaryClasses(String packageName) {
-          return getArray(ordinaryClasses, packageName);
-      }
+    /**
+     * Return all of the ordinary classes specified on the command-line
+     * that belong to the given package.
+     * @param packageName the name of the package specified on the
+     * command-line.
+     */
+    public ClassDoc[] ordinaryClasses(String packageName) {
+        return getArray(ordinaryClasses, packageName);
+    }
 }
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @see com.sun.javadoc.ClassDoc
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class ClassTree {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @since 1.2
  * @author Robert G. Field
  */
+@Deprecated
 public class ClassUseMapper {
 
     private final ClassTree classtree;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class DeprecatedAPIListBuilder {
 
     public static final int NUM_TYPES = 12;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java	Fri May 27 13:06:58 2016 -0700
@@ -52,6 +52,7 @@
  *
  * @since 8
  */
+@Deprecated
 public abstract class DocFile {
 
     /** Create a DocFile for a directory. */
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  *
  * @since 1.8
  */
+@Deprecated
 abstract class DocFileFactory {
     private static final Map<Configuration, DocFileFactory> factories = new WeakHashMap<>();
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public class DocFinder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java	Fri May 27 13:06:58 2016 -0700
@@ -38,6 +38,7 @@
  *  deletion without notice.</b>
  *
  */
+@Deprecated
 public class DocLink {
     final String path;
     final String query;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class DocPath {
     private final String path;
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Fri May 27 13:06:58 2016 -0700
@@ -35,6 +35,7 @@
  *
  * @since 8
  */
+@Deprecated
 public class DocPaths {
 
     /** The name of the file for all classes, using frames. */
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java	Fri May 27 13:06:58 2016 -0700
@@ -31,6 +31,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class DocletAbortException extends RuntimeException {
     private static final long serialVersionUID = -9131058909576418984L;
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public class DocletConstants {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Fri May 27 13:06:58 2016 -0700
@@ -50,6 +50,7 @@
  * @author Atul M Dambalkar
  * @author Robert Field
  */
+@Deprecated
 public class Extern {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java	Fri May 27 13:06:58 2016 -0700
@@ -56,6 +56,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class Group {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class ImplementedMethods {
 
     private final Map<MethodDoc,Type> interfaces = new HashMap<>();
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @see java.lang.Character
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class IndexBuilder {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Atul M Dambalkar
  * @author Robert Field
  */
+@Deprecated
 public class MessageRetriever {
     /**
      * The global configuration information for this run.
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  *
  * @author Doug Kramer
  */
+@Deprecated
 public class MetaKeywords {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java	Fri May 27 13:06:58 2016 -0700
@@ -30,6 +30,7 @@
  *
  * @author Bhavesh Patel
  */
+@Deprecated
 public enum MethodTypes {
     ALL(0xffff, "doclet.All_Methods", "t0", true),
     STATIC(0x1, "doclet.Static_Methods", "t1", false),
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @see com.sun.javadoc.PackageDoc
  * @author Atul M Dambalkar
  */
+@Deprecated
 public class PackageListWriter extends PrintWriter {
 
     private final Configuration configuration;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java	Fri May 27 13:06:58 2016 -0700
@@ -64,6 +64,7 @@
  *
  * @since 1.8
  */
+@Deprecated
 class StandardDocFileFactory extends DocFileFactory {
     private final StandardJavaFileManager fileManager;
     private Path destDir;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java	Fri May 27 13:06:58 2016 -0700
@@ -39,6 +39,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public class TextTag implements Tag {
     protected final String text;
     protected final String name = "Text";
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java	Fri May 27 13:06:58 2016 -0700
@@ -33,10 +33,8 @@
 import java.util.*;
 
 import javax.tools.JavaFileManager.Location;
-import javax.tools.StandardLocation;
 
 import com.sun.javadoc.*;
-import com.sun.javadoc.AnnotationDesc.ElementValuePair;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.javac.util.StringUtils;
 
@@ -51,6 +49,7 @@
  * @author Atul M Dambalkar
  * @author Jamie Ho
  */
+@Deprecated
 public class Utils {
     /**
      * Return array of class members whose documentation is to be generated.
@@ -445,7 +444,7 @@
 
     private boolean isDeclarationTarget(AnnotationDesc targetAnno) {
         // The error recovery steps here are analogous to TypeAnnotations
-        ElementValuePair[] elems = targetAnno.elementValues();
+        AnnotationDesc.ElementValuePair[] elems = targetAnno.elementValues();
         if (elems == null
             || elems.length != 1
             || !"value".equals(elems[0].element().name())
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Atul M Dambalkar
  * @author Jamie Ho (rewrite)
  */
+@Deprecated
 public class VisibleMemberMap {
 
     private boolean noVisibleMembers = true;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java	Fri May 27 13:06:58 2016 -0700
@@ -39,6 +39,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public abstract class LinkFactory {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public abstract class LinkInfo {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java	Fri May 27 13:06:58 2016 -0700
@@ -36,6 +36,7 @@
  * @author Jamie Ho
  * @since 1.5
  */
+@Deprecated
 public interface LinkOutput {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java	Fri May 27 13:06:58 2016 -0700
@@ -28,7 +28,7 @@
 import com.sun.javadoc.*;
 import com.sun.tools.doclets.formats.html.*;
 
-
+@Deprecated
 public class Standard {
 
     public static int optionLength(String option) {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
 abstract class AbstractTypeImpl implements com.sun.javadoc.Type {
 
     protected final DocEnv env;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -37,6 +37,7 @@
  * @author Mahmood Ali
  * @since 1.8
  */
+@Deprecated
 public class AnnotatedTypeImpl
         extends AbstractTypeImpl implements AnnotatedType {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -48,6 +48,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class AnnotationDescImpl implements AnnotationDesc {
 
     private final DocEnv env;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -48,6 +48,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class AnnotationTypeDocImpl
         extends ClassDocImpl implements AnnotationTypeDoc {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class AnnotationTypeElementDocImpl
         extends MethodDocImpl implements AnnotationTypeElementDoc {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @since 1.5
  */
 
+@Deprecated
 public class AnnotationValueImpl implements AnnotationValue {
 
     private final DocEnv env;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -86,6 +86,7 @@
  * @author Scott Seligman (generics, enums, annotations)
  */
 
+@Deprecated
 public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc {
 
     public final ClassType type;        // protected->public for debugging
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java	Fri May 27 13:06:58 2016 -0700
@@ -45,6 +45,7 @@
  * @author Atul M Dambalkar
  * @author Neal Gafter (rewrite)
  */
+@Deprecated
 class Comment {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Neal Gafter (rewrite)
  */
 
+@Deprecated
 public class ConstructorDocImpl
         extends ExecutableMemberDocImpl implements ConstructorDoc {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java	Fri May 27 13:06:58 2016 -0700
@@ -72,6 +72,7 @@
  * @author Neal Gafter (rewrite)
  * @author Scott Seligman (generics)
  */
+@Deprecated
 public class DocEnv {
     protected static final Context.Key<DocEnv> docEnvKey = new Context.Key<>();
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -56,6 +56,7 @@
  * @author Atul M Dambalkar
  * @author Neal Gafter (rewrite)
  */
+@Deprecated
 public abstract class DocImpl implements Doc, Comparable<Object> {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java	Fri May 27 13:06:58 2016 -0700
@@ -40,6 +40,7 @@
  * @since 1.4
  * @author Robert Field
  */
+@Deprecated
 class DocLocale {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java	Fri May 27 13:06:58 2016 -0700
@@ -45,9 +45,6 @@
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.List;
 
-import static com.sun.javadoc.LanguageVersion.*;
-
-
 /**
  * Class creates, controls and invokes doclets.
  *
@@ -58,6 +55,7 @@
  *
  * @author Neal Gafter (rewrite)
  */
+@Deprecated
 public class DocletInvoker {
 
     private final Class<?> docletClass;
@@ -283,16 +281,16 @@
             Class<?>[] paramTypes = new Class<?>[0];
             Object[] params = new Object[0];
             try {
-                retVal = invoke(methodName, JAVA_1_1, paramTypes, params);
+                retVal = invoke(methodName, LanguageVersion.JAVA_1_1, paramTypes, params);
             } catch (DocletInvokeException exc) {
-                return JAVA_1_1;
+                return LanguageVersion.JAVA_1_1;
             }
             if (retVal instanceof LanguageVersion) {
                 return (LanguageVersion)retVal;
             } else {
                 messager.error(Messager.NOPOS, "main.must_return_languageversion",
                                docletClassName, methodName);
-                return JAVA_1_1;
+                return LanguageVersion.JAVA_1_1;
             }
         } catch (NoClassDefFoundError ex) { // for boostrapping, no Enum class.
             return null;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -51,6 +51,7 @@
  * @author Scott Seligman (generics, annotations)
  */
 
+@Deprecated
 public abstract class ExecutableMemberDocImpl
         extends MemberDocImpl implements ExecutableMemberDoc {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -51,6 +51,7 @@
  * @author Neal Gafter (rewrite)
  * @author Scott Seligman (generics, enums, annotations)
  */
+@Deprecated
 public class FieldDocImpl extends MemberDocImpl implements FieldDoc {
 
     protected final VarSymbol sym;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  *
  *  @author Neal Gafter
  */
+@Deprecated
 public class JavadocClassFinder extends ClassFinder {
 
     public static JavadocClassFinder instance(Context context) {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java	Fri May 27 13:06:58 2016 -0700
@@ -48,6 +48,7 @@
  *
  *  @author Neal Gafter
  */
+@Deprecated
 public class JavadocEnter extends Enter {
     public static JavadocEnter instance(Context context) {
         Enter instance = context.get(enterKey);
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java	Fri May 27 13:06:58 2016 -0700
@@ -47,6 +47,7 @@
  *
  *  @author Neal Gafter
  */
+@Deprecated
 public class JavadocMemberEnter extends MemberEnter {
     public static JavadocMemberEnter instance0(Context context) {
         MemberEnter instance = context.get(memberEnterKey);
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java	Fri May 27 13:06:58 2016 -0700
@@ -39,6 +39,7 @@
  *
  *  @author Neal Gafter
  */
+@Deprecated
 public class JavadocTodo extends Todo {
     public static void preRegister(Context context) {
         context.put(todoKey, new Context.Factory<Todo>() {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java	Fri May 27 13:06:58 2016 -0700
@@ -67,6 +67,7 @@
  *
  *  @author Neal Gafter
  */
+@Deprecated
 public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
     DocEnv docenv;
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -49,6 +49,7 @@
  * @author Neal Gafter
  */
 
+@Deprecated
 public abstract class MemberDocImpl
     extends ProgramElementDocImpl
     implements MemberDoc {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java	Fri May 27 13:06:58 2016 -0700
@@ -52,6 +52,7 @@
  * @see java.text.MessageFormat
  * @author Neal Gafter (rewrite)
  */
+@Deprecated
 public class Messager extends Log implements DocErrorReporter {
     public static final SourcePosition NOPOS = null;
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -47,6 +47,7 @@
  * @author Neal Gafter (rewrite)
  */
 
+@Deprecated
 public class MethodDocImpl
         extends ExecutableMemberDocImpl implements MethodDoc {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  *   @author Robert Field
  */
 
+@Deprecated
 public class ModifierFilter {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -62,6 +62,7 @@
  * @author Scott Seligman (package-info.java)
  */
 
+@Deprecated
 public class PackageDocImpl extends DocImpl implements PackageDoc {
 
     public final PackageSymbol sym;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -41,6 +41,7 @@
  * @author Robert Field
  *
  */
+@Deprecated
 class ParamTagImpl extends TagImpl implements ParamTag {
 
     private static final Pattern typeParamRE = Pattern.compile("<([^<>]+)>");
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Robert Field (rewrite)
  * @author Scott Seligman (generics, annotations)
  */
+@Deprecated
 class ParameterImpl implements Parameter {
 
     private final DocEnv env;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -46,6 +46,7 @@
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
 public class ParameterizedTypeImpl
         extends AbstractTypeImpl implements ParameterizedType {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java	Fri May 27 13:06:58 2016 -0700
@@ -33,6 +33,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 class PrimitiveType implements com.sun.javadoc.Type {
 
     private final String name;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -55,6 +55,7 @@
  * @author Neal Gafter (rewrite)
  * @author Scott Seligman (generics, enums, annotations)
  */
+@Deprecated
 public abstract class ProgramElementDocImpl
         extends DocImpl implements ProgramElementDoc {
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -54,6 +54,7 @@
  * @author Atul M Dambalkar
  * @author Neal Gafter (rewrite)
  */
+@Deprecated
 public class RootDocImpl extends DocImpl implements RootDoc {
 
     /**
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -50,6 +50,7 @@
  * @author Atul M Dambalkar
  *
  */
+@Deprecated
 class SeeTagImpl extends TagImpl implements SeeTag, LayoutCharacters {
 
     //### TODO: Searching for classes, fields, and methods
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -51,6 +51,7 @@
  *
  * @see java.io.ObjectStreamField
  */
+@Deprecated
 class SerialFieldTagImpl
     extends TagImpl
     implements SerialFieldTag, Comparable<Object>
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java	Fri May 27 13:06:58 2016 -0700
@@ -66,6 +66,7 @@
  * @author Joe Fialli
  * @author Neal Gafter (rewrite but not too proud)
  */
+@Deprecated
 class SerializedForm {
     ListBuffer<MethodDoc> methods = new ListBuffer<>();
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @author Neal M Gafter
  * @author Michael Van De Vanter (position representation changed to char offsets)
  */
+@Deprecated
 public class SourcePositionImpl implements SourcePosition {
     FileObject filename;
     int position;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java	Fri May 27 13:06:58 2016 -0700
@@ -69,6 +69,7 @@
  * @author Robert Field
  * @author Neal Gafter (rewrite)
  */
+@Deprecated
 public class Start extends ToolOption.Helper {
     /** Context for this invocation. */
     private final Context context;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -48,6 +48,7 @@
  * @see Doc#tags()
  *
  */
+@Deprecated
 class TagImpl implements Tag {
 
     protected final String text;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  * @see ExecutableMemberDocImpl#throwsTags()
  *
  */
+@Deprecated
 class ThrowsTagImpl extends TagImpl implements ThrowsTag {
 
     private final String exceptionName;
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java	Fri May 27 13:06:58 2016 -0700
@@ -43,6 +43,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public enum ToolOption {
     // ----- options for underlying compiler -----
 
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java	Fri May 27 13:06:58 2016 -0700
@@ -42,6 +42,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@Deprecated
 public class TypeMaker {
 
     public static com.sun.javadoc.Type getType(DocEnv env, Type t) {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -52,6 +52,7 @@
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
 public class TypeVariableImpl extends AbstractTypeImpl implements TypeVariable {
 
     TypeVariableImpl(DocEnv env, TypeVar type) {
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java	Fri May 27 13:06:58 2016 -0700
@@ -44,6 +44,7 @@
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
 public class WildcardTypeImpl extends AbstractTypeImpl implements WildcardType {
 
     WildcardTypeImpl(DocEnv env, Type.WildcardType type) {
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Fri May 27 13:06:58 2016 -0700
@@ -1596,7 +1596,7 @@
                 first = false;
             }
         } catch (SecurityException | IOException exc) {
-            throw new com.sun.tools.doclets.internal.toolkit.util.DocletAbortException(exc);
+            throw new DocletAbortException(exc);
         }
     }
 
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java	Fri May 27 12:37:18 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java	Fri May 27 13:06:58 2016 -0700
@@ -81,6 +81,7 @@
  */
 public class Start extends ToolOption.Helper {
 
+    @SuppressWarnings("deprecation")
     private static final Class<?> OldStdDoclet =
             com.sun.tools.doclets.standard.Standard.class;
 
@@ -564,6 +565,7 @@
      * all other conditions including errors it returns false, allowing
      * nature to take its own course.
      */
+    @SuppressWarnings("deprecation")
     private boolean hasOldTaglet(List<String> tagletNames, List<File> tagletPaths) {
         if (!fileManager.hasLocation(TAGLET_PATH)) {
             try {