changeset 45742:36bf0f2436ad

8177511: Remove the old standard doclet Reviewed-by: jjg
author ksrini
date Wed, 21 Jun 2017 19:39:51 -0700
parents 9927a9f16738
children db6aedca2c8c
files 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/formats/html/markup/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties 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/builders/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/glass.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/external/jquery/jquery.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_222222_256x240.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_2e83ff_256x240.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_454545_256x240.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_888888_256x240.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_cd0a0a_256x240.png langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-1.10.2.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.css langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.css langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.css langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.min.css langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.min.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.min.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/search.js langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/x.png 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/taglets/package-info.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/FatalError.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/internal/toolkit/util/links/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java langtools/src/jdk.javadoc/share/classes/module-info.java langtools/test/com/sun/javadoc/5093723/DocumentedClass.java langtools/test/com/sun/javadoc/5093723/T5093723.java langtools/test/com/sun/javadoc/5093723/UndocumentedClass.java langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java langtools/test/com/sun/javadoc/AccessAsciiArt/p1/C.java langtools/test/com/sun/javadoc/AccessAsciiArt/p1/I.java langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java langtools/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java langtools/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java langtools/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java langtools/test/com/sun/javadoc/AccessH1/AccessH1.java langtools/test/com/sun/javadoc/AccessH1/p1/C.java langtools/test/com/sun/javadoc/AccessH1/p2/C2.java langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java langtools/test/com/sun/javadoc/AccessSkipNav/p1/C1.java langtools/test/com/sun/javadoc/AccessSkipNav/p2/C2.java langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java langtools/test/com/sun/javadoc/AccessSummary/p1/C1.java langtools/test/com/sun/javadoc/AccessSummary/p2/C2.java langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java langtools/test/com/sun/javadoc/AuthorDD/p1/C1.java langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java langtools/test/com/sun/javadoc/DocRootSlash/overview.html langtools/test/com/sun/javadoc/DocRootSlash/p1/C1.java langtools/test/com/sun/javadoc/DocRootSlash/p1/package.html langtools/test/com/sun/javadoc/DocRootSlash/p2/C2.java langtools/test/com/sun/javadoc/DocRootSlash/p2/package.html langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java langtools/test/com/sun/javadoc/JavascriptWinTitle/overview.html langtools/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java langtools/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java langtools/test/com/sun/javadoc/JavascriptWinTitle/package-list langtools/test/com/sun/javadoc/MetaTag/MetaTag.java langtools/test/com/sun/javadoc/MetaTag/p1/C1.java langtools/test/com/sun/javadoc/MetaTag/p2/C2.java langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java langtools/test/com/sun/javadoc/PackagesHeader/p1/C1.java langtools/test/com/sun/javadoc/PackagesHeader/p2/C2.java langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java langtools/test/com/sun/javadoc/T6735320/T6735320.java langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java langtools/test/com/sun/javadoc/ValidHtml/overview.html langtools/test/com/sun/javadoc/ValidHtml/p1/C.java langtools/test/com/sun/javadoc/ValidHtml/p2/C2.java langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java langtools/test/com/sun/javadoc/VersionNumber/p1/C.java langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java langtools/test/com/sun/javadoc/WindowTitles/p1/C1.java langtools/test/com/sun/javadoc/WindowTitles/p2/C2.java langtools/test/com/sun/javadoc/_template/Template.java langtools/test/com/sun/javadoc/_template/TemplateComplete.java langtools/test/com/sun/javadoc/constantValues/A.java langtools/test/com/sun/javadoc/constantValues/TestConstantValues.java langtools/test/com/sun/javadoc/constantValues/TestConstantValues2.java langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java langtools/test/com/sun/javadoc/lib/JavadocTester.java langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java langtools/test/com/sun/javadoc/testAbsLinkPath/pkg1/C1.java langtools/test/com/sun/javadoc/testAbsLinkPath/pkg2/C2.java langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java langtools/test/com/sun/javadoc/testAbstractMethod/pkg/A.java langtools/test/com/sun/javadoc/testAbstractMethod/pkg/B.java langtools/test/com/sun/javadoc/testAbstractMethod/pkg/C.java langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationTypeField.java langtools/test/com/sun/javadoc/testBackSlashInLink/C.java langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java langtools/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar langtools/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java langtools/test/com/sun/javadoc/testBadSourceFile/C1.java langtools/test/com/sun/javadoc/testBadSourceFile/C2.java langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java langtools/test/com/sun/javadoc/testBaseClass/Bar.java langtools/test/com/sun/javadoc/testBaseClass/BaseClass.java langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java langtools/test/com/sun/javadoc/testBaseClass/baz/Foo.java langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java langtools/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java langtools/test/com/sun/javadoc/testCharset/TestCharset.java langtools/test/com/sun/javadoc/testCharset/pkg/Foo.java langtools/test/com/sun/javadoc/testClassCrossReferences/C.java langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java langtools/test/com/sun/javadoc/testClassCrossReferences/package-list langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java langtools/test/com/sun/javadoc/testClassTree/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java langtools/test/com/sun/javadoc/testClassTree/pkg/Coin.java langtools/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java langtools/test/com/sun/javadoc/testCmndLineClass/C5.java langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java langtools/test/com/sun/javadoc/testConstructorIndent/C.java langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java langtools/test/com/sun/javadoc/testConstructors/pkg1/Outer.java langtools/test/com/sun/javadoc/testCustomTag/TagTestClass.java langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java langtools/test/com/sun/javadoc/testCustomTag/taglets/CustomTag.java langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestEnum.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java langtools/test/com/sun/javadoc/testDocFileDir/pkg/C.java langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java langtools/test/com/sun/javadoc/testDocFiles/pkg/Test.java langtools/test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java langtools/test/com/sun/javadoc/testDocRootInlineTag/package-list langtools/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java langtools/test/com/sun/javadoc/testEmptyClass/src/Empty.java langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java langtools/test/com/sun/javadoc/testEnclosingClass/pkg/MyClass.java langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java langtools/test/com/sun/javadoc/testExternalOverridenMethod/package-list langtools/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java langtools/test/com/sun/javadoc/testGroupOption/pkg1/C.java langtools/test/com/sun/javadoc/testGroupOption/pkg2/C.java langtools/test/com/sun/javadoc/testGroupOption/pkg3/C.java langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java langtools/test/com/sun/javadoc/testHeadings/pkg1/C1.java langtools/test/com/sun/javadoc/testHeadings/pkg2/C2.java langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java langtools/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java langtools/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java langtools/test/com/sun/javadoc/testHref/TestHref.java langtools/test/com/sun/javadoc/testHref/package-list langtools/test/com/sun/javadoc/testHref/pkg/C1.java langtools/test/com/sun/javadoc/testHref/pkg/C2.java langtools/test/com/sun/javadoc/testHref/pkg/C4.java langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java langtools/test/com/sun/javadoc/testHtmlComments/C.java langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java langtools/test/com/sun/javadoc/testHtmlDocument/testLink.html langtools/test/com/sun/javadoc/testHtmlDocument/testMarkup.html langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg1/TestTable.java langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg2/TestUse.java langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C3.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java langtools/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java langtools/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnotherClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestError.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestException.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestInterface.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg/package-info.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/NestedInnerClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/ProtectedInnerClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PublicExcludeInnerClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/RegClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/Interface.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestAnnotationType.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestClass.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestEnum.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestError.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestException.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestInterface.java langtools/test/com/sun/javadoc/testHtmlVersion/pkg3/ClassNoConstants.java langtools/test/com/sun/javadoc/testHtmlVersion/profile-rtjar-includes.txt langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java langtools/test/com/sun/javadoc/testIndentation/p/Indent.java langtools/test/com/sun/javadoc/testIndentation/p/IndentAnnot.java langtools/test/com/sun/javadoc/testIndex/NoPackage.java langtools/test/com/sun/javadoc/testIndex/TestIndex.java langtools/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testIndex/pkg/C.java langtools/test/com/sun/javadoc/testIndex/pkg/Coin.java langtools/test/com/sun/javadoc/testIndex/pkg/Interface.java langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html langtools/test/com/sun/javadoc/testInterface/TestInterface.java langtools/test/com/sun/javadoc/testInterface/pkg/Child.java langtools/test/com/sun/javadoc/testInterface/pkg/Interface.java langtools/test/com/sun/javadoc/testInterface/pkg/Parent.java langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java langtools/test/com/sun/javadoc/testJavascript/pkg/C.java langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java langtools/test/com/sun/javadoc/testLambdaFeature/pkg/B.java langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java langtools/test/com/sun/javadoc/testLegacyTaglet/C.java langtools/test/com/sun/javadoc/testLegacyTaglet/Check.java langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java langtools/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java langtools/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java langtools/test/com/sun/javadoc/testLinkOption/extra/StringBuilder.java langtools/test/com/sun/javadoc/testLinkOption/jdk/package-list langtools/test/com/sun/javadoc/testLinkOption/mylib/lang/StringBuilderChild.java langtools/test/com/sun/javadoc/testLinkOption/pkg/C.java langtools/test/com/sun/javadoc/testLinkOption/pkg2/C2.java langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java langtools/test/com/sun/javadoc/testLinkTaglet/pkg/C.java langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java langtools/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java langtools/test/com/sun/javadoc/testLiteralCodeInPre/pkg/Test.java langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java langtools/test/com/sun/javadoc/testMemberInheritence/diamond/A.java langtools/test/com/sun/javadoc/testMemberInheritence/diamond/B.java langtools/test/com/sun/javadoc/testMemberInheritence/diamond/C.java langtools/test/com/sun/javadoc/testMemberInheritence/diamond/X.java langtools/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java langtools/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java langtools/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java langtools/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java langtools/test/com/sun/javadoc/testMemberSummary/pkg2/A.java langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java langtools/test/com/sun/javadoc/testMethodTypes/pkg1/A.java langtools/test/com/sun/javadoc/testMethodTypes/pkg1/B.java langtools/test/com/sun/javadoc/testMethodTypes/pkg1/D.java langtools/test/com/sun/javadoc/testModifier/Interface.java langtools/test/com/sun/javadoc/testModifier/ModifierAbstract.java langtools/test/com/sun/javadoc/testModifier/Test.java langtools/test/com/sun/javadoc/testModifier/TestModifier.java langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java langtools/test/com/sun/javadoc/testNavigation/pkg/A.java langtools/test/com/sun/javadoc/testNavigation/pkg/C.java langtools/test/com/sun/javadoc/testNavigation/pkg/E.java langtools/test/com/sun/javadoc/testNavigation/pkg/I.java langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SubInterface.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo4.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest.java langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java langtools/test/com/sun/javadoc/testNoPackagesFile/C.java langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/C.java langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/Negative.java langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java langtools/test/com/sun/javadoc/testNotifications/pkg/C.java langtools/test/com/sun/javadoc/testOptions/TestOptions.java langtools/test/com/sun/javadoc/testOptions/pkg/Foo.java langtools/test/com/sun/javadoc/testOrdering/C.java langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java langtools/test/com/sun/javadoc/testOrdering/UsedInC.java langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java langtools/test/com/sun/javadoc/testOrdering/pkg1/C1.java langtools/test/com/sun/javadoc/testOrdering/pkg1/C2.java langtools/test/com/sun/javadoc/testOrdering/pkg1/C3.java langtools/test/com/sun/javadoc/testOrdering/pkg1/C4.java langtools/test/com/sun/javadoc/testOrdering/pkg1/MethodOrder.java langtools/test/com/sun/javadoc/testOrdering/pkg1/UsedClass.java langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/SubClass.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I0.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I2.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I4.java langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java langtools/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java langtools/test/com/sun/javadoc/testPackagePage/com/pkg/C.java langtools/test/com/sun/javadoc/testPackagePage/com/pkg/package.html langtools/test/com/sun/javadoc/testPackagePage/pkg2/C.java langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java langtools/test/com/sun/javadoc/testParamTaglet/pkg/C.java langtools/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/I.java langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java langtools/test/com/sun/javadoc/testRelativeLinks/pkg/C.java langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html langtools/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java langtools/test/com/sun/javadoc/testSearch/TestSearch.java langtools/test/com/sun/javadoc/testSearch/UnnamedPkgClass.java langtools/test/com/sun/javadoc/testSearch/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testSearch/pkg/AnotherClass.java langtools/test/com/sun/javadoc/testSearch/pkg/TestError.java langtools/test/com/sun/javadoc/testSearch/pkg/TestException.java langtools/test/com/sun/javadoc/testSearch/pkg/TestInterface.java langtools/test/com/sun/javadoc/testSearch/pkg/package-info.java langtools/test/com/sun/javadoc/testSearch/pkg1/NestedInnerClass.java langtools/test/com/sun/javadoc/testSearch/pkg1/PrivateIncludeInnerClass.java langtools/test/com/sun/javadoc/testSearch/pkg1/ProtectedInnerClass.java langtools/test/com/sun/javadoc/testSearch/pkg1/PublicExcludeInnerClass.java langtools/test/com/sun/javadoc/testSearch/pkg1/RegClass.java langtools/test/com/sun/javadoc/testSearch/pkg2/DeprecatedClassByAnnotation.java langtools/test/com/sun/javadoc/testSearch/pkg2/Interface.java langtools/test/com/sun/javadoc/testSearch/pkg2/TestAnnotationType.java langtools/test/com/sun/javadoc/testSearch/pkg2/TestClass.java langtools/test/com/sun/javadoc/testSearch/pkg2/TestEnum.java langtools/test/com/sun/javadoc/testSearch/pkg2/TestError.java langtools/test/com/sun/javadoc/testSearch/pkg2/TestException.java langtools/test/com/sun/javadoc/testSearch/pkg2/TestInterface.java langtools/test/com/sun/javadoc/testSearch/pkg3/ClassNoConstants.java langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java langtools/test/com/sun/javadoc/testSeeTag/pkg/Test.java langtools/test/com/sun/javadoc/testSerialVersionUID/C.java langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java langtools/test/com/sun/javadoc/testSerializedForm/pkg1/NestedInnerClass.java langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PrivateIncludeInnerClass.java langtools/test/com/sun/javadoc/testSerializedForm/pkg1/ProtectedInnerClass.java langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PublicExcludeInnerClass.java langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java langtools/test/com/sun/javadoc/testSimpleTag/C.java langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java langtools/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java langtools/test/com/sun/javadoc/testSimpleTagInherit/p/BaseClass.java langtools/test/com/sun/javadoc/testSimpleTagInherit/p/TestClass.java langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C1.java langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C2.java langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/package.html langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java langtools/test/com/sun/javadoc/testStylesheet/pkg/A.java langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java langtools/test/com/sun/javadoc/testSubTitle/pkg/C.java langtools/test/com/sun/javadoc/testSubTitle/pkg/package.html langtools/test/com/sun/javadoc/testSummaryHeading/C.java langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SuperClass.java langtools/test/com/sun/javadoc/testSupplementary/C.java langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java langtools/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java langtools/test/com/sun/javadoc/testTagOutput/pkg1/DeprecatedTag.java langtools/test/com/sun/javadoc/testTaglets/C.java langtools/test/com/sun/javadoc/testTaglets/Child.java langtools/test/com/sun/javadoc/testTaglets/Parent.java langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java langtools/test/com/sun/javadoc/testThrowsHead/C.java langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java langtools/test/com/sun/javadoc/testThrowsInheritence/C.java langtools/test/com/sun/javadoc/testThrowsInheritence/Foo.java langtools/test/com/sun/javadoc/testThrowsInheritence/I.java langtools/test/com/sun/javadoc/testThrowsInheritence/Iface.java langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/C.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/P.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T1.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T2.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T3.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T4.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T5.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T6.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T7.java langtools/test/com/sun/javadoc/testThrowsTag/pkg/T8.java langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java langtools/test/com/sun/javadoc/testTitleInHref/package-list langtools/test/com/sun/javadoc/testTitleInHref/pkg/Class.java langtools/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java langtools/test/com/sun/javadoc/testTitleInHref/pkg/Links.java langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java langtools/test/com/sun/javadoc/testTopOption/overview.html langtools/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java langtools/test/com/sun/javadoc/testTopOption/pkg/Cl.java langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassExtends.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassParameters.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Fields.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodReturnType.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodTypeParameters.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Parameters.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Throws.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Wildcards.java langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java langtools/test/com/sun/javadoc/testTypeParams/pkg/C.java langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java langtools/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java langtools/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java langtools/test/com/sun/javadoc/testTypeParams/pkg/Parent.java langtools/test/com/sun/javadoc/testUnnamedPackage/BadSource.java langtools/test/com/sun/javadoc/testUnnamedPackage/C.java langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java langtools/test/com/sun/javadoc/testUnnamedPackage/package.html langtools/test/com/sun/javadoc/testUseOption/C.java langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java langtools/test/com/sun/javadoc/testUseOption/UsedInC.java langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C1.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C10.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C2.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C4.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C5.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C6.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C7.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C8.java langtools/test/com/sun/javadoc/testUseOption/pkg1/C9.java langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterface.java langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterfaceA.java langtools/test/com/sun/javadoc/testUseOption/pkg1/package.html langtools/test/com/sun/javadoc/testUseOption/pkg2/C3.java langtools/test/com/sun/javadoc/testUseOption/pkg2/package.html langtools/test/com/sun/javadoc/testUseOption/unique/C1.java langtools/test/com/sun/javadoc/testUseOption/unique/UseMe.java langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java langtools/test/com/sun/javadoc/testValueTag/pkg1/Class1.java langtools/test/com/sun/javadoc/testValueTag/pkg1/Class2.java langtools/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java langtools/test/com/sun/javadoc/testValueTag/pkg2/Class3.java langtools/test/com/sun/javadoc/testValueTag/pkg2/package.html langtools/test/com/sun/javadoc/testWarnBadParamNames/C.java langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java langtools/test/com/sun/javadoc/testWarnings/pkg/X.java langtools/test/com/sun/javadoc/testWarnings/pkg/package.html langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java langtools/test/com/sun/javadoc/testXOption/TestXOption.java langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java langtools/test/tools/javadoc/6942366/T6942366.java langtools/test/tools/javadoc/6958836/Test.java langtools/test/tools/javadoc/6958836/errs/Errors.java langtools/test/tools/javadoc/6958836/warns/Warnings.java langtools/test/tools/javadoc/6964914/Test.java langtools/test/tools/javadoc/BadOptionsTest.java langtools/test/tools/javadoc/CheckResourceKeys.java langtools/test/tools/javadoc/MaxWarns.java langtools/test/tools/javadoc/ReleaseOption.java langtools/test/tools/javadoc/T4696488.java langtools/test/tools/javadoc/T6551367.java langtools/test/tools/javadoc/T6968833.java langtools/test/tools/javadoc/TestScriptInComment.java langtools/test/tools/javadoc/api/basic/TagletPathTest.java langtools/test/tools/javadoc/badSuper/BadSuper.java langtools/test/tools/javadoc/badSuper/p/A.java langtools/test/tools/javadoc/badSuper/p/B.java langtools/test/tools/javadoc/lib/ToyDoclet.java langtools/test/tools/javadoc/nonConstExprs/Test.java langtools/test/tools/javadoc/parser/7091528/T7091528.java langtools/test/tools/javadoc/sampleapi/SampleApiTest.java langtools/test/tools/javadoc/sampleapi/res/fx.xml langtools/test/tools/javadoc/sampleapi/res/simple.xml langtools/test/tools/javadoc/sampleapi/res/sub.xml langtools/test/tools/javadoc/sampleapi/res/tiny.xml
diffstat 849 files changed, 271 insertions(+), 110605 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets;
-
-import com.sun.javadoc.*;
-
-/**
- * The interface for a custom tag used by Doclets. A custom
- * tag must implement this interface.
- *
- * <p style="font-style: italic; font-size:larger">
- * <b>Note:</b> This interface has been superseded by its replacement,
- * {@link jdk.javadoc.doclet.Taglet}.
- * </p>
- *
- * To be loaded and used by
- * doclets at run-time, the taglet must have a static method called
- * <code>register</code> that accepts a {@link java.util.Map} as an
- * argument with the following signature:
- * <pre>
- *   public void register(Map map)
- * </pre>
- * This method should add an instance of the custom taglet to the map
- * with the name of the taglet as the key.  If overriding a taglet,
- * to avoid a name conflict, the overridden taglet must be deleted from
- * the map before an instance of the new taglet is added to the map.
- * <p>
- * It is recommended that the taglet throw an exception when it fails
- * to register itself.  The exception that it throws is up to the user.
- * <p>
- * Here are two sample taglets: <br>
- * <ul>
- *  <li><a href="http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/ToDoTaglet.java">ToDoTaglet.java</a>
- *         - Standalone taglet</li>
- *  <li><a href="http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/UnderlineTaglet.java">UnderlineTaglet.java</a>
- *         - Inline taglet</li>
- * </ul>
- * <p>
- * For more information on how to create your own Taglets, please see the
- * <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/overview.html">Taglet Overview</a>.
- *
- * @since 1.4
- * @author Jamie Ho
- *
- * @deprecated
- * This interface has been superseded by its replacement,
- * {@link jdk.javadoc.doclet.Taglet}.
- */
-@Deprecated
-public interface Taglet {
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in field documentation.  Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in field documentation and false
-     * otherwise.
-     */
-    public abstract boolean inField();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in constructor documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in constructor documentation and false
-     * otherwise.
-     */
-    public abstract boolean inConstructor();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in method documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public abstract boolean inMethod();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in overview documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public abstract boolean inOverview();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in package documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in package documentation and false
-     * otherwise.
-     */
-    public abstract boolean inPackage();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in type documentation (classes or
-     * interfaces). Set to false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in type documentation and false
-     * otherwise.
-     */
-    public abstract boolean inType();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag. Return false otherwise.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public abstract boolean isInlineTag();
-
-    /**
-     * Return the name of this custom tag.
-     * @return the name of this custom tag.
-     */
-    public abstract String getName();
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its string representation, which is output
-     * to the generated page.
-     * @param tag the <code>Tag</code> representation of this custom tag.
-     * @return the string representation of this <code>Tag</code>.
-     */
-    public abstract String toString(Tag tag);
-
-    /**
-     * Given an array of <code>Tag</code>s representing this custom
-     * tag, return its string representation, which is output
-     * to the generated page.  This method should
-     * return null if this taglet represents an inline tag.
-     * @param tags the array of <code>Tag</code>s representing of this custom tag.
-     * @return the string representation of this <code>Tag</code>.
-     */
-    public abstract String toString(Tag[] tags);
-
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Print method and constructor info.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class AbstractExecutableMemberWriter extends AbstractMemberWriter {
-
-    public AbstractExecutableMemberWriter(SubWriterHolderWriter writer,
-            ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    public AbstractExecutableMemberWriter(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * Add the type parameters for the executable member.
-     *
-     * @param member the member to write type parameters for.
-     * @param htmltree the content tree to which the parameters will be added.
-     */
-    protected void addTypeParameters(ExecutableMemberDoc member, Content htmltree) {
-        Content typeParameters = getTypeParameters(member);
-        if (!typeParameters.isEmpty()) {
-            htmltree.addContent(typeParameters);
-            htmltree.addContent(writer.getSpace());
-        }
-    }
-
-    /**
-     * Get the type parameters for the executable member.
-     *
-     * @param member the member for which to get the type parameters.
-     * @return the type parameters.
-     */
-    protected Content getTypeParameters(ExecutableMemberDoc member) {
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-            LinkInfoImpl.Kind.MEMBER_TYPE_PARAMS, member);
-        return writer.getTypeParameterLinks(linkInfo);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, (MemberDoc) emd,
-                emd.qualifiedName() + emd.flatSignature());
-    }
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param cd the classDoc that we should link to
-     * @param member the member being linked to
-     * @param tdSummary the content tree to which the link will be added
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-        String name = emd.name();
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, cd, (MemberDoc) emd,
-                name, false));
-        Content code = HtmlTree.CODE(memberLink);
-        addParameters(emd, false, code, name.length() - 1);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * Add the inherited summary link for the member.
-     *
-     * @param cd the classDoc that we should link to
-     * @param member the member being linked to
-     * @param linksTree the content tree to which the link will be added
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        linksTree.addContent(
-                writer.getDocLink(LinkInfoImpl.Kind.MEMBER, cd, (MemberDoc) member,
-                member.name(), false));
-    }
-
-    /**
-     * Add the parameter for the executable member.
-     *
-     * @param member the member to write parameter for.
-     * @param param the parameter that needs to be written.
-     * @param isVarArg true if this is a link to var arg.
-     * @param tree the content tree to which the parameter information will be added.
-     */
-    protected void addParam(ExecutableMemberDoc member, Parameter param,
-            boolean isVarArg, Content tree) {
-        if (param.type() != null) {
-            Content link = writer.getLink(new LinkInfoImpl(
-                    configuration, LinkInfoImpl.Kind.EXECUTABLE_MEMBER_PARAM,
-                    param.type()).varargs(isVarArg));
-            tree.addContent(link);
-        }
-        if(param.name().length() > 0) {
-            tree.addContent(writer.getSpace());
-            tree.addContent(param.name());
-        }
-    }
-
-    /**
-     * Add the receiver annotations information.
-     *
-     * @param member the member to write receiver annotations for.
-     * @param rcvrType the receiver type.
-     * @param descList list of annotation description.
-     * @param tree the content tree to which the information will be added.
-     */
-    protected void addReceiverAnnotations(ExecutableMemberDoc member, Type rcvrType,
-            AnnotationDesc[] descList, Content tree) {
-        writer.addReceiverAnnotationInfo(member, descList, tree);
-        tree.addContent(writer.getSpace());
-        tree.addContent(rcvrType.typeName());
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_SIGNATURE, rcvrType);
-        tree.addContent(writer.getTypeParameterLinks(linkInfo));
-        tree.addContent(writer.getSpace());
-        tree.addContent("this");
-    }
-
-
-    /**
-     * Add all the parameters for the executable member.
-     *
-     * @param member the member to write parameters for.
-     * @param htmltree the content tree to which the parameters information will be added.
-     */
-    protected void addParameters(ExecutableMemberDoc member, Content htmltree, int indentSize) {
-        addParameters(member, true, htmltree, indentSize);
-    }
-
-    /**
-     * Add all the parameters for the executable member.
-     *
-     * @param member the member to write parameters for.
-     * @param includeAnnotations true if annotation information needs to be added.
-     * @param htmltree the content tree to which the parameters information will be added.
-     */
-    protected void addParameters(ExecutableMemberDoc member,
-            boolean includeAnnotations, Content htmltree, int indentSize) {
-        htmltree.addContent("(");
-        String sep = "";
-        Parameter[] params = member.parameters();
-        String indent = makeSpace(indentSize + 1);
-        Type rcvrType = member.receiverType();
-        if (includeAnnotations && rcvrType instanceof AnnotatedType) {
-            AnnotationDesc[] descList = rcvrType.asAnnotatedType().annotations();
-            if (descList.length > 0) {
-                addReceiverAnnotations(member, rcvrType, descList, htmltree);
-                sep = "," + DocletConstants.NL + indent;
-            }
-        }
-        int paramstart;
-        for (paramstart = 0; paramstart < params.length; paramstart++) {
-            htmltree.addContent(sep);
-            Parameter param = params[paramstart];
-            if (!param.name().startsWith("this$")) {
-                if (includeAnnotations) {
-                    boolean foundAnnotations =
-                            writer.addAnnotationInfo(indent.length(),
-                            member, param, htmltree);
-                    if (foundAnnotations) {
-                        htmltree.addContent(DocletConstants.NL);
-                        htmltree.addContent(indent);
-                    }
-                }
-                addParam(member, param,
-                    (paramstart == params.length - 1) && member.isVarArgs(), htmltree);
-                break;
-            }
-        }
-
-        for (int i = paramstart + 1; i < params.length; i++) {
-            htmltree.addContent(",");
-            htmltree.addContent(DocletConstants.NL);
-            htmltree.addContent(indent);
-            if (includeAnnotations) {
-                boolean foundAnnotations =
-                        writer.addAnnotationInfo(indent.length(), member, params[i],
-                        htmltree);
-                if (foundAnnotations) {
-                    htmltree.addContent(DocletConstants.NL);
-                    htmltree.addContent(indent);
-                }
-            }
-            addParam(member, params[i], (i == params.length - 1) && member.isVarArgs(),
-                    htmltree);
-        }
-        htmltree.addContent(")");
-    }
-
-    /**
-     * Add exceptions for the executable member.
-     *
-     * @param member the member to write exceptions for.
-     * @param htmltree the content tree to which the exceptions information will be added.
-     */
-    protected void addExceptions(ExecutableMemberDoc member, Content htmltree, int indentSize) {
-        Type[] exceptions = member.thrownExceptionTypes();
-        if (exceptions.length > 0) {
-            LinkInfoImpl memberTypeParam = new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.MEMBER, member);
-            String indent = makeSpace(indentSize + 1 - 7);
-            htmltree.addContent(DocletConstants.NL);
-            htmltree.addContent(indent);
-            htmltree.addContent("throws ");
-            indent = makeSpace(indentSize + 1);
-            Content link = writer.getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.MEMBER, exceptions[0]));
-            htmltree.addContent(link);
-            for(int i = 1; i < exceptions.length; i++) {
-                htmltree.addContent(",");
-                htmltree.addContent(DocletConstants.NL);
-                htmltree.addContent(indent);
-                Content exceptionLink = writer.getLink(new LinkInfoImpl(
-                        configuration, LinkInfoImpl.Kind.MEMBER, exceptions[i]));
-                htmltree.addContent(exceptionLink);
-            }
-        }
-    }
-
-    protected ClassDoc implementsMethodInIntfac(MethodDoc method,
-                                                ClassDoc[] intfacs) {
-        for (ClassDoc intf : intfacs) {
-            MethodDoc[] methods = intf.methods();
-            if (methods.length > 0) {
-                for (MethodDoc md : methods) {
-                    if (md.name().equals(method.name()) &&
-                        md.signature().equals(method.signature())) {
-                        return intf;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * For backward compatibility, include an anchor using the erasures of the
-     * parameters.  NOTE:  We won't need this method anymore after we fix
-     * see tags so that they use the type instead of the erasure.
-     *
-     * @param emd the ExecutableMemberDoc to anchor to.
-     * @return the 1.4.x style anchor for the ExecutableMemberDoc.
-     */
-    protected String getErasureAnchor(ExecutableMemberDoc emd) {
-        StringBuilder buf = new StringBuilder(emd.name() + "(");
-        Parameter[] params = emd.parameters();
-        boolean foundTypeVariable = false;
-        for (int i = 0; i < params.length; i++) {
-            if (i > 0) {
-                buf.append(",");
-            }
-            Type t = params[i].type();
-            foundTypeVariable = foundTypeVariable || t.asTypeVariable() != null;
-            buf.append(t.isPrimitive() ?
-                t.typeName() : t.asClassDoc().qualifiedName());
-            buf.append(t.dimension());
-        }
-        buf.append(")");
-        return foundTypeVariable ? writer.getName(buf.toString()) : null;
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-import java.nio.file.*;
-import java.util.zip.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate Index for all the Member Names with Indexing in
- * Unicode Order. This class is a base class for {@link SingleIndexWriter} and
- * {@link SplitIndexWriter}. It uses the functionality from
- * {@link HtmlDocletWriter} to generate the Index Contents.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @see    IndexBuilder
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AbstractIndexWriter extends HtmlDocletWriter {
-
-    /**
-     * The index of all the members with unicode character.
-     */
-    protected IndexBuilder indexbuilder;
-
-    /**
-     * This constructor will be used by {@link SplitIndexWriter}. Initializes
-     * path to this file and relative path from this file.
-     *
-     * @param configuration  The current configuration
-     * @param path       Path to the file which is getting generated.
-     * @param indexbuilder Unicode based Index from {@link IndexBuilder}
-     */
-    protected AbstractIndexWriter(ConfigurationImpl configuration,
-                                  DocPath path,
-                                  IndexBuilder indexbuilder)
-                                  throws IOException {
-        super(configuration, path);
-        this.indexbuilder = indexbuilder;
-    }
-
-    /**
-     * Get the index label for navigation bar.
-     *
-     * @return a content tree for the tree label
-     */
-    protected Content getNavLinkIndex() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, indexLabel);
-        return li;
-    }
-
-    /**
-     * Add the member information for the unicode character along with the
-     * list of the members.
-     *
-     * @param uc Unicode for which member list information to be generated
-     * @param memberlist List of members for the unicode character
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addContents(Character uc, List<? extends Doc> memberlist,
-            Content contentTree) {
-        addHeading(uc, contentTree);
-        int memberListSize = memberlist.size();
-        // Display the list only if there are elements to be displayed.
-        if (memberListSize > 0) {
-            Content dl = new HtmlTree(HtmlTag.DL);
-            for (Doc element : memberlist) {
-                addDescription(dl, element);
-            }
-            contentTree.addContent(dl);
-        }
-    }
-
-    protected void addSearchContents(Character uc, List<SearchIndexItem> searchList,
-            Content contentTree) {
-        addHeading(uc, contentTree);
-        // Display the list only if there are elements to be displayed.
-        if (!searchList.isEmpty()) {
-            Content dl = new HtmlTree(HtmlTag.DL);
-            for (SearchIndexItem sii : searchList) {
-                addDescription(sii, dl);
-            }
-            contentTree.addContent(dl);
-        }
-    }
-
-    protected void addContents(Character uc, List<? extends Doc> memberlist, List<SearchIndexItem> searchList,
-            Content contentTree) {
-        addHeading(uc, contentTree);
-        int memberListSize = memberlist.size();
-        int searchListSize = searchList.size();
-        int i = 0;
-        int j = 0;
-        Content dl = new HtmlTree(HtmlTag.DL);
-        while (i < memberListSize && j < searchListSize) {
-            if (memberlist.get(i).name().compareTo(searchList.get(j).getLabel()) < 0) {
-                addDescription(dl, memberlist.get(i));
-                i++;
-            } else if (memberlist.get(i).name().compareTo(searchList.get(j).getLabel()) > 0) {
-                addDescription(searchList.get(j), dl);
-                j++;
-            } else {
-                addDescription(dl, memberlist.get(i));
-                addDescription(searchList.get(j), dl);
-                j++;
-                i++;
-            }
-        }
-        if (i >= memberListSize) {
-            while (j < searchListSize) {
-                addDescription(searchList.get(j), dl);
-                j++;
-            }
-        }
-        if (j >= searchListSize) {
-            while (i < memberListSize) {
-                addDescription(dl, memberlist.get(i));
-                i++;
-            }
-        }
-        contentTree.addContent(dl);
-    }
-
-    protected void addHeading(Character uc, Content contentTree) {
-        String unicode = uc.toString();
-        contentTree.addContent(getMarkerAnchorForIndex(unicode));
-        Content headContent = new StringContent(unicode);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, false,
-                HtmlStyle.title, headContent);
-        contentTree.addContent(heading);
-    }
-
-    protected void addDescription(Content dl, Doc element) {
-        SearchIndexItem si = new SearchIndexItem();
-        if (element instanceof MemberDoc) {
-            addDescription((MemberDoc) element, dl, si);
-            configuration.memberSearchIndex.add(si);
-        } else if (element instanceof ClassDoc) {
-            addDescription((ClassDoc) element, dl, si);
-            configuration.typeSearchIndex.add(si);
-        } else if (element instanceof PackageDoc) {
-            addDescription((PackageDoc) element, dl, si);
-            configuration.packageSearchIndex.add(si);
-        }
-    }
-    /**
-     * Add one line summary comment for the package.
-     *
-     * @param pkg the package to be documented
-     * @param dlTree the content tree to which the description will be added
-     */
-    protected void addDescription(PackageDoc pkg, Content dlTree, SearchIndexItem si) {
-        Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
-        si.setLabel(utils.getPackageName(pkg));
-        si.setCategory(getResource("doclet.Packages").toString());
-        Content dt = HtmlTree.DT(link);
-        dt.addContent(" - ");
-        dt.addContent(getResource("doclet.package"));
-        dt.addContent(" " + pkg.name());
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        addSummaryComment(pkg, dd);
-        dlTree.addContent(dd);
-    }
-
-    /**
-     * Add one line summary comment for the class.
-     *
-     * @param cd the class being documented
-     * @param dlTree the content tree to which the description will be added
-     */
-    protected void addDescription(ClassDoc cd, Content dlTree, SearchIndexItem si) {
-        Content link = getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.INDEX, cd).strong(true));
-        si.setContainingPackage(utils.getPackageName(cd.containingPackage()));
-        si.setLabel(cd.typeName());
-        si.setCategory(getResource("doclet.Types").toString());
-        Content dt = HtmlTree.DT(link);
-        dt.addContent(" - ");
-        addClassInfo(cd, dt);
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        addComment(cd, dd);
-        dlTree.addContent(dd);
-    }
-
-    /**
-     * Add the classkind (class, interface, exception), error of the class
-     * passed.
-     *
-     * @param cd the class being documented
-     * @param contentTree the content tree to which the class info will be added
-     */
-    protected void addClassInfo(ClassDoc cd, Content contentTree) {
-        contentTree.addContent(getResource("doclet.in",
-                utils.getTypeName(configuration, cd, false),
-                getPackageLink(cd.containingPackage(),
-                    utils.getPackageName(cd.containingPackage()))
-                ));
-    }
-
-    /**
-     * Add description for Class, Field, Method or Constructor.
-     *
-     * @param member MemberDoc for the member of the Class Kind
-     * @param dlTree the content tree to which the description will be added
-     */
-    protected void addDescription(MemberDoc member, Content dlTree, SearchIndexItem si) {
-        String name = (member instanceof ExecutableMemberDoc)?
-            member.name() + ((ExecutableMemberDoc)member).flatSignature() :
-            member.name();
-        si.setContainingPackage(utils.getPackageName((member.containingClass()).containingPackage()));
-        si.setContainingClass((member.containingClass()).typeName());
-        if (member instanceof ExecutableMemberDoc) {
-            ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-            si.setLabel(member.name() + emd.flatSignature());
-            if (!((emd.signature()).equals(emd.flatSignature()))) {
-                si.setUrl(getName(getAnchor((ExecutableMemberDoc) member)));
-            }
-        } else {
-            si.setLabel(member.name());
-        }
-        si.setCategory(getResource("doclet.Members").toString());
-        Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                getDocLink(LinkInfoImpl.Kind.INDEX, member, name));
-        Content dt = HtmlTree.DT(span);
-        dt.addContent(" - ");
-        addMemberDesc(member, dt);
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        addComment(member, dd);
-        dlTree.addContent(dd);
-    }
-
-    protected void addDescription(SearchIndexItem sii, Content dlTree) {
-        String path = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
-        path += sii.getUrl();
-        HtmlTree labelLink = HtmlTree.A(path, new StringContent(sii.getLabel()));
-        Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.searchTagLink, labelLink));
-        dt.addContent(" - ");
-        dt.addContent(getResource("doclet.Search_tag_in", sii.getHolder()));
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        if (sii.getDescription().isEmpty()) {
-            dd.addContent(getSpace());
-        } else {
-            dd.addContent(sii.getDescription());
-        }
-        dlTree.addContent(dd);
-    }
-
-    /**
-     * Add comment for each element in the index. If the element is deprecated
-     * and it has a @deprecated tag, use that comment. Else if the containing
-     * class for this element is deprecated, then add the word "Deprecated." at
-     * the start and then print the normal comment.
-     *
-     * @param element Index element
-     * @param contentTree the content tree to which the comment will be added
-     */
-    protected void addComment(ProgramElementDoc element, Content contentTree) {
-        Tag[] tags;
-        Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.block);
-        if (utils.isDeprecated(element)) {
-            div.addContent(span);
-            if ((tags = element.tags("deprecated")).length > 0)
-                addInlineDeprecatedComment(element, tags[0], div);
-            contentTree.addContent(div);
-        } else {
-            ClassDoc cont = element.containingClass();
-            while (cont != null) {
-                if (utils.isDeprecated(cont)) {
-                    div.addContent(span);
-                    contentTree.addContent(div);
-                    break;
-                }
-                cont = cont.containingClass();
-            }
-            addSummaryComment(element, contentTree);
-        }
-    }
-
-    /**
-     * Add description about the Static Varible/Method/Constructor for a
-     * member.
-     *
-     * @param member MemberDoc for the member within the Class Kind
-     * @param contentTree the content tree to which the member description will be added
-     */
-    protected void addMemberDesc(MemberDoc member, Content contentTree) {
-        ClassDoc containing = member.containingClass();
-        String classdesc = utils.getTypeName(
-                configuration, containing, true) + " ";
-        if (member.isField()) {
-            if (member.isStatic()) {
-                contentTree.addContent(
-                        getResource("doclet.Static_variable_in", classdesc));
-            } else {
-                contentTree.addContent(
-                        getResource("doclet.Variable_in", classdesc));
-            }
-        } else if (member.isConstructor()) {
-            contentTree.addContent(
-                    getResource("doclet.Constructor_for", classdesc));
-        } else if (member.isMethod()) {
-            if (member.isStatic()) {
-                contentTree.addContent(
-                        getResource("doclet.Static_method_in", classdesc));
-            } else {
-                contentTree.addContent(
-                        getResource("doclet.Method_in", classdesc));
-            }
-        }
-        addPreQualifiedClassLink(LinkInfoImpl.Kind.INDEX, containing,
-                false, contentTree);
-    }
-
-    /**
-     * Get the marker anchor which will be added to the index documentation tree.
-     *
-     * @param anchorNameForIndex the anchor name attribute for index page
-     * @return a content tree for the marker anchor
-     */
-    public Content getMarkerAnchorForIndex(String anchorNameForIndex) {
-        return getMarkerAnchor(getNameForIndex(anchorNameForIndex), null);
-    }
-
-    /**
-     * Generate a valid HTML name for member index page.
-     *
-     * @param unicode the string that needs to be converted to valid HTML name.
-     * @return a valid HTML name string.
-     */
-    public String getNameForIndex(String unicode) {
-        return "I:" + getName(unicode);
-    }
-
-    protected void createSearchIndexFiles() {
-        createSearchIndexFile(DocPaths.PACKAGE_SEARCH_INDEX_JSON, DocPaths.PACKAGE_SEARCH_INDEX_ZIP,
-                configuration.packageSearchIndex);
-        createSearchIndexFile(DocPaths.TYPE_SEARCH_INDEX_JSON, DocPaths.TYPE_SEARCH_INDEX_ZIP,
-                configuration.typeSearchIndex);
-        createSearchIndexFile(DocPaths.MEMBER_SEARCH_INDEX_JSON, DocPaths.MEMBER_SEARCH_INDEX_ZIP,
-                configuration.memberSearchIndex);
-        createSearchIndexFile(DocPaths.TAG_SEARCH_INDEX_JSON, DocPaths.TAG_SEARCH_INDEX_ZIP,
-                configuration.tagSearchIndex);
-    }
-
-    protected void createSearchIndexFile(DocPath searchIndexFile, DocPath searchIndexZip,
-            List<SearchIndexItem> searchIndex) {
-        if (!searchIndex.isEmpty()) {
-            try {
-                StringBuilder searchVar = new StringBuilder("[");
-                boolean first = true;
-                DocFile searchFile = DocFile.createFileForOutput(configuration, searchIndexFile);
-                Path p = Paths.get(searchFile.getPath());
-                for (SearchIndexItem item : searchIndex) {
-                    if (first) {
-                        searchVar.append(item.toString());
-                        first = false;
-                    } else {
-                        searchVar.append(",").append(item.toString());
-                    }
-                }
-                searchVar.append("]");
-                Files.write(p, searchVar.toString().getBytes());
-                DocFile zipFile = DocFile.createFileForOutput(configuration, searchIndexZip);
-                try (FileOutputStream fos = new FileOutputStream(zipFile.getPath());
-                        ZipOutputStream zos = new ZipOutputStream(fos)) {
-                    zipFile(searchFile.getPath(), searchIndexFile, zos);
-                }
-                Files.delete(p);
-            } catch (IOException ie) {
-                throw new DocletAbortException(ie);
-            }
-        }
-    }
-
-    protected void zipFile(String inputFile, DocPath file, ZipOutputStream zos) {
-        try {
-            try {
-                ZipEntry ze = new ZipEntry(file.getPath());
-                zos.putNextEntry(ze);
-                try (FileInputStream fis = new FileInputStream(new File(inputFile))) {
-                    byte[] buf = new byte[2048];
-                    int len = fis.read(buf);
-                    while (len > 0) {
-                        zos.write(buf, 0, len);
-                        len = fis.read(buf);
-                    }
-                }
-            } finally {
-                zos.closeEntry();
-            }
-        } catch (IOException e) {
-            throw new DocletAbortException(e);
-        }
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,699 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.lang.reflect.Modifier;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The base class for member writers.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Jamie Ho (Re-write)
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class AbstractMemberWriter {
-
-    protected final ConfigurationImpl configuration;
-    protected final Utils utils;
-    protected final SubWriterHolderWriter writer;
-    protected final ClassDoc classdoc;
-    protected Map<String,Integer> typeMap = new LinkedHashMap<>();
-    protected Set<MethodTypes> methodTypes = EnumSet.noneOf(MethodTypes.class);
-    private int methodTypesOr = 0;
-    public final boolean nodepr;
-
-    protected boolean printedSummaryHeader = false;
-
-    public AbstractMemberWriter(SubWriterHolderWriter writer, ClassDoc classdoc) {
-        this.configuration = writer.configuration;
-        this.writer = writer;
-        this.nodepr = configuration.nodeprecated;
-        this.classdoc = classdoc;
-        this.utils = writer.configuration.utils;
-    }
-
-    public AbstractMemberWriter(SubWriterHolderWriter writer) {
-        this(writer, null);
-    }
-
-    /*** abstracts ***/
-
-    /**
-     * Add the summary label for the member.
-     *
-     * @param memberTree the content tree to which the label will be added
-     */
-    public abstract void addSummaryLabel(Content memberTree);
-
-    /**
-     * Get the summary for the member summary table.
-     *
-     * @return a string for the table summary
-     */
-    public abstract String getTableSummary();
-
-    /**
-     * Get the caption for the member summary table.
-     *
-     * @return a string for the table caption
-     */
-    public abstract Content getCaption();
-
-    /**
-     * Get the summary table header for the member.
-     *
-     * @param member the member to be documented
-     * @return the summary table header
-     */
-    public abstract String[] getSummaryTableHeader(ProgramElementDoc member);
-
-    /**
-     * Add inherited summary lable for the member.
-     *
-     * @param cd the class doc to which to link to
-     * @param inheritedTree the content tree to which the inherited summary label will be added
-     */
-    public abstract void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree);
-
-    /**
-     * Add the anchor for the summary section of the member.
-     *
-     * @param cd the class doc to be documented
-     * @param memberTree the content tree to which the summary anchor will be added
-     */
-    public abstract void addSummaryAnchor(ClassDoc cd, Content memberTree);
-
-    /**
-     * Add the anchor for the inherited summary section of the member.
-     *
-     * @param cd the class doc to be documented
-     * @param inheritedTree the content tree to which the inherited summary anchor will be added
-     */
-    public abstract void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree);
-
-    /**
-     * Add the summary type for the member.
-     *
-     * @param member the member to be documented
-     * @param tdSummaryType the content tree to which the type will be added
-     */
-    protected abstract void addSummaryType(ProgramElementDoc member,
-            Content tdSummaryType);
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param cd the class doc to be documented
-     * @param member the member to be documented
-     * @param tdSummary the content tree to which the link will be added
-     */
-    protected void addSummaryLink(ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        addSummaryLink(LinkInfoImpl.Kind.MEMBER, cd, member, tdSummary);
-    }
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param cd the class doc to be documented
-     * @param member the member to be documented
-     * @param tdSummary the content tree to which the summary link will be added
-     */
-    protected abstract void addSummaryLink(LinkInfoImpl.Kind context,
-            ClassDoc cd, ProgramElementDoc member, Content tdSummary);
-
-    /**
-     * Add the inherited summary link for the member.
-     *
-     * @param cd the class doc to be documented
-     * @param member the member to be documented
-     * @param linksTree the content tree to which the inherited summary link will be added
-     */
-    protected abstract void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree);
-
-    /**
-     * Get the deprecated link.
-     *
-     * @param member the member being linked to
-     * @return a content tree representing the link
-     */
-    protected abstract Content getDeprecatedLink(ProgramElementDoc member);
-
-    /**
-     * Get the navigation summary link.
-     *
-     * @param cd the class doc to be documented
-     * @param link true if its a link else the label to be printed
-     * @return a content tree for the navigation summary link.
-     */
-    protected abstract Content getNavSummaryLink(ClassDoc cd, boolean link);
-
-    /**
-     * Add the navigation detail link.
-     *
-     * @param link true if its a link else the label to be printed
-     * @param liNav the content tree to which the navigation detail link will be added
-     */
-    protected abstract void addNavDetailLink(boolean link, Content liNav);
-
-    /**
-     * Add the member name to the content tree.
-     *
-     * @param name the member name to be added to the content tree.
-     * @param htmltree the content tree to which the name will be added.
-     */
-    protected void addName(String name, Content htmltree) {
-        htmltree.addContent(name);
-    }
-
-    /**
-     * Return a string describing the access modifier flags.
-     * Don't include native or synchronized.
-     *
-     * The modifier names are returned in canonical order, as
-     * specified by <em>The Java Language Specification</em>.
-     */
-    protected String modifierString(MemberDoc member) {
-        int ms = member.modifierSpecifier();
-        int no = Modifier.NATIVE | Modifier.SYNCHRONIZED;
-    return Modifier.toString(ms & ~no);
-    }
-
-    protected String typeString(MemberDoc member) {
-        String type = "";
-        if (member instanceof MethodDoc) {
-            type = ((MethodDoc)member).returnType().toString();
-        } else if (member instanceof FieldDoc) {
-            type = ((FieldDoc)member).type().toString();
-        }
-        return type;
-    }
-
-    /**
-     * Add the modifier for the member.
-     *
-     * @param member the member for which teh modifier will be added.
-     * @param htmltree the content tree to which the modifier information will be added.
-     */
-    protected void addModifiers(MemberDoc member, Content htmltree) {
-        String mod = modifierString(member);
-        // According to JLS, we should not be showing public modifier for
-        // interface methods.
-        if ((member.isField() || member.isMethod()) &&
-            writer instanceof ClassWriterImpl &&
-            ((ClassWriterImpl) writer).getClassDoc().isInterface()) {
-            // This check for isDefault() and the default modifier needs to be
-            // added for it to appear on the method details section. Once the
-            // default modifier is added to the Modifier list on DocEnv and once
-            // it is updated to use the javax.lang.model.element.Modifier, we
-            // will need to remove this.
-            mod = (member.isMethod() && ((MethodDoc)member).isDefault()) ?
-                    utils.replaceText(mod, "public", "default").trim() :
-                    utils.replaceText(mod, "public", "").trim();
-        }
-        if(mod.length() > 0) {
-            htmltree.addContent(mod);
-            htmltree.addContent(writer.getSpace());
-        }
-    }
-
-    protected String makeSpace(int len) {
-        if (len <= 0) {
-            return "";
-        }
-        StringBuilder sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            sb.append(' ');
-    }
-        return sb.toString();
-    }
-
-    /**
-     * Add the modifier and type for the member in the member summary.
-     *
-     * @param member the member to add the type for
-     * @param type the type to add
-     * @param tdSummaryType the content tree to which the modified and type will be added
-     */
-    protected void addModifierAndType(ProgramElementDoc member, Type type,
-            Content tdSummaryType) {
-        HtmlTree code = new HtmlTree(HtmlTag.CODE);
-        addModifier(member, code);
-        if (type == null) {
-            if (member.isClass()) {
-                code.addContent("class");
-            } else {
-                code.addContent("interface");
-            }
-            code.addContent(writer.getSpace());
-        } else {
-            if (member instanceof ExecutableMemberDoc &&
-                    ((ExecutableMemberDoc) member).typeParameters().length > 0) {
-                Content typeParameters = ((AbstractExecutableMemberWriter) this).getTypeParameters(
-                        (ExecutableMemberDoc) member);
-                    code.addContent(typeParameters);
-                //Code to avoid ugly wrapping in member summary table.
-                if (typeParameters.charCount() > 10) {
-                    code.addContent(new HtmlTree(HtmlTag.BR));
-                } else {
-                    code.addContent(writer.getSpace());
-                }
-                code.addContent(
-                        writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
-            } else {
-                code.addContent(
-                        writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
-            }
-
-        }
-        tdSummaryType.addContent(code);
-    }
-
-    /**
-     * Add the modifier for the member.
-     *
-     * @param member the member to add the type for
-     * @param code the content tree to which the modified will be added
-     */
-    private void addModifier(ProgramElementDoc member, Content code) {
-        if (member.isProtected()) {
-            code.addContent("protected ");
-        } else if (member.isPrivate()) {
-            code.addContent("private ");
-        } else if (!member.isPublic()) { // Package private
-            code.addContent(configuration.getText("doclet.Package_private"));
-            code.addContent(" ");
-        }
-        if (member.isMethod()) {
-            if (!(member.containingClass().isInterface()) &&
-                    ((MethodDoc)member).isAbstract()) {
-                code.addContent("abstract ");
-            }
-            // This check for isDefault() and the default modifier needs to be
-            // added for it to appear on the "Modifier and Type" column in the
-            // method summary section. Once the default modifier is added
-            // to the Modifier list on DocEnv and once it is updated to use the
-            // javax.lang.model.element.Modifier, we will need to remove this.
-            if (((MethodDoc)member).isDefault()) {
-                code.addContent("default ");
-            }
-        }
-        if (member.isStatic()) {
-            code.addContent("static ");
-        }
-    }
-
-    /**
-     * Add the deprecated information for the given member.
-     *
-     * @param member the member being documented.
-     * @param contentTree the content tree to which the deprecated information will be added.
-     */
-    protected void addDeprecatedInfo(ProgramElementDoc member, Content contentTree) {
-        Content output = (new DeprecatedTaglet()).getTagletOutput(member,
-            writer.getTagletWriterInstance(false));
-        if (!output.isEmpty()) {
-            Content deprecatedContent = output;
-            Content div = HtmlTree.DIV(HtmlStyle.block, deprecatedContent);
-            contentTree.addContent(div);
-        }
-    }
-
-    /**
-     * Add the comment for the given member.
-     *
-     * @param member the member being documented.
-     * @param htmltree the content tree to which the comment will be added.
-     */
-    protected void addComment(ProgramElementDoc member, Content htmltree) {
-        if (member.inlineTags().length > 0) {
-            writer.addInlineComment(member, htmltree);
-        }
-    }
-
-    protected String name(ProgramElementDoc member) {
-        return member.name();
-    }
-
-    /**
-     * Get the header for the section.
-     *
-     * @param member the member being documented.
-     * @return a header content for the section.
-     */
-    protected Content getHead(MemberDoc member) {
-        Content memberContent = new StringContent(member.name());
-        Content heading = HtmlTree.HEADING(HtmlConstants.MEMBER_HEADING, memberContent);
-        return heading;
-    }
-
-    /**
-    * Return true if the given <code>ProgramElement</code> is inherited
-    * by the class that is being documented.
-    *
-    * @param ped The <code>ProgramElement</code> being checked.
-    * return true if the <code>ProgramElement</code> is being inherited and
-    * false otherwise.
-    */
-    protected boolean isInherited(ProgramElementDoc ped){
-        if(ped.isPrivate() || (ped.isPackagePrivate() &&
-            ! ped.containingPackage().equals(classdoc.containingPackage()))){
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Add deprecated information to the documentation tree
-     *
-     * @param deprmembers list of deprecated members
-     * @param headingKey the caption for the deprecated members table
-     * @param tableSummary the summary for the deprecated members table
-     * @param tableHeader table headers for the deprecated members table
-     * @param contentTree the content tree to which the deprecated members table will be added
-     */
-    protected void addDeprecatedAPI(List<Doc> deprmembers, String headingKey,
-            String tableSummary, String[] tableHeader, Content contentTree) {
-        if (deprmembers.size() > 0) {
-            Content caption = writer.getTableCaption(configuration.getResource(headingKey));
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption);
-            table.addContent(writer.getSummaryTableHeader(tableHeader, "col"));
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            for (int i = 0; i < deprmembers.size(); i++) {
-                ProgramElementDoc member =(ProgramElementDoc)deprmembers.get(i);
-                HtmlTree td = HtmlTree.TD(HtmlStyle.colOne, getDeprecatedLink(member));
-                if (member.tags("deprecated").length > 0)
-                    writer.addInlineDeprecatedComment(member,
-                            member.tags("deprecated")[0], td);
-                HtmlTree tr = HtmlTree.TR(td);
-                if (i%2 == 0)
-                    tr.addStyle(HtmlStyle.altColor);
-                else
-                    tr.addStyle(HtmlStyle.rowColor);
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-            Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
-            contentTree.addContent(ul);
-        }
-    }
-
-    /**
-     * Add use information to the documentation tree.
-     *
-     * @param mems list of program elements for which the use information will be added
-     * @param heading the section heading
-     * @param tableSummary the summary for the use table
-     * @param contentTree the content tree to which the use information will be added
-     */
-    protected void addUseInfo(List<? extends ProgramElementDoc> mems,
-            Content heading, String tableSummary, Content contentTree) {
-        if (mems == null) {
-            return;
-        }
-        List<? extends ProgramElementDoc> members = mems;
-        boolean printedUseTableHeader = false;
-        if (members.size() > 0) {
-            Content caption = writer.getTableCaption(heading);
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.useSummary, tableSummary, caption);
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            Iterator<? extends ProgramElementDoc> it = members.iterator();
-            for (int i = 0; it.hasNext(); i++) {
-                ProgramElementDoc pgmdoc = it.next();
-                ClassDoc cd = pgmdoc.containingClass();
-                if (!printedUseTableHeader) {
-                    table.addContent(writer.getSummaryTableHeader(
-                            this.getSummaryTableHeader(pgmdoc), "col"));
-                    printedUseTableHeader = true;
-                }
-                HtmlTree tr = new HtmlTree(HtmlTag.TR);
-                if (i % 2 == 0) {
-                    tr.addStyle(HtmlStyle.altColor);
-                } else {
-                    tr.addStyle(HtmlStyle.rowColor);
-                }
-                HtmlTree tdFirst = new HtmlTree(HtmlTag.TD);
-                tdFirst.addStyle(HtmlStyle.colFirst);
-                writer.addSummaryType(this, pgmdoc, tdFirst);
-                tr.addContent(tdFirst);
-                HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-                tdLast.addStyle(HtmlStyle.colLast);
-                if (cd != null && !(pgmdoc instanceof ConstructorDoc)
-                        && !(pgmdoc instanceof ClassDoc)) {
-                    HtmlTree name = new HtmlTree(HtmlTag.SPAN);
-                    name.addStyle(HtmlStyle.typeNameLabel);
-                    name.addContent(cd.name() + ".");
-                    tdLast.addContent(name);
-                }
-                addSummaryLink(pgmdoc instanceof ClassDoc ?
-                    LinkInfoImpl.Kind.CLASS_USE : LinkInfoImpl.Kind.MEMBER,
-                    cd, pgmdoc, tdLast);
-                writer.addSummaryLinkComment(this, pgmdoc, tdLast);
-                tr.addContent(tdLast);
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            contentTree.addContent(table);
-        }
-    }
-
-    /**
-     * Add the navigation detail link.
-     *
-     * @param members the members to be linked
-     * @param liNav the content tree to which the navigation detail link will be added
-     */
-    protected void addNavDetailLink(List<?> members, Content liNav) {
-        addNavDetailLink(members.size() > 0 ? true : false, liNav);
-    }
-
-    /**
-     * Add the navigation summary link.
-     *
-     * @param members members to be linked
-     * @param visibleMemberMap the visible inherited members map
-     * @param liNav the content tree to which the navigation summary link will be added
-     */
-    protected void addNavSummaryLink(List<?> members,
-            VisibleMemberMap visibleMemberMap, Content liNav) {
-        if (members.size() > 0) {
-            liNav.addContent(getNavSummaryLink(null, true));
-            return;
-        }
-        ClassDoc icd = classdoc.superclass();
-        while (icd != null) {
-            List<?> inhmembers = visibleMemberMap.getMembersFor(icd);
-            if (inhmembers.size() > 0) {
-                liNav.addContent(getNavSummaryLink(icd, true));
-                return;
-            }
-            icd = icd.superclass();
-        }
-        liNav.addContent(getNavSummaryLink(null, false));
-    }
-
-    protected void serialWarning(SourcePosition pos, String key, String a1, String a2) {
-        if (configuration.serialwarn) {
-            configuration.getDocletSpecificMsg().warning(pos, key, a1, a2);
-        }
-    }
-
-    public ProgramElementDoc[] eligibleMembers(ProgramElementDoc[] members) {
-        return nodepr? utils.excludeDeprecatedMembers(members): members;
-    }
-
-    /**
-     * Add the member summary for the given class.
-     *
-     * @param classDoc the class that is being documented
-     * @param member the member being documented
-     * @param firstSentenceTags the first sentence tags to be added to the summary
-     * @param tableContents the list of contents to which the documentation will be added
-     * @param counter the counter for determining id and style for the table row
-     */
-    public void addMemberSummary(ClassDoc classDoc, ProgramElementDoc member,
-            Tag[] firstSentenceTags, List<Content> tableContents, int counter) {
-        HtmlTree tdSummaryType = new HtmlTree(HtmlTag.TD);
-        tdSummaryType.addStyle(HtmlStyle.colFirst);
-        writer.addSummaryType(this, member, tdSummaryType);
-        HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
-        setSummaryColumnStyle(tdSummary);
-        addSummaryLink(classDoc, member, tdSummary);
-        writer.addSummaryLinkComment(this, member, firstSentenceTags, tdSummary);
-        HtmlTree tr = HtmlTree.TR(tdSummaryType);
-        tr.addContent(tdSummary);
-        if (member instanceof MethodDoc && !member.isAnnotationTypeElement()) {
-            int methodType = (member.isStatic()) ? MethodTypes.STATIC.value() :
-                    MethodTypes.INSTANCE.value();
-            if (member.containingClass().isInterface()) {
-                methodType = (((MethodDoc) member).isAbstract())
-                        ? methodType | MethodTypes.ABSTRACT.value()
-                        : methodType | MethodTypes.DEFAULT.value();
-            } else {
-                methodType = (((MethodDoc) member).isAbstract())
-                        ? methodType | MethodTypes.ABSTRACT.value()
-                        : methodType | MethodTypes.CONCRETE.value();
-            }
-            if (utils.isDeprecated(member) || utils.isDeprecated(classdoc)) {
-                methodType = methodType | MethodTypes.DEPRECATED.value();
-            }
-            methodTypesOr = methodTypesOr | methodType;
-            String tableId = "i" + counter;
-            typeMap.put(tableId, methodType);
-            tr.addAttr(HtmlAttr.ID, tableId);
-        }
-        if (counter%2 == 0)
-            tr.addStyle(HtmlStyle.altColor);
-        else
-            tr.addStyle(HtmlStyle.rowColor);
-        tableContents.add(tr);
-    }
-
-    /**
-     * Generate the method types set and return true if the method summary table
-     * needs to show tabs.
-     *
-     * @return true if the table should show tabs
-     */
-    public boolean showTabs() {
-        int value;
-        for (MethodTypes type : EnumSet.allOf(MethodTypes.class)) {
-            value = type.value();
-            if ((value & methodTypesOr) == value) {
-                methodTypes.add(type);
-            }
-        }
-        boolean showTabs = methodTypes.size() > 1;
-        if (showTabs) {
-            methodTypes.add(MethodTypes.ALL);
-        }
-        return showTabs;
-    }
-
-    /**
-     * Set the style for the summary column.
-     *
-     * @param tdTree the column for which the style will be set
-     */
-    public void setSummaryColumnStyle(HtmlTree tdTree) {
-        tdTree.addStyle(HtmlStyle.colLast);
-    }
-
-    /**
-     * Add inherited member summary for the given class and member.
-     *
-     * @param classDoc the class the inherited member belongs to
-     * @param nestedClass the inherited member that is summarized
-     * @param isFirst true if this is the first member in the list
-     * @param isLast true if this is the last member in the list
-     * @param linksTree the content tree to which the summary will be added
-     */
-    public void addInheritedMemberSummary(ClassDoc classDoc,
-            ProgramElementDoc nestedClass, boolean isFirst, boolean isLast,
-            Content linksTree) {
-        writer.addInheritedMemberSummary(this, classDoc, nestedClass, isFirst,
-                linksTree);
-    }
-
-    /**
-     * Get the inherited summary header for the given class.
-     *
-     * @param classDoc the class the inherited member belongs to
-     * @return a content tree for the inherited summary header
-     */
-    public Content getInheritedSummaryHeader(ClassDoc classDoc) {
-        Content inheritedTree = writer.getMemberTreeHeader();
-        writer.addInheritedSummaryHeader(this, classDoc, inheritedTree);
-        return inheritedTree;
-    }
-
-    /**
-     * Get the inherited summary links tree.
-     *
-     * @return a content tree for the inherited summary links
-     */
-    public Content getInheritedSummaryLinksTree() {
-        return new HtmlTree(HtmlTag.CODE);
-    }
-
-    /**
-     * Get the summary table tree for the given class.
-     *
-     * @param classDoc the class for which the summary table is generated
-     * @param tableContents list of contents to be displayed in the summary table
-     * @return a content tree for the summary table
-     */
-    public Content getSummaryTableTree(ClassDoc classDoc, List<Content> tableContents) {
-        return writer.getSummaryTableTree(this, classDoc, tableContents, showTabs());
-    }
-
-    /**
-     * Get the member tree to be documented.
-     *
-     * @param memberTree the content tree of member to be documented
-     * @return a content tree that will be added to the class documentation
-     */
-    public Content getMemberTree(Content memberTree) {
-        return writer.getMemberTree(memberTree);
-    }
-
-    /**
-     * Get the member tree to be documented.
-     *
-     * @param memberTree the content tree of member to be documented
-     * @param isLastContent true if the content to be added is the last content
-     * @return a content tree that will be added to the class documentation
-     */
-    public Content getMemberTree(Content memberTree, boolean isLastContent) {
-        if (isLastContent)
-            return HtmlTree.UL(HtmlStyle.blockListLast, memberTree);
-        else
-            return HtmlTree.UL(HtmlStyle.blockList, memberTree);
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.DocPath;
-
-/**
- * Abstract class to generate the overview files in
- * Frame and Non-Frame format. This will be sub-classed by to
- * generate overview-frame.html as well as overview-summary.html.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
-
-    /**
-     * A Set of Packages to be documented.
-     */
-    protected SortedSet<PackageDoc> packages;
-
-    /**
-     * Constructor. Also initializes the packages variable.
-     *
-     * @param configuration  The current configuration
-     * @param filename Name of the package index file to be generated.
-     */
-    public AbstractPackageIndexWriter(ConfigurationImpl configuration,
-                                      DocPath filename) throws IOException {
-        super(configuration, filename);
-        packages = configuration.packages;
-    }
-
-    /**
-     * Adds the navigation bar header to the documentation tree.
-     *
-     * @param body the document tree to which the navigation bar header will be added
-     */
-    protected abstract void addNavigationBarHeader(Content body);
-
-    /**
-     * Adds the navigation bar footer to the documentation tree.
-     *
-     * @param body the document tree to which the navigation bar footer will be added
-     */
-    protected abstract void addNavigationBarFooter(Content body);
-
-    /**
-     * Adds the overview header to the documentation tree.
-     *
-     * @param body the document tree to which the overview header will be added
-     */
-    protected abstract void addOverviewHeader(Content body);
-
-    /**
-     * Adds the packages list to the documentation tree.
-     *
-     * @param packages a collection of packagedoc objects
-     * @param text caption for the table
-     * @param tableSummary summary for the table
-     * @param body the document tree to which the packages list will be added
-     */
-    protected abstract void addPackagesList(Collection<PackageDoc> packages, String text,
-            String tableSummary, Content body);
-
-    /**
-     * Generate and prints the contents in the package index file. Call appropriate
-     * methods from the sub-class in order to generate Frame or Non
-     * Frame format.
-     *
-     * @param title the title of the window.
-     * @param includeScript boolean set true if windowtitle script is to be included
-     */
-    protected void buildPackageIndexFile(String title, boolean includeScript) throws IOException {
-        String windowOverview = configuration.getText(title);
-        Content body = getBody(includeScript, getWindowTitle(windowOverview));
-        addNavigationBarHeader(body);
-        addOverviewHeader(body);
-        addIndex(body);
-        addOverview(body);
-        addNavigationBarFooter(body);
-        printHtmlDocument(configuration.metakeywords.getOverviewMetaKeywords(title,
-                configuration.doctitle), includeScript, body);
-    }
-
-    /**
-     * Default to no overview, override to add overview.
-     *
-     * @param body the document tree to which the overview will be added
-     */
-    protected void addOverview(Content body) throws IOException {
-    }
-
-    /**
-     * Adds the frame or non-frame package index to the documentation tree.
-     *
-     * @param body the document tree to which the index will be added
-     */
-    protected void addIndex(Content body) {
-        addIndexContents(packages, "doclet.Package_Summary",
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Package_Summary"),
-                configuration.getText("doclet.packages")), body);
-    }
-
-    /**
-     * Adds package index contents. Call appropriate methods from
-     * the sub-classes. Adds it to the body HtmlTree
-     *
-     * @param packages a collection of packages to be documented
-     * @param text string which will be used as the heading
-     * @param tableSummary summary for the table
-     * @param body the document tree to which the index contents will be added
-     */
-    protected void addIndexContents(Collection<PackageDoc> packages, String text,
-            String tableSummary, Content body) {
-        if (!packages.isEmpty()) {
-            HtmlTree htmlTree = (configuration.allowTag(HtmlTag.NAV))
-                    ? HtmlTree.NAV()
-                    : new HtmlTree(HtmlTag.DIV);
-            htmlTree.addStyle(HtmlStyle.indexNav);
-            HtmlTree ul = new HtmlTree(HtmlTag.UL);
-            addAllClassesLink(ul);
-            htmlTree.addContent(ul);
-            body.addContent(htmlTree);
-            addPackagesList(packages, text, tableSummary, body);
-        }
-    }
-
-    /**
-     * Adds the doctitle to the documentation tree, if it is specified on the command line.
-     *
-     * @param body the document tree to which the title will be added
-     */
-    protected void addConfigurationTitle(Content body) {
-        if (configuration.doctitle.length() > 0) {
-            Content title = new RawHtml(configuration.doctitle);
-            Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING,
-                    HtmlStyle.title, title);
-            Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-            body.addContent(div);
-        }
-    }
-
-    /**
-     * Returns highlighted "Overview", in the navigation bar as this is the
-     * overview page.
-     *
-     * @return a Content object to be added to the documentation tree
-     */
-    protected Content getNavLinkContents() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, overviewLabel);
-        return li;
-    }
-
-    /**
-     * Do nothing. This will be overridden.
-     *
-     * @param div the document tree to which the all classes link will be added
-     */
-    protected void addAllClassesLink(Content div) {
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Abstract class to print the class hierarchy page for all the Classes. This
- * is sub-classed by {@link PackageTreeWriter} and {@link TreeWriter} to
- * generate the Package Tree and global Tree(for all the classes and packages)
- * pages.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public abstract class AbstractTreeWriter extends HtmlDocletWriter {
-
-    /**
-     * The class and interface tree built by using {@link ClassTree}
-     */
-    protected final ClassTree classtree;
-
-    /**
-     * Constructor initializes classtree variable. This constructor will be used
-     * while generating global tree file "overview-tree.html".
-     *
-     * @param configuration  The current configuration
-     * @param filename   File to be generated.
-     * @param classtree  Tree built by {@link ClassTree}.
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    protected AbstractTreeWriter(ConfigurationImpl configuration,
-                                 DocPath filename, ClassTree classtree)
-                                 throws IOException {
-        super(configuration, filename);
-        this.classtree = classtree;
-    }
-
-    /**
-     * Add each level of the class tree. For each sub-class or
-     * sub-interface indents the next level information.
-     * Recurses itself to add subclasses info.
-     *
-     * @param parent the superclass or superinterface of the list
-     * @param list list of the sub-classes at this level
-     * @param isEnum true if we are generating a tree for enums
-     * @param contentTree the content tree to which the level information will be added
-     */
-    protected void addLevelInfo(ClassDoc parent, Collection<ClassDoc> list,
-            boolean isEnum, Content contentTree) {
-        if (!list.isEmpty()) {
-            Content ul = new HtmlTree(HtmlTag.UL);
-            for (ClassDoc local : list) {
-                HtmlTree li = new HtmlTree(HtmlTag.LI);
-                li.addStyle(HtmlStyle.circle);
-                addPartialInfo(local, li);
-                addExtendsImplements(parent, local, li);
-                addLevelInfo(local, classtree.subs(local, isEnum),
-                             isEnum, li);   // Recurse
-                ul.addContent(li);
-            }
-            contentTree.addContent(ul);
-        }
-    }
-
-    /**
-     * Add the heading for the tree depending upon tree type if it's a
-     * Class Tree or Interface tree.
-     *
-     * @param list List of classes which are at the most base level, all the
-     * other classes in this run will derive from these classes
-     * @param heading heading for the tree
-     * @param div the content tree to which the tree will be added
-     */
-    protected void addTree(SortedSet<ClassDoc> list, String heading, HtmlTree div) {
-        if (!list.isEmpty()) {
-            ClassDoc firstClassDoc = list.first();
-            Content headingContent = getResource(heading);
-            Content sectionHeading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
-                    headingContent);
-            HtmlTree htmlTree;
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                htmlTree = HtmlTree.SECTION(sectionHeading);
-            } else {
-                div.addContent(sectionHeading);
-                htmlTree = div;
-            }
-            addLevelInfo(!firstClassDoc.isInterface()? firstClassDoc : null,
-                    list, list == classtree.baseEnums(), htmlTree);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                div.addContent(htmlTree);
-            }
-        }
-    }
-
-    /**
-     * Add information regarding the classes which this class extends or
-     * implements.
-     *
-     * @param parent the parent class of the class being documented
-     * @param cd the classdoc under consideration
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addExtendsImplements(ClassDoc parent, ClassDoc cd,
-            Content contentTree) {
-        ClassDoc[] interfaces = cd.interfaces();
-        if (interfaces.length > (cd.isInterface()? 1 : 0)) {
-            Arrays.sort(interfaces);
-            int counter = 0;
-            for (ClassDoc intf : interfaces) {
-                if (parent != intf) {
-                    if (!(intf.isPublic() ||
-                          utils.isLinkable(intf, configuration))) {
-                        continue;
-                    }
-                    if (counter == 0) {
-                        if (cd.isInterface()) {
-                            contentTree.addContent(" (");
-                            contentTree.addContent(getResource("doclet.also"));
-                            contentTree.addContent(" extends ");
-                        } else {
-                            contentTree.addContent(" (implements ");
-                        }
-                    } else {
-                        contentTree.addContent(", ");
-                    }
-                    addPreQualifiedClassLink(LinkInfoImpl.Kind.TREE,
-                                             intf, contentTree);
-                    counter++;
-                }
-            }
-            if (counter > 0) {
-                contentTree.addContent(")");
-            }
-        }
-    }
-
-    /**
-     * Add information about the class kind, if it's a "class" or "interface".
-     *
-     * @param cd the class being documented
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addPartialInfo(ClassDoc cd, Content contentTree) {
-        addPreQualifiedStrongClassLink(LinkInfoImpl.Kind.TREE, cd, contentTree);
-    }
-
-    /**
-     * Get the tree label for the navigation bar.
-     *
-     * @return a content tree for the tree label
-     */
-    protected Content getNavLinkTree() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, treeLabel);
-        return li;
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the file with list of all the classes in this run. This page will be
- * used in the left-hand bottom frame, when "All Classes" link is clicked in
- * the left-hand top frame. The name of the generated file is
- * "allclasses-frame.html".
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- * @author Doug Kramer
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AllClassesFrameWriter extends HtmlDocletWriter {
-
-    /**
-     * Index of all the classes.
-     */
-    protected IndexBuilder indexbuilder;
-
-    /**
-     * BR tag to be used within a document tree.
-     */
-    final HtmlTree BR = new HtmlTree(HtmlTag.BR);
-
-    /**
-     * Construct AllClassesFrameWriter object. Also initializes the indexbuilder
-     * variable in this class.
-     * @param configuration  The current configuration
-     * @param filename       Path to the file which is getting generated.
-     * @param indexbuilder   Unicode based Index from {@link IndexBuilder}
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public AllClassesFrameWriter(ConfigurationImpl configuration,
-                                 DocPath filename, IndexBuilder indexbuilder)
-                              throws IOException {
-        super(configuration, filename);
-        this.indexbuilder = indexbuilder;
-    }
-
-    /**
-     * Create AllClassesFrameWriter object. Then use it to generate the
-     * "allclasses-frame.html" file. Generate the file in the current or the
-     * destination directory.
-     *
-     * @param indexbuilder IndexBuilder object for all classes index.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                IndexBuilder indexbuilder) {
-        AllClassesFrameWriter allclassgen;
-        DocPath filename = DocPaths.ALLCLASSES_FRAME;
-        try {
-            allclassgen = new AllClassesFrameWriter(configuration,
-                                                    filename, indexbuilder);
-            allclassgen.buildAllClassesFile(true);
-            allclassgen.close();
-            filename = DocPaths.ALLCLASSES_NOFRAME;
-            allclassgen = new AllClassesFrameWriter(configuration,
-                                                    filename, indexbuilder);
-            allclassgen.buildAllClassesFile(false);
-            allclassgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.
-                     error("doclet.exception_encountered",
-                           exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Print all the classes in the file.
-     * @param wantFrames True if we want frames.
-     */
-    protected void buildAllClassesFile(boolean wantFrames) throws IOException {
-        String label = configuration.getText("doclet.All_Classes");
-        Content body = getBody(false, getWindowTitle(label));
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING,
-                HtmlStyle.bar, allclassesLabel);
-        body.addContent(heading);
-        Content ul = new HtmlTree(HtmlTag.UL);
-        // Generate the class links and add it to the tdFont tree.
-        addAllClasses(ul, wantFrames);
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN(HtmlStyle.indexContainer, ul)
-                : HtmlTree.DIV(HtmlStyle.indexContainer, ul);
-        body.addContent(htmlTree);
-        printHtmlDocument(null, false, body);
-    }
-
-    /**
-     * Use the sorted index of all the classes and add all the classes to the
-     * content list.
-     *
-     * @param content HtmlTree content to which all classes information will be added
-     * @param wantFrames True if we want frames.
-     */
-    protected void addAllClasses(Content content, boolean wantFrames) {
-        for (int i = 0; i < indexbuilder.elements().length; i++) {
-            Character unicode = (Character)((indexbuilder.elements())[i]);
-            addContents(indexbuilder.getMemberList(unicode), wantFrames, content);
-        }
-    }
-
-    /**
-     * Given a list of classes, generate links for each class or interface.
-     * If the class kind is interface, print it in the italics font. Also all
-     * links should target the right-hand frame. If clicked on any class name
-     * in this page, appropriate class page should get opened in the right-hand
-     * frame.
-     *
-     * @param classlist Sorted list of classes.
-     * @param wantFrames True if we want frames.
-     * @param content HtmlTree content to which the links will be added
-     */
-    protected void addContents(List<Doc> classlist, boolean wantFrames,
-                               Content content) {
-        for (Doc doc : classlist) {
-            ClassDoc cd = (ClassDoc) doc;
-            if (!utils.isCoreClass(cd)) {
-                continue;
-            }
-            Content label = italicsClassName(cd, false);
-            Content linkContent;
-            if (wantFrames) {
-                linkContent = getLink(new LinkInfoImpl(configuration,
-                                                       LinkInfoImpl.Kind.ALL_CLASSES_FRAME, cd).label(label).target("classFrame"));
-            } else {
-                linkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, cd).label(label));
-            }
-            Content li = HtmlTree.LI(linkContent);
-            content.addContent(li);
-        }
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Writes annotation type field documentation in HTML format.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
-    implements AnnotationTypeFieldWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new AnnotationTypeFieldWriterImpl.
-     *
-     * @param writer         the writer that will write the output.
-     * @param annotationType the AnnotationType that holds this member.
-     */
-    public AnnotationTypeFieldWriterImpl(SubWriterHolderWriter writer,
-            AnnotationTypeDoc annotationType) {
-        super(writer, annotationType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(
-                HtmlConstants.START_OF_ANNOTATION_TYPE_FIELD_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberTreeHeader() {
-        return writer.getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationFieldDetailsMarker(Content memberDetails) {
-        memberDetails.addContent(HtmlConstants.START_OF_ANNOTATION_TYPE_FIELD_DETAILS);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        if (!writer.printedAnnotationFieldHeading) {
-            memberDetailsTree.addContent(writer.getMarkerAnchor(
-                    SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
-            Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                    writer.fieldDetailsLabel);
-            memberDetailsTree.addContent(heading);
-            writer.printedAnnotationFieldHeading = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDocTreeHeader(MemberDoc member,
-            Content annotationDetailsTree) {
-        annotationDetailsTree.addContent(
-                writer.getMarkerAnchor(member.name()));
-        Content annotationDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(member.name());
-        annotationDocTree.addContent(heading);
-        return annotationDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(MemberDoc member) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(member, pre);
-        addModifiers(member, pre);
-        Content link =
-                writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.MEMBER, getType(member)));
-        pre.addContent(link);
-        pre.addContent(writer.getSpace());
-        if (configuration.linksource) {
-            Content memberName = new StringContent(member.name());
-            writer.addSrcLink(member, memberName, pre);
-        } else {
-            addName(member.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(MemberDoc member, Content annotationDocTree) {
-        addDeprecatedInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(MemberDoc member, Content annotationDocTree) {
-        addComment(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(MemberDoc member, Content annotationDocTree) {
-        writer.addTagsInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDetails(Content annotationDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(annotationDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(annotationDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDoc(Content annotationDocTree,
-            boolean isLastContent) {
-        return getMemberTree(annotationDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Field_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Field_Summary"),
-                configuration.getText("doclet.fields"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Fields");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Fields"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ANNOTATION_TYPE_FIELD_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, (MemberDoc) member, member.name(), false));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        //Not applicable.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        MemberDoc m = (MemberDoc)member;
-        addModifierAndType(m, getType(m), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((MemberDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
-                    writer.getResource("doclet.navField"));
-        } else {
-            return writer.getResource("doclet.navField");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
-                    writer.getResource("doclet.navField")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navField"));
-        }
-    }
-
-    private Type getType(MemberDoc member) {
-        if (member instanceof FieldDoc) {
-            return ((FieldDoc) member).type();
-        } else {
-            return ((MethodDoc) member).returnType();
-        }
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Writes annotation type optional member documentation in HTML format.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AnnotationTypeOptionalMemberWriterImpl extends
-        AnnotationTypeRequiredMemberWriterImpl
-    implements AnnotationTypeOptionalMemberWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new AnnotationTypeOptionalMemberWriterImpl.
-     *
-     * @param writer         the writer that will write the output.
-     * @param annotationType the AnnotationType that holds this member.
-     */
-    public AnnotationTypeOptionalMemberWriterImpl(SubWriterHolderWriter writer,
-        AnnotationTypeDoc annotationType) {
-        super(writer, annotationType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(
-                HtmlConstants.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDefaultValueInfo(MemberDoc member, Content annotationDocTree) {
-        if (((AnnotationTypeElementDoc) member).defaultValue() != null) {
-            Content dt = HtmlTree.DT(writer.getResource("doclet.Default"));
-            Content dl = HtmlTree.DL(dt);
-            Content dd = HtmlTree.DD(new StringContent(
-                    ((AnnotationTypeElementDoc) member).defaultValue().toString()));
-            dl.addContent(dd);
-            annotationDocTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Annotation_Type_Optional_Member_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Annotation_Type_Optional_Member_Summary"),
-                configuration.getText("doclet.annotation_type_optional_members"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Annotation_Type_Optional_Members");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Annotation_Type_Optional_Member"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY,
-                    writer.getResource("doclet.navAnnotationTypeOptionalMember"));
-        } else {
-            return writer.getResource("doclet.navAnnotationTypeOptionalMember");
-        }
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Writes annotation type required member documentation in HTML format.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
-    implements AnnotationTypeRequiredMemberWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new AnnotationTypeRequiredMemberWriterImpl.
-     *
-     * @param writer         the writer that will write the output.
-     * @param annotationType the AnnotationType that holds this member.
-     */
-    public AnnotationTypeRequiredMemberWriterImpl(SubWriterHolderWriter writer,
-            AnnotationTypeDoc annotationType) {
-        super(writer, annotationType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(
-                HtmlConstants.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberTreeHeader() {
-        return writer.getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationDetailsMarker(Content memberDetails) {
-        memberDetails.addContent(HtmlConstants.START_OF_ANNOTATION_TYPE_DETAILS);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        if (!writer.printedAnnotationHeading) {
-            memberDetailsTree.addContent(writer.getMarkerAnchor(
-                    SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
-            Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                    writer.annotationTypeDetailsLabel);
-            memberDetailsTree.addContent(heading);
-            writer.printedAnnotationHeading = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDocTreeHeader(MemberDoc member,
-            Content annotationDetailsTree) {
-        annotationDetailsTree.addContent(
-                writer.getMarkerAnchor(member.name() +
-                ((ExecutableMemberDoc) member).signature()));
-        Content annotationDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(member.name());
-        annotationDocTree.addContent(heading);
-        return annotationDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(MemberDoc member) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(member, pre);
-        addModifiers(member, pre);
-        Content link =
-                writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.MEMBER, getType(member)));
-        pre.addContent(link);
-        pre.addContent(writer.getSpace());
-        if (configuration.linksource) {
-            Content memberName = new StringContent(member.name());
-            writer.addSrcLink(member, memberName, pre);
-        } else {
-            addName(member.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(MemberDoc member, Content annotationDocTree) {
-        addDeprecatedInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(MemberDoc member, Content annotationDocTree) {
-        addComment(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(MemberDoc member, Content annotationDocTree) {
-        writer.addTagsInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDetails(Content annotationDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(annotationDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(annotationDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDoc(Content annotationDocTree,
-            boolean isLastContent) {
-        return getMemberTree(annotationDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Annotation_Type_Required_Member_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Annotation_Type_Required_Member_Summary"),
-                configuration.getText("doclet.annotation_type_required_members"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Annotation_Type_Required_Members");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Annotation_Type_Required_Member"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, (MemberDoc) member, member.name(), false));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        //Not applicable.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        MemberDoc m = (MemberDoc)member;
-        addModifierAndType(m, getType(m), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((MemberDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
-                    writer.getResource("doclet.navAnnotationTypeRequiredMember"));
-        } else {
-            return writer.getResource("doclet.navAnnotationTypeRequiredMember");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
-                    writer.getResource("doclet.navAnnotationTypeMember")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navAnnotationTypeMember"));
-        }
-    }
-
-    private Type getType(MemberDoc member) {
-        if (member instanceof FieldDoc) {
-            return ((FieldDoc) member).type();
-        } else {
-            return ((MethodDoc) member).returnType();
-        }
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.IOException;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the Class Information Page.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @see com.sun.javadoc.ClassDoc
- * @see java.util.Collections
- * @see java.util.List
- * @see java.util.ArrayList
- * @see java.util.HashMap
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AnnotationTypeWriterImpl extends SubWriterHolderWriter
-        implements AnnotationTypeWriter {
-
-    protected AnnotationTypeDoc annotationType;
-
-    protected Type prev;
-
-    protected Type next;
-
-    /**
-     * @param annotationType the annotation type being documented.
-     * @param prevType the previous class that was documented.
-     * @param nextType the next class being documented.
-     */
-    public AnnotationTypeWriterImpl(ConfigurationImpl configuration,
-            AnnotationTypeDoc annotationType, Type prevType, Type nextType)
-            throws Exception {
-        super(configuration, DocPath.forClass(annotationType));
-        this.annotationType = annotationType;
-        configuration.currentcd = annotationType.asClassDoc();
-        this.prev = prevType;
-        this.next = nextType;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @return a content tree for the class link
-     */
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
-        return li;
-    }
-
-    /**
-     * Get the class use link.
-     *
-     * @return a content tree for the class use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to previous class.
-     *
-     * @return a content tree for the previous class link
-     */
-    public Content getNavLinkPrevious() {
-        Content li;
-        if (prev != null) {
-            Content prevLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, prev.asClassDoc())
-                    .label(prevclassLabel).strong(true));
-            li = HtmlTree.LI(prevLink);
-        }
-        else
-            li = HtmlTree.LI(prevclassLabel);
-        return li;
-    }
-
-    /**
-     * Get link to next class.
-     *
-     * @return a content tree for the next class link
-     */
-    public Content getNavLinkNext() {
-        Content li;
-        if (next != null) {
-            Content nextLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, next.asClassDoc())
-                    .label(nextclassLabel).strong(true));
-            li = HtmlTree.LI(nextLink);
-        }
-        else
-            li = HtmlTree.LI(nextclassLabel);
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getHeader(String header) {
-        String pkgname = (annotationType.containingPackage() != null)?
-            annotationType.containingPackage().name(): "";
-        String clname = annotationType.name();
-        HtmlTree bodyTree = getBody(true, getWindowTitle(clname));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA);
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.header);
-        if (pkgname.length() > 0) {
-            Content pkgNameContent = new StringContent(pkgname);
-            Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, pkgNameContent);
-            div.addContent(pkgNameDiv);
-        }
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_HEADER, annotationType);
-        Content headerContent = new StringContent(header);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING, true,
-                HtmlStyle.title, headerContent);
-        heading.addContent(getTypeParameterLinks(linkInfo));
-        div.addContent(heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationContentHeader() {
-        return getContentHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFooter(Content contentTree) {
-        contentTree.addContent(HtmlConstants.END_OF_CLASS_DATA);
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(configuration.metakeywords.getMetaKeywords(annotationType),
-                true, contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationInfoTreeHeader() {
-        return getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationInfo(Content annotationInfoTree) {
-        return getMemberTree(HtmlStyle.description, annotationInfoTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeSignature(String modifiers, Content annotationInfoTree) {
-        annotationInfoTree.addContent(new HtmlTree(HtmlTag.BR));
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        addAnnotationInfo(annotationType, pre);
-        pre.addContent(modifiers);
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_SIGNATURE, annotationType);
-        Content annotationName = new StringContent(annotationType.name());
-        Content parameterLinks = getTypeParameterLinks(linkInfo);
-        if (configuration.linksource) {
-            addSrcLink(annotationType, annotationName, pre);
-            pre.addContent(parameterLinks);
-        } else {
-            Content span = HtmlTree.SPAN(HtmlStyle.memberNameLabel, annotationName);
-            span.addContent(parameterLinks);
-            pre.addContent(span);
-        }
-        annotationInfoTree.addContent(pre);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeDescription(Content annotationInfoTree) {
-        if(!configuration.nocomment) {
-            if (annotationType.inlineTags().length > 0) {
-                addInlineComment(annotationType, annotationInfoTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeTagInfo(Content annotationInfoTree) {
-        if(!configuration.nocomment) {
-            addTagsInfo(annotationType, annotationInfoTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeDeprecationInfo(Content annotationInfoTree) {
-        Content hr = new HtmlTree(HtmlTag.HR);
-        annotationInfoTree.addContent(hr);
-        Tag[] deprs = annotationType.tags("deprecated");
-        if (utils.isDeprecated(annotationType)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-            Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-            if (deprs.length > 0) {
-                Tag[] commentTags = deprs[0].inlineTags();
-                if (commentTags.length > 0) {
-                    div.addContent(getSpace());
-                    addInlineDeprecatedComment(annotationType, deprs[0], div);
-                }
-            }
-            annotationInfoTree.addContent(div);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavLinkTree() {
-        Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
-                treeLabel, "", "");
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    protected void addSummaryDetailLinks(Content subDiv) {
-        try {
-            Content div = HtmlTree.DIV(getNavSummaryLinks());
-            div.addContent(getNavDetailLinks());
-            subDiv.addContent(div);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new DocletAbortException(e);
-        }
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() throws Exception {
-        Content li = HtmlTree.LI(summaryLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        Content liNavField = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navField",
-                VisibleMemberMap.ANNOTATION_TYPE_FIELDS, liNavField);
-        addNavGap(liNavField);
-        ulNav.addContent(liNavField);
-        Content liNavReq = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navAnnotationTypeRequiredMember",
-                VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED, liNavReq);
-        addNavGap(liNavReq);
-        ulNav.addContent(liNavReq);
-        Content liNavOpt = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navAnnotationTypeOptionalMember",
-                VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL, liNavOpt);
-        ulNav.addContent(liNavOpt);
-        return ulNav;
-    }
-
-    /**
-     * Add the navigation summary link.
-     *
-     * @param builder builder for the member to be documented
-     * @param label the label for the navigation
-     * @param type type to be documented
-     * @param liNav the content tree to which the navigation summary link will be added
-     */
-    protected void addNavSummaryLink(MemberSummaryBuilder builder,
-            String label, int type, Content liNav) {
-        AbstractMemberWriter writer = ((AbstractMemberWriter) builder.
-                getMemberSummaryWriter(type));
-        if (writer == null) {
-            liNav.addContent(getResource(label));
-        } else {
-            liNav.addContent(writer.getNavSummaryLink(null,
-                    ! builder.getVisibleMemberMap(type).noVisibleMembers()));
-        }
-    }
-
-    /**
-     * Get detail links for the navigation bar.
-     *
-     * @return the content tree for the detail links
-     */
-    protected Content getNavDetailLinks() throws Exception {
-        Content li = HtmlTree.LI(detailLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        AbstractMemberWriter writerField =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.ANNOTATION_TYPE_FIELDS));
-        AbstractMemberWriter writerOptional =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL));
-        AbstractMemberWriter writerRequired =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED));
-        Content liNavField = new HtmlTree(HtmlTag.LI);
-        if (writerField != null){
-            writerField.addNavDetailLink(annotationType.fields().length > 0, liNavField);
-        } else {
-            liNavField.addContent(getResource("doclet.navField"));
-        }
-        addNavGap(liNavField);
-        ulNav.addContent(liNavField);
-        if (writerOptional != null){
-            Content liNavOpt = new HtmlTree(HtmlTag.LI);
-            writerOptional.addNavDetailLink(annotationType.elements().length > 0, liNavOpt);
-            ulNav.addContent(liNavOpt);
-        } else if (writerRequired != null){
-            Content liNavReq = new HtmlTree(HtmlTag.LI);
-            writerRequired.addNavDetailLink(annotationType.elements().length > 0, liNavReq);
-            ulNav.addContent(liNavReq);
-        } else {
-            Content liNav = HtmlTree.LI(getResource("doclet.navAnnotationTypeMember"));
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Add gap between navigation bar elements.
-     *
-     * @param liNav the content tree to which the gap will be added
-     */
-    protected void addNavGap(Content liNav) {
-        liNav.addContent(getSpace());
-        liNav.addContent("|");
-        liNav.addContent(getSpace());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnnotationTypeDoc getAnnotationTypeDoc() {
-        return annotationType;
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,550 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate class usage information.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Robert G. Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ClassUseWriter extends SubWriterHolderWriter {
-
-    final ClassDoc classdoc;
-    Set<PackageDoc> pkgToPackageAnnotations = null;
-    final Map<String,List<ProgramElementDoc>> pkgToClassTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToClassAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodArgTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodReturnTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodParameterAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToFieldTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToFieldAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToSubclass;
-    final Map<String,List<ProgramElementDoc>> pkgToSubinterface;
-    final Map<String,List<ProgramElementDoc>> pkgToImplementingClass;
-    final Map<String,List<ProgramElementDoc>> pkgToField;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodReturn;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodArgs;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodThrows;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorParameterAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorArgs;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorArgTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorThrows;
-    final SortedSet<PackageDoc> pkgSet;
-    final MethodWriterImpl methodSubWriter;
-    final ConstructorWriterImpl constrSubWriter;
-    final FieldWriterImpl fieldSubWriter;
-    final NestedClassWriterImpl classSubWriter;
-    // Summary for various use tables.
-    final String classUseTableSummary;
-    final String subclassUseTableSummary;
-    final String subinterfaceUseTableSummary;
-    final String fieldUseTableSummary;
-    final String methodUseTableSummary;
-    final String constructorUseTableSummary;
-
-    /**
-     * The HTML tree for main tag.
-     */
-    protected HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * Constructor.
-     *
-     * @param filename the file to be generated.
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public ClassUseWriter(ConfigurationImpl configuration,
-                          ClassUseMapper mapper, DocPath filename,
-                          ClassDoc classdoc) throws IOException {
-        super(configuration, filename);
-        this.classdoc = classdoc;
-        if (mapper.classToPackageAnnotations.containsKey(classdoc.qualifiedName()))
-                pkgToPackageAnnotations = new TreeSet<>(mapper.classToPackageAnnotations.get(classdoc.qualifiedName()));
-        configuration.currentcd = classdoc;
-        this.pkgSet = new TreeSet<>();
-        this.pkgToClassTypeParameter = pkgDivide(mapper.classToClassTypeParam);
-        this.pkgToClassAnnotations = pkgDivide(mapper.classToClassAnnotations);
-        this.pkgToMethodTypeParameter = pkgDivide(mapper.classToExecMemberDocTypeParam);
-        this.pkgToMethodArgTypeParameter = pkgDivide(mapper.classToExecMemberDocArgTypeParam);
-        this.pkgToFieldTypeParameter = pkgDivide(mapper.classToFieldDocTypeParam);
-        this.pkgToFieldAnnotations = pkgDivide(mapper.annotationToFieldDoc);
-        this.pkgToMethodReturnTypeParameter = pkgDivide(mapper.classToExecMemberDocReturnTypeParam);
-        this.pkgToMethodAnnotations = pkgDivide(mapper.classToExecMemberDocAnnotations);
-        this.pkgToMethodParameterAnnotations = pkgDivide(mapper.classToExecMemberDocParamAnnotation);
-        this.pkgToSubclass = pkgDivide(mapper.classToSubclass);
-        this.pkgToSubinterface = pkgDivide(mapper.classToSubinterface);
-        this.pkgToImplementingClass = pkgDivide(mapper.classToImplementingClass);
-        this.pkgToField = pkgDivide(mapper.classToField);
-        this.pkgToMethodReturn = pkgDivide(mapper.classToMethodReturn);
-        this.pkgToMethodArgs = pkgDivide(mapper.classToMethodArgs);
-        this.pkgToMethodThrows = pkgDivide(mapper.classToMethodThrows);
-        this.pkgToConstructorAnnotations = pkgDivide(mapper.classToConstructorAnnotations);
-        this.pkgToConstructorParameterAnnotations = pkgDivide(mapper.classToConstructorParamAnnotation);
-        this.pkgToConstructorArgs = pkgDivide(mapper.classToConstructorArgs);
-        this.pkgToConstructorArgTypeParameter = pkgDivide(mapper.classToConstructorDocArgTypeParam);
-        this.pkgToConstructorThrows = pkgDivide(mapper.classToConstructorThrows);
-        //tmp test
-        if (pkgSet.size() > 0 &&
-            mapper.classToPackage.containsKey(classdoc.qualifiedName()) &&
-            !pkgSet.equals(mapper.classToPackage.get(classdoc.qualifiedName()))) {
-            configuration.root.printWarning("Internal error: package sets don't match: " + pkgSet + " with: " +
-                                   mapper.classToPackage.get(classdoc.qualifiedName()));
-        }
-        methodSubWriter = new MethodWriterImpl(this);
-        constrSubWriter = new ConstructorWriterImpl(this);
-        fieldSubWriter = new FieldWriterImpl(this);
-        classSubWriter = new NestedClassWriterImpl(this);
-        classUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.classes"));
-        subclassUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.subclasses"));
-        subinterfaceUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.subinterfaces"));
-        fieldUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.fields"));
-        methodUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.methods"));
-        constructorUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.constructors"));
-    }
-
-    /**
-     * Write out class use pages.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                ClassTree classtree)  {
-        ClassUseMapper mapper = new ClassUseMapper(configuration, classtree);
-        for (ClassDoc aClass : configuration.root.classes()) {
-            // If -nodeprecated option is set and the containing package is marked
-            // as deprecated, do not generate the class-use page. We will still generate
-            // the class-use page if the class is marked as deprecated but the containing
-            // package is not since it could still be linked from that package-use page.
-            if (!(configuration.nodeprecated &&
-                  configuration.utils.isDeprecated(aClass.containingPackage())))
-                ClassUseWriter.generate(configuration, mapper, aClass);
-        }
-        for (PackageDoc pkg : configuration.packages) {
-            // If -nodeprecated option is set and the package is marked
-            // as deprecated, do not generate the package-use page.
-            if (!(configuration.nodeprecated && configuration.utils.isDeprecated(pkg)))
-                PackageUseWriter.generate(configuration, mapper, pkg);
-        }
-    }
-
-    private Map<String,List<ProgramElementDoc>> pkgDivide(Map<String,? extends List<? extends ProgramElementDoc>> classMap) {
-        Map<String,List<ProgramElementDoc>> map = new HashMap<>();
-        List<? extends ProgramElementDoc> list= classMap.get(classdoc.qualifiedName());
-        if (list != null) {
-            Collections.sort(list, utils.makeComparatorForClassUse());
-            for (ProgramElementDoc doc : list) {
-                PackageDoc pkg = doc.containingPackage();
-                pkgSet.add(pkg);
-                List<ProgramElementDoc> inPkg = map.get(pkg.name());
-                if (inPkg == null) {
-                    inPkg = new ArrayList<>();
-                    map.put(pkg.name(), inPkg);
-                }
-                inPkg.add(doc);
-            }
-        }
-        return map;
-    }
-
-    /**
-     * Generate a class page.
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                ClassUseMapper mapper, ClassDoc classdoc) {
-        ClassUseWriter clsgen;
-        DocPath path = DocPath.forPackage(classdoc)
-                .resolve(DocPaths.CLASS_USE)
-                .resolve(DocPath.forName(classdoc));
-        try {
-            clsgen = new ClassUseWriter(configuration,
-                                        mapper, path,
-                                        classdoc);
-            clsgen.generateClassUseFile();
-            clsgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.
-                error("doclet.exception_encountered",
-                      exc.toString(), path.getPath());
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the class use list.
-     */
-    protected void generateClassUseFile() throws IOException {
-        HtmlTree body = getClassUseHeader();
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.classUseContainer);
-        if (pkgSet.size() > 0) {
-            addClassUse(div);
-        } else {
-            div.addContent(getResource("doclet.ClassUse_No.usage.of.0",
-                    classdoc.qualifiedName()));
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-            body.addContent(mainTree);
-        } else {
-            body.addContent(div);
-        }
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : body;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add the class use documentation.
-     *
-     * @param contentTree the content tree to which the class use information will be added
-     */
-    protected void addClassUse(Content contentTree) throws IOException {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        if (configuration.packages.size() > 1) {
-            addPackageList(ul);
-            addPackageAnnotationList(ul);
-        }
-        addClassList(ul);
-        contentTree.addContent(ul);
-    }
-
-    /**
-     * Add the packages list that use the given class.
-     *
-     * @param contentTree the content tree to which the packages list will be added
-     */
-    protected void addPackageList(Content contentTree) throws IOException {
-        Content caption = getTableCaption(configuration.getResource(
-                "doclet.ClassUse_Packages.that.use.0",
-                getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc))));
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        Iterator<PackageDoc> it = pkgSet.iterator();
-        for (int i = 0; it.hasNext(); i++) {
-            PackageDoc pkg = it.next();
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i % 2 == 0) {
-                tr.addStyle(HtmlStyle.altColor);
-            } else {
-                tr.addStyle(HtmlStyle.rowColor);
-            }
-            addPackageUse(pkg, tr);
-            tbody.addContent(tr);
-        }
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the package annotation list.
-     *
-     * @param contentTree the content tree to which the package annotation list will be added
-     */
-    protected void addPackageAnnotationList(Content contentTree) throws IOException {
-        if ((!classdoc.isAnnotationType()) ||
-                pkgToPackageAnnotations == null ||
-                pkgToPackageAnnotations.isEmpty()) {
-            return;
-        }
-        Content caption = getTableCaption(configuration.getResource(
-                "doclet.ClassUse_PackageAnnotation",
-                getLink(new LinkInfoImpl(configuration,
-                                LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc))));
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator();
-        for (int i = 0; it.hasNext(); i++) {
-            PackageDoc pkg = it.next();
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i % 2 == 0) {
-                tr.addStyle(HtmlStyle.altColor);
-            } else {
-                tr.addStyle(HtmlStyle.rowColor);
-            }
-            Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
-                    getPackageLink(pkg, new StringContent(pkg.name())));
-            tr.addContent(tdFirst);
-            HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-            tdLast.addStyle(HtmlStyle.colLast);
-            addSummaryComment(pkg, tdLast);
-            tr.addContent(tdLast);
-            tbody.addContent(tr);
-        }
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the class list that use the given class.
-     *
-     * @param contentTree the content tree to which the class list will be added
-     */
-    protected void addClassList(Content contentTree) throws IOException {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        for (PackageDoc pkg : pkgSet) {
-            Content markerAnchor = getMarkerAnchor(getPackageAnchorName(pkg));
-            HtmlTree htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(markerAnchor)
-                    : HtmlTree.LI(HtmlStyle.blockList, markerAnchor);
-            Content link = getResource("doclet.ClassUse_Uses.of.0.in.1",
-                                       getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
-                                                                classdoc)),
-                                       getPackageLink(pkg, utils.getPackageName(pkg)));
-            Content heading = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, link);
-            htmlTree.addContent(heading);
-            addClassUse(pkg, htmlTree);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        Content li = HtmlTree.LI(HtmlStyle.blockList, ul);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the package use information.
-     *
-     * @param pkg the package that uses the given class
-     * @param contentTree the content tree to which the package use information will be added
-     */
-    protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException {
-        Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
-                getHyperLink(getPackageAnchorName(pkg), new StringContent(utils.getPackageName(pkg))));
-        contentTree.addContent(tdFirst);
-        HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-        tdLast.addStyle(HtmlStyle.colLast);
-        addSummaryComment(pkg, tdLast);
-        contentTree.addContent(tdLast);
-    }
-
-    /**
-     * Add the class use information.
-     *
-     * @param pkg the package that uses the given class
-     * @param contentTree the content tree to which the class use information will be added
-     */
-    protected void addClassUse(PackageDoc pkg, Content contentTree) throws IOException {
-        Content classLink = getLink(new LinkInfoImpl(configuration,
-            LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc));
-        Content pkgLink = getPackageLink(pkg, utils.getPackageName(pkg));
-        classSubWriter.addUseInfo(pkgToClassAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Annotation", classLink,
-                pkgLink), classUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToClassTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_TypeParameter", classLink,
-                pkgLink), classUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToSubclass.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Subclass", classLink,
-                pkgLink), subclassUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToSubinterface.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Subinterface", classLink,
-                pkgLink), subinterfaceUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToImplementingClass.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ImplementingClass", classLink,
-                pkgLink), classUseTableSummary, contentTree);
-        fieldSubWriter.addUseInfo(pkgToField.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Field", classLink,
-                pkgLink), fieldUseTableSummary, contentTree);
-        fieldSubWriter.addUseInfo(pkgToFieldAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_FieldAnnotations", classLink,
-                pkgLink), fieldUseTableSummary, contentTree);
-        fieldSubWriter.addUseInfo(pkgToFieldTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_FieldTypeParameter", classLink,
-                pkgLink), fieldUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodAnnotations", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodParameterAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodParameterAnnotations", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodTypeParameter", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodReturn.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodReturn", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodReturnTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodReturnTypeParameter", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodArgs.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodArgs", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodArgTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodArgsTypeParameters", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodThrows.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodThrows", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorAnnotations", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorParameterAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorParameterAnnotations", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorArgs.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorArgs", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorArgTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorArgsTypeParameters", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorThrows.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorThrows", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-    }
-
-    /**
-     * Get the header for the class use Listing.
-     *
-     * @return a content tree representing the class use header
-     */
-    protected HtmlTree getClassUseHeader() {
-        String cltype = configuration.getText(classdoc.isInterface()?
-            "doclet.Interface":"doclet.Class");
-        String clname = classdoc.qualifiedName();
-        String title = configuration.getText("doclet.Window_ClassUse_Header",
-                cltype, clname);
-        HtmlTree bodyTree = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        ContentBuilder headContent = new ContentBuilder();
-        headContent.addContent(getResource("doclet.ClassUse_Title", cltype));
-        headContent.addContent(new HtmlTree(HtmlTag.BR));
-        headContent.addContent(clname);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING,
-                true, HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent =
-                getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get class page link.
-     *
-     * @return a content tree for the class page link
-     */
-    protected Content getNavLinkClass() {
-        Content linkContent = getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc)
-                .label(configuration.getText("doclet.Class")));
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the use link.
-     *
-     * @return a content tree for the use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, useLabel);
-        return li;
-    }
-
-    /**
-     * Get the tree link.
-     *
-     * @return a content tree for the tree link
-     */
-    protected Content getNavLinkTree() {
-        Content linkContent = classdoc.containingPackage().isIncluded() ?
-            getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), treeLabel) :
-            getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), treeLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,738 +0,0 @@
-/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.javadoc.main.RootDocImpl;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-import java.io.IOException;
-
-/**
- * Generate the Class Information Page.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @see com.sun.javadoc.ClassDoc
- * @see java.util.Collections
- * @see java.util.List
- * @see java.util.ArrayList
- * @see java.util.HashMap
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ClassWriterImpl extends SubWriterHolderWriter
-        implements ClassWriter {
-
-    protected final ClassDoc classDoc;
-
-    protected final ClassTree classtree;
-
-    protected final ClassDoc prev;
-
-    protected final ClassDoc next;
-
-    /**
-     * @param configuration the configuration data for the doclet
-     * @param classDoc the class being documented.
-     * @param prevClass the previous class that was documented.
-     * @param nextClass the next class being documented.
-     * @param classTree the class tree for the given class.
-     */
-    public ClassWriterImpl (ConfigurationImpl configuration, ClassDoc classDoc,
-            ClassDoc prevClass, ClassDoc nextClass, ClassTree classTree)
-            throws IOException {
-        super(configuration, DocPath.forClass(classDoc));
-        this.classDoc = classDoc;
-        configuration.currentcd = classDoc;
-        this.classtree = classTree;
-        this.prev = prevClass;
-        this.next = nextClass;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @return a content tree for the class link
-     */
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
-        return li;
-    }
-
-    /**
-     * Get the class use link.
-     *
-     * @return a content tree for the class use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to previous class.
-     *
-     * @return a content tree for the previous class link
-     */
-    public Content getNavLinkPrevious() {
-        Content li;
-        if (prev != null) {
-            Content prevLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, prev)
-                    .label(prevclassLabel).strong(true));
-            li = HtmlTree.LI(prevLink);
-        }
-        else
-            li = HtmlTree.LI(prevclassLabel);
-        return li;
-    }
-
-    /**
-     * Get link to next class.
-     *
-     * @return a content tree for the next class link
-     */
-    public Content getNavLinkNext() {
-        Content li;
-        if (next != null) {
-            Content nextLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, next)
-                    .label(nextclassLabel).strong(true));
-            li = HtmlTree.LI(nextLink);
-        }
-        else
-            li = HtmlTree.LI(nextclassLabel);
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getHeader(String header) {
-        String pkgname = (classDoc.containingPackage() != null)?
-            classDoc.containingPackage().name(): "";
-        String clname = classDoc.name();
-        HtmlTree bodyTree = getBody(true, getWindowTitle(clname));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA);
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.header);
-        if (pkgname.length() > 0) {
-            Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInClass, packageLabel);
-            Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
-            pkgNameDiv.addContent(getSpace());
-            Content pkgNameContent = getTargetPackageLink(classDoc.containingPackage(),
-                    "classFrame", new StringContent(pkgname));
-            pkgNameDiv.addContent(pkgNameContent);
-            div.addContent(pkgNameDiv);
-        }
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_HEADER, classDoc);
-        //Let's not link to ourselves in the header.
-        linkInfo.linkToSelf = false;
-        Content headerContent = new StringContent(header);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING, true,
-                HtmlStyle.title, headerContent);
-        heading.addContent(getTypeParameterLinks(linkInfo));
-        div.addContent(heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassContentHeader() {
-        return getContentHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFooter(Content contentTree) {
-        contentTree.addContent(HtmlConstants.END_OF_CLASS_DATA);
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(configuration.metakeywords.getMetaKeywords(classDoc),
-                true, contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassInfoTreeHeader() {
-        return getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassInfo(Content classInfoTree) {
-        return getMemberTree(HtmlStyle.description, classInfoTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassSignature(String modifiers, Content classInfoTree) {
-        boolean isInterface = classDoc.isInterface();
-        classInfoTree.addContent(new HtmlTree(HtmlTag.BR));
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        addAnnotationInfo(classDoc, pre);
-        pre.addContent(modifiers);
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_SIGNATURE, classDoc);
-        //Let's not link to ourselves in the signature.
-        linkInfo.linkToSelf = false;
-        Content className = new StringContent(classDoc.name());
-        Content parameterLinks = getTypeParameterLinks(linkInfo);
-        if (configuration.linksource) {
-            addSrcLink(classDoc, className, pre);
-            pre.addContent(parameterLinks);
-        } else {
-            Content span = HtmlTree.SPAN(HtmlStyle.typeNameLabel, className);
-            span.addContent(parameterLinks);
-            pre.addContent(span);
-        }
-        if (!isInterface) {
-            Type superclass = utils.getFirstVisibleSuperClass(classDoc,
-                    configuration);
-            if (superclass != null) {
-                pre.addContent(DocletConstants.NL);
-                pre.addContent("extends ");
-                Content link = getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
-                        superclass));
-                pre.addContent(link);
-            }
-        }
-        Type[] implIntfacs = classDoc.interfaceTypes();
-        if (implIntfacs != null && implIntfacs.length > 0) {
-            int counter = 0;
-            for (Type implType : implIntfacs) {
-                ClassDoc classDoc = implType.asClassDoc();
-                if (!(classDoc.isPublic() || utils.isLinkable(classDoc, configuration))) {
-                    continue;
-                }
-                if (counter == 0) {
-                    pre.addContent(DocletConstants.NL);
-                    pre.addContent(isInterface ? "extends " : "implements ");
-                } else {
-                    pre.addContent(", ");
-                }
-                Content link = getLink(new LinkInfoImpl(configuration,
-                                                        LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
-                                                        implType));
-                pre.addContent(link);
-                counter++;
-            }
-        }
-        classInfoTree.addContent(pre);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassDescription(Content classInfoTree) {
-        if(!configuration.nocomment) {
-            // generate documentation for the class.
-            if (classDoc.inlineTags().length > 0) {
-                addInlineComment(classDoc, classInfoTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassTagInfo(Content classInfoTree) {
-        if(!configuration.nocomment) {
-            // Print Information about all the tags here
-            addTagsInfo(classDoc, classInfoTree);
-        }
-    }
-
-    /**
-     * Get the class hierarchy tree for the given class.
-     *
-     * @param type the class to print the hierarchy for
-     * @return a content tree for class inheritence
-     */
-    private Content getClassInheritenceTree(Type type) {
-        Type sup;
-        HtmlTree classTreeUl = new HtmlTree(HtmlTag.UL);
-        classTreeUl.addStyle(HtmlStyle.inheritance);
-        Content liTree = null;
-        do {
-            sup = utils.getFirstVisibleSuperClass(
-                    type instanceof ClassDoc ? (ClassDoc) type : type.asClassDoc(),
-                    configuration);
-            if (sup != null) {
-                HtmlTree ul = new HtmlTree(HtmlTag.UL);
-                ul.addStyle(HtmlStyle.inheritance);
-                ul.addContent(getTreeForClassHelper(type));
-                if (liTree != null)
-                    ul.addContent(liTree);
-                Content li = HtmlTree.LI(ul);
-                liTree = li;
-                type = sup;
-            }
-            else
-                classTreeUl.addContent(getTreeForClassHelper(type));
-        }
-        while (sup != null);
-        if (liTree != null)
-            classTreeUl.addContent(liTree);
-        return classTreeUl;
-    }
-
-    /**
-     * Get the class helper tree for the given class.
-     *
-     * @param type the class to print the helper for
-     * @return a content tree for class helper
-     */
-    private Content getTreeForClassHelper(Type type) {
-        Content li = new HtmlTree(HtmlTag.LI);
-        if (type.equals(classDoc)) {
-            Content typeParameters = getTypeParameterLinks(
-                    new LinkInfoImpl(configuration, LinkInfoImpl.Kind.TREE,
-                    classDoc));
-            if (configuration.shouldExcludeQualifier(
-                    classDoc.containingPackage().name())) {
-                li.addContent(type.asClassDoc().name());
-                li.addContent(typeParameters);
-            } else {
-                li.addContent(type.asClassDoc().qualifiedName());
-                li.addContent(typeParameters);
-            }
-        } else {
-            Content link = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS_TREE_PARENT, type)
-                    .label(configuration.getClassName(type.asClassDoc())));
-            li.addContent(link);
-        }
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassTree(Content classContentTree) {
-        if (!classDoc.isClass()) {
-            return;
-        }
-        classContentTree.addContent(getClassInheritenceTree(classDoc));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTypeParamInfo(Content classInfoTree) {
-        if (classDoc.typeParamTags().length > 0) {
-            Content typeParam = (new ParamTaglet()).getTagletOutput(classDoc,
-                    getTagletWriterInstance(false));
-            Content dl = HtmlTree.DL(typeParam);
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSubClassInfo(Content classInfoTree) {
-        if (classDoc.isClass()) {
-            if (classDoc.qualifiedName().equals("java.lang.Object") ||
-                    classDoc.qualifiedName().equals("org.omg.CORBA.Object")) {
-                return;    // Don't generate the list, too huge
-            }
-            SortedSet<ClassDoc> subclasses = classtree.subs(classDoc, false);
-            if (!subclasses.isEmpty()) {
-                Content label = getResource(
-                        "doclet.Subclasses");
-                Content dt = HtmlTree.DT(label);
-                Content dl = HtmlTree.DL(dt);
-                dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
-                        subclasses));
-                classInfoTree.addContent(dl);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSubInterfacesInfo(Content classInfoTree) {
-        if (classDoc.isInterface()) {
-            SortedSet<ClassDoc> subInterfaces = classtree.allSubs(classDoc, false);
-            if (!subInterfaces.isEmpty()) {
-                Content label = getResource(
-                        "doclet.Subinterfaces");
-                Content dt = HtmlTree.DT(label);
-                Content dl = HtmlTree.DL(dt);
-                dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
-                        subInterfaces));
-                classInfoTree.addContent(dl);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInterfaceUsageInfo (Content classInfoTree) {
-        if (! classDoc.isInterface()) {
-            return;
-        }
-        if (classDoc.qualifiedName().equals("java.lang.Cloneable") ||
-                classDoc.qualifiedName().equals("java.io.Serializable")) {
-            return;   // Don't generate the list, too big
-        }
-        SortedSet<ClassDoc> implcl = classtree.implementingclasses(classDoc);
-        if (!implcl.isEmpty()) {
-            Content label = getResource(
-                    "doclet.Implementing_Classes");
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
-                    implcl));
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addImplementedInterfacesInfo(Content classInfoTree) {
-        //NOTE:  we really should be using ClassDoc.interfaceTypes() here, but
-        //       it doesn't walk up the tree like we want it to.
-        List<Type> interfaceArray = utils.getAllInterfaces(classDoc, configuration);
-        if (classDoc.isClass() && interfaceArray.size() > 0) {
-            Content label = getResource(
-                    "doclet.All_Implemented_Interfaces");
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES,
-                    interfaceArray));
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSuperInterfacesInfo(Content classInfoTree) {
-        //NOTE:  we really should be using ClassDoc.interfaceTypes() here, but
-        //       it doesn't walk up the tree like we want it to.
-        List<Type> interfaceArray = utils.getAllInterfaces(classDoc, configuration);
-        if (classDoc.isInterface() && interfaceArray.size() > 0) {
-            Content label = getResource(
-                    "doclet.All_Superinterfaces");
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES,
-                    interfaceArray));
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addNestedClassInfo(Content classInfoTree) {
-        ClassDoc outerClass = classDoc.containingClass();
-        if (outerClass != null) {
-            Content label;
-            if (outerClass.isInterface()) {
-                label = getResource(
-                        "doclet.Enclosing_Interface");
-            } else {
-                label = getResource(
-                        "doclet.Enclosing_Class");
-            }
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            Content dd = new HtmlTree(HtmlTag.DD);
-            dd.addContent(getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, outerClass)));
-            dl.addContent(dd);
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFunctionalInterfaceInfo (Content classInfoTree) {
-        if (isFunctionalInterface()) {
-            Content dt = HtmlTree.DT(getResource("doclet.Functional_Interface"));
-            Content dl = HtmlTree.DL(dt);
-            Content dd = new HtmlTree(HtmlTag.DD);
-            dd.addContent(getResource("doclet.Functional_Interface_Message"));
-            dl.addContent(dd);
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    public boolean isFunctionalInterface() {
-        if (configuration.root instanceof RootDocImpl) {
-            RootDocImpl root = (RootDocImpl) configuration.root;
-            AnnotationDesc[] annotationDescList = classDoc.annotations();
-            for (AnnotationDesc annoDesc : annotationDescList) {
-                if (root.isFunctionalInterface(annoDesc)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassDeprecationInfo(Content classInfoTree) {
-        Content hr = new HtmlTree(HtmlTag.HR);
-        classInfoTree.addContent(hr);
-        Tag[] deprs = classDoc.tags("deprecated");
-        if (utils.isDeprecated(classDoc)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-            Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-            if (deprs.length > 0) {
-                Tag[] commentTags = deprs[0].inlineTags();
-                if (commentTags.length > 0) {
-                    div.addContent(getSpace());
-                    addInlineDeprecatedComment(classDoc, deprs[0], div);
-                }
-            }
-            classInfoTree.addContent(div);
-        }
-    }
-
-    /**
-     * Get links to the given classes.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param list the list of classes
-     * @return a content tree for the class list
-     */
-    private Content getClassLinks(LinkInfoImpl.Kind context, Collection<?> list) {
-        Object[] typeList = list.toArray();
-        Content dd = new HtmlTree(HtmlTag.DD);
-        boolean isFirst = true;
-        for (Object item : typeList) {
-            if (!isFirst) {
-                Content separator = new StringContent(", ");
-                dd.addContent(separator);
-            } else {
-                isFirst = false;
-            }
-
-            if (item instanceof ClassDoc) {
-                Content link = getLink(new LinkInfoImpl(configuration, context, (ClassDoc)item));
-                dd.addContent(link);
-            } else {
-                Content link = getLink(new LinkInfoImpl(configuration, context, (Type)item));
-                dd.addContent(link);
-            }
-        }
-        return dd;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavLinkTree() {
-        Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
-                treeLabel, "", "");
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    protected void addSummaryDetailLinks(Content subDiv) {
-        try {
-            Content div = HtmlTree.DIV(getNavSummaryLinks());
-            div.addContent(getNavDetailLinks());
-            subDiv.addContent(div);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new DocletAbortException(e);
-        }
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() throws Exception {
-        Content li = HtmlTree.LI(summaryLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        String[] navLinkLabels =  new String[] {
-            "doclet.navNested", "doclet.navEnum", "doclet.navField", "doclet.navConstructor",
-            "doclet.navMethod"
-        };
-        for (int i = 0; i < navLinkLabels.length; i++ ) {
-            Content liNav = new HtmlTree(HtmlTag.LI);
-            if (i == VisibleMemberMap.ENUM_CONSTANTS && ! classDoc.isEnum()) {
-                continue;
-            }
-            if (i == VisibleMemberMap.CONSTRUCTORS && classDoc.isEnum()) {
-                continue;
-            }
-            AbstractMemberWriter writer =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(i));
-            if (writer == null) {
-                liNav.addContent(getResource(navLinkLabels[i]));
-            } else {
-                writer.addNavSummaryLink(
-                        memberSummaryBuilder.members(i),
-                        memberSummaryBuilder.getVisibleMemberMap(i), liNav);
-            }
-            if (i < navLinkLabels.length-1) {
-                addNavGap(liNav);
-            }
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Get detail links for the navigation bar.
-     *
-     * @return the content tree for the detail links
-     */
-    protected Content getNavDetailLinks() throws Exception {
-        Content li = HtmlTree.LI(detailLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        String[] navLinkLabels =  new String[] {
-            "doclet.navNested", "doclet.navEnum", "doclet.navField", "doclet.navConstructor",
-            "doclet.navMethod"
-        };
-        for (int i = 1; i < navLinkLabels.length; i++ ) {
-            Content liNav = new HtmlTree(HtmlTag.LI);
-            AbstractMemberWriter writer =
-                    ((AbstractMemberWriter) memberSummaryBuilder.
-                    getMemberSummaryWriter(i));
-            if (i == VisibleMemberMap.ENUM_CONSTANTS && ! classDoc.isEnum()) {
-                continue;
-            }
-            if (i == VisibleMemberMap.CONSTRUCTORS && classDoc.isEnum()) {
-                continue;
-            }
-            if (writer == null) {
-                liNav.addContent(getResource(navLinkLabels[i]));
-            } else {
-                writer.addNavDetailLink(memberSummaryBuilder.members(i), liNav);
-            }
-            if (i < navLinkLabels.length - 1) {
-                addNavGap(liNav);
-            }
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Add gap between navigation bar elements.
-     *
-     * @param liNav the content tree to which the gap will be added
-     */
-    protected void addNavGap(Content liNav) {
-        liNav.addContent(getSpace());
-        liNav.addContent("|");
-        liNav.addContent(getSpace());
-    }
-
-    /**
-     * Return the classDoc being documented.
-     *
-     * @return the classDoc being documented.
-     */
-    public ClassDoc getClassDoc() {
-        return classDoc;
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.net.*;
-import java.util.*;
-
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileManager.Location;
-import javax.tools.StandardLocation;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclint.DocLint;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.StringUtils;
-import com.sun.tools.javadoc.main.JavaScriptScanner;
-import com.sun.tools.javadoc.main.RootDocImpl;
-
-/**
- * Configure the output based on the command line options.
- * <p>
- * Also determine the length of the command line option. For example,
- * for a option "-header" there will be a string argument associated, then the
- * the length of option "-header" is two. But for option "-nohelp" no argument
- * is needed so it's length is 1.
- * </p>
- * <p>
- * Also do the error checking on the options used. For example it is illegal to
- * use "-helpfile" option when already "-nohelp" option is used.
- * </p>
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Robert Field.
- * @author Atul Dambalkar.
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ConfigurationImpl extends Configuration {
-
-    /**
-     * The build date.  Note: For now, we will use
-     * a version number instead of a date.
-     */
-    public static final String BUILD_DATE = System.getProperty("java.version");
-
-    /**
-     * Argument for command line option "-header".
-     */
-    public String header = "";
-
-    /**
-     * Argument for command line option "-packagesheader".
-     */
-    public String packagesheader = "";
-
-    /**
-     * Argument for command line option "-footer".
-     */
-    public String footer = "";
-
-    /**
-     * Argument for command line option "-doctitle".
-     */
-    public String doctitle = "";
-
-    /**
-     * Argument for command line option "-windowtitle".
-     */
-    public String windowtitle = "";
-
-    /**
-     * Argument for command line option "-top".
-     */
-    public String top = "";
-
-    /**
-     * Argument for command line option "-bottom".
-     */
-    public String bottom = "";
-
-    /**
-     * Argument for command line option "-helpfile".
-     */
-    public String helpfile = "";
-
-    /**
-     * Argument for command line option "-stylesheetfile".
-     */
-    public String stylesheetfile = "";
-
-    /**
-     * Argument for command line option "-Xdocrootparent".
-     */
-    public String docrootparent = "";
-
-    /**
-     * True if command line option "-nohelp" is used. Default value is false.
-     */
-    public boolean nohelp = false;
-
-    /**
-     * True if command line option "-splitindex" is used. Default value is
-     * false.
-     */
-    public boolean splitindex = false;
-
-    /**
-     * False if command line option "-noindex" is used. Default value is true.
-     */
-    public boolean createindex = true;
-
-    /**
-     * True if command line option "-use" is used. Default value is false.
-     */
-    public boolean classuse = false;
-
-    /**
-     * False if command line option "-notree" is used. Default value is true.
-     */
-    public boolean createtree = true;
-
-    /**
-     * True if command line option "-nodeprecated" is used. Default value is
-     * false.
-     */
-    public boolean nodeprecatedlist = false;
-
-    /**
-     * True if command line option "-nonavbar" is used. Default value is false.
-     */
-    public boolean nonavbar = false;
-
-    /**
-     * True if command line option "-nooverview" is used. Default value is
-     * false
-     */
-    private boolean nooverview = false;
-
-    /**
-     * True if command line option "-overview" is used. Default value is false.
-     */
-    public boolean overview = false;
-
-    /**
-     * This is true if option "-overview" is used or option "-overview" is not
-     * used and number of packages is more than one.
-     */
-    public boolean createoverview = false;
-
-    /**
-     * This is the HTML version of the generated pages. HTML 4.01 is the default output version.
-     */
-    public HtmlVersion htmlVersion = HtmlVersion.HTML4;
-
-    /**
-     * Collected set of doclint options
-     */
-    public Set<String> doclintOpts = new LinkedHashSet<>();
-
-    /**
-     * Whether or not to check for JavaScript in doc comments.
-     */
-    private boolean allowScriptInComments;
-
-    /**
-     * Unique Resource Handler for this package.
-     */
-    public final MessageRetriever standardmessage;
-
-    /**
-     * First file to appear in the right-hand frame in the generated
-     * documentation.
-     */
-    public DocPath topFile = DocPath.empty;
-
-    /**
-     * The classdoc for the class file getting generated.
-     */
-    public ClassDoc currentcd = null;  // Set this classdoc in the ClassWriter.
-
-    protected List<SearchIndexItem> memberSearchIndex = new ArrayList<>();
-
-    protected List<SearchIndexItem> packageSearchIndex = new ArrayList<>();
-
-    protected List<SearchIndexItem> tagSearchIndex = new ArrayList<>();
-
-    protected List<SearchIndexItem> typeSearchIndex = new ArrayList<>();
-
-    protected Map<Character,List<SearchIndexItem>> tagSearchIndexMap = new HashMap<>();
-
-    protected Set<Character> tagSearchIndexKeys;
-
-    /**
-     * Constructor. Initializes resource for the
-     * {@link com.sun.tools.doclets.internal.toolkit.util.MessageRetriever MessageRetriever}.
-     */
-    public ConfigurationImpl() {
-        standardmessage = new MessageRetriever(this,
-            "com.sun.tools.doclets.formats.html.resources.standard");
-    }
-
-    private final String versionRBName = "com.sun.tools.javadoc.resources.version";
-    private ResourceBundle versionRB;
-
-    /**
-     * Return the build date for the doclet.
-     */
-    @Override
-    public String getDocletSpecificBuildDate() {
-        if (versionRB == null) {
-            try {
-                versionRB = ResourceBundle.getBundle(versionRBName);
-            } catch (MissingResourceException e) {
-                return BUILD_DATE;
-            }
-        }
-
-        try {
-            return versionRB.getString("release");
-        } catch (MissingResourceException e) {
-            return BUILD_DATE;
-        }
-    }
-
-    /**
-     * Depending upon the command line options provided by the user, set
-     * configure the output generation environment.
-     *
-     * @param options The array of option names and values.
-     */
-    @Override
-    public void setSpecificDocletOptions(String[][] options) {
-        for (int oi = 0; oi < options.length; ++oi) {
-            String[] os = options[oi];
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-footer")) {
-                footer = os[1];
-            } else if (opt.equals("-header")) {
-                header = os[1];
-            } else if (opt.equals("-packagesheader")) {
-                packagesheader = os[1];
-            } else if (opt.equals("-doctitle")) {
-                doctitle = os[1];
-            } else if (opt.equals("-windowtitle")) {
-                windowtitle = os[1].replaceAll("\\<.*?>", "");
-            } else if (opt.equals("-top")) {
-                top = os[1];
-            } else if (opt.equals("-bottom")) {
-                bottom = os[1];
-            } else if (opt.equals("-helpfile")) {
-                helpfile = os[1];
-            } else if (opt.equals("-stylesheetfile")) {
-                stylesheetfile = os[1];
-            } else if (opt.equals("-charset")) {
-                charset = os[1];
-            } else if (opt.equals("-xdocrootparent")) {
-                docrootparent = os[1];
-            } else if (opt.equals("-nohelp")) {
-                nohelp = true;
-            } else if (opt.equals("-splitindex")) {
-                splitindex = true;
-            } else if (opt.equals("-noindex")) {
-                createindex = false;
-            } else if (opt.equals("-use")) {
-                classuse = true;
-            } else if (opt.equals("-notree")) {
-                createtree = false;
-            } else if (opt.equals("-nodeprecatedlist")) {
-                nodeprecatedlist = true;
-            } else if (opt.equals("-nonavbar")) {
-                nonavbar = true;
-            } else if (opt.equals("-nooverview")) {
-                nooverview = true;
-            } else if (opt.equals("-overview")) {
-                overview = true;
-            } else if (opt.equals("-html4")) {
-                htmlVersion = HtmlVersion.HTML4;
-            } else if (opt.equals("-html5")) {
-                htmlVersion = HtmlVersion.HTML5;
-            } else if (opt.equals("-xdoclint")) {
-                doclintOpts.add(DocLint.XMSGS_OPTION);
-            } else if (opt.startsWith("-xdoclint:")) {
-                doclintOpts.add(DocLint.XMSGS_CUSTOM_PREFIX + opt.substring(opt.indexOf(":") + 1));
-            } else if (opt.startsWith("-xdoclint/package:")) {
-                doclintOpts.add(DocLint.XCHECK_PACKAGE + opt.substring(opt.indexOf(":") + 1));
-            } else if (opt.equals("--allow-script-in-comments")) {
-                allowScriptInComments = true;
-            }
-        }
-
-        if (root.specifiedClasses().length > 0) {
-            Map<String,PackageDoc> map = new HashMap<>();
-            PackageDoc pd;
-            ClassDoc[] classes = root.classes();
-            for (ClassDoc aClass : classes) {
-                pd = aClass.containingPackage();
-                if (!map.containsKey(pd.name())) {
-                    map.put(pd.name(), pd);
-                }
-            }
-        }
-
-        setCreateOverview();
-        setTopFile(root);
-
-        if (root instanceof RootDocImpl) {
-            ((RootDocImpl) root).initDocLint(doclintOpts, tagletManager.getCustomTagNames(),
-                    StringUtils.toLowerCase(htmlVersion.name()));
-            JavaScriptScanner jss = ((RootDocImpl) root).initJavaScriptScanner(isAllowScriptInComments());
-            if (jss != null) {
-                // In a more object-oriented world, this would be done by methods on the Option objects.
-                // Note that -windowtitle silently removes any and all HTML elements, and so does not need
-                // to be handled here.
-                checkJavaScript(jss, "-header", header);
-                checkJavaScript(jss, "-footer", footer);
-                checkJavaScript(jss, "-top", top);
-                checkJavaScript(jss, "-bottom", bottom);
-                checkJavaScript(jss, "-doctitle", doctitle);
-                checkJavaScript(jss, "-packagesheader", packagesheader);
-            }
-        }
-    }
-
-    private void checkJavaScript(JavaScriptScanner jss, final String opt, String value) {
-        jss.parse(value, new JavaScriptScanner.Reporter() {
-            public void report() {
-                root.printError(getText("doclet.JavaScript_in_option", opt));
-                throw new FatalError();
-            }
-        });
-    }
-
-    /**
-     * Returns the "length" of a given option. If an option takes no
-     * arguments, its length is one. If it takes one argument, it's
-     * length is two, and so on. This method is called by JavaDoc to
-     * parse the options it does not recognize. It then calls
-     * {@link #validOptions(String[][], DocErrorReporter)} to
-     * validate them.
-     * <b>Note:</b><br>
-     * The options arrive as case-sensitive strings. For options that
-     * are not case-sensitive, use toLowerCase() on the option string
-     * before comparing it.
-     *
-     * @return number of arguments + 1 for a option. Zero return means
-     * option not known.  Negative value means error occurred.
-     */
-    public int optionLength(String option) {
-        int result = -1;
-        if ((result = super.optionLength(option)) > 0) {
-            return result;
-        }
-        // otherwise look for the options we have added
-        option = StringUtils.toLowerCase(option);
-        if (option.equals("-nodeprecatedlist") ||
-            option.equals("-noindex") ||
-            option.equals("-notree") ||
-            option.equals("-nohelp") ||
-            option.equals("-splitindex") ||
-            option.equals("-serialwarn") ||
-            option.equals("-use") ||
-            option.equals("-nonavbar") ||
-            option.equals("-nooverview") ||
-            option.equals("-html4") ||
-            option.equals("-html5") ||
-            option.equals("-xdoclint") ||
-            option.startsWith("-xdoclint:") ||
-            option.startsWith("-xdoclint/package:") ||
-            option.startsWith("--allow-script-in-comments")) {
-            return 1;
-        } else if (option.equals("-help")) {
-            // Uugh: first, this should not be hidden inside optionLength,
-            // and second, we should not be writing directly to stdout.
-            // But we have no access to a DocErrorReporter, which would
-            // allow use of reporter.printNotice
-            System.out.println(getText("doclet.usage"));
-            return 1;
-        } else if (option.equals("-x")) {
-            // Uugh: first, this should not be hidden inside optionLength,
-            // and second, we should not be writing directly to stdout.
-            // But we have no access to a DocErrorReporter, which would
-            // allow use of reporter.printNotice
-            System.out.println(getText("doclet.X.usage"));
-            return 1;
-        } else if (option.equals("-footer") ||
-                   option.equals("-header") ||
-                   option.equals("-packagesheader") ||
-                   option.equals("-doctitle") ||
-                   option.equals("-windowtitle") ||
-                   option.equals("-top") ||
-                   option.equals("-bottom") ||
-                   option.equals("-helpfile") ||
-                   option.equals("-stylesheetfile") ||
-                   option.equals("-charset") ||
-                   option.equals("-overview") ||
-                   option.equals("-xdocrootparent")) {
-            return 2;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean validOptions(String options[][],
-            DocErrorReporter reporter) {
-        boolean helpfile = false;
-        boolean nohelp = false;
-        boolean overview = false;
-        boolean nooverview = false;
-        boolean splitindex = false;
-        boolean noindex = false;
-        // check shared options
-        if (!generalValidOptions(options, reporter)) {
-            return false;
-        }
-        // otherwise look at our options
-        for (int oi = 0; oi < options.length; ++oi) {
-            String[] os = options[oi];
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-helpfile")) {
-                if (nohelp == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-helpfile", "-nohelp"));
-                    return false;
-                }
-                if (helpfile == true) {
-                    reporter.printError(getText("doclet.Option_reuse",
-                        "-helpfile"));
-                    return false;
-                }
-                DocFile help = DocFile.createFileForInput(this, os[1]);
-                if (!help.exists()) {
-                    reporter.printError(getText("doclet.File_not_found", os[1]));
-                    return false;
-                }
-                helpfile = true;
-            } else  if (opt.equals("-nohelp")) {
-                if (helpfile == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-nohelp", "-helpfile"));
-                    return false;
-                }
-                nohelp = true;
-            } else if (opt.equals("-xdocrootparent")) {
-                try {
-                    new URL(os[1]);
-                } catch (MalformedURLException e) {
-                    reporter.printError(getText("doclet.MalformedURL", os[1]));
-                    return false;
-                }
-            } else if (opt.equals("-overview")) {
-                if (nooverview == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-overview", "-nooverview"));
-                    return false;
-                }
-                if (overview == true) {
-                    reporter.printError(getText("doclet.Option_reuse",
-                        "-overview"));
-                    return false;
-                }
-                overview = true;
-            } else  if (opt.equals("-nooverview")) {
-                if (overview == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-nooverview", "-overview"));
-                    return false;
-                }
-                nooverview = true;
-            } else if (opt.equals("-splitindex")) {
-                if (noindex == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-splitindex", "-noindex"));
-                    return false;
-                }
-                splitindex = true;
-            } else if (opt.equals("-noindex")) {
-                if (splitindex == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-noindex", "-splitindex"));
-                    return false;
-                }
-                noindex = true;
-            } else if (opt.startsWith("-xdoclint:")) {
-                if (opt.contains("/")) {
-                    reporter.printError(getText("doclet.Option_doclint_no_qualifiers"));
-                    return false;
-                }
-                if (!DocLint.isValidOption(
-                        opt.replace("-xdoclint:", DocLint.XMSGS_CUSTOM_PREFIX))) {
-                    reporter.printError(getText("doclet.Option_doclint_invalid_arg"));
-                    return false;
-                }
-            } else if (opt.startsWith("-xdoclint/package:")) {
-                if (!DocLint.isValidOption(
-                        opt.replace("-xdoclint/package:", DocLint.XCHECK_PACKAGE))) {
-                    reporter.printError(getText("doclet.Option_doclint_package_invalid_arg"));
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return true if the generated output is HTML5.
-     */
-    public boolean isOutputHtml5() {
-        return htmlVersion == HtmlVersion.HTML5;
-    }
-
-    /**
-     * Return true if the tag is allowed for this specific version of HTML.
-     */
-    public boolean allowTag(HtmlTag htmlTag) {
-        return htmlTag.allowTag(this.htmlVersion);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public MessageRetriever getDocletSpecificMsg() {
-        return standardmessage;
-    }
-
-    /**
-     * Decide the page which will appear first in the right-hand frame. It will
-     * be "overview-summary.html" if "-overview" option is used or no
-     * "-overview" but the number of packages is more than one. It will be
-     * "package-summary.html" of the respective package if there is only one
-     * package to document. It will be a class page(first in the sorted order),
-     * if only classes are provided on the command line.
-     *
-     * @param root Root of the program structure.
-     */
-    protected void setTopFile(RootDoc root) {
-        if (!checkForDeprecation(root)) {
-            return;
-        }
-        if (createoverview) {
-            topFile = DocPaths.OVERVIEW_SUMMARY;
-        } else {
-            if (packages.size() == 1 && packages.first().name().equals("")) {
-                if (root.classes().length > 0) {
-                    ClassDoc[] classarr = root.classes();
-                    Arrays.sort(classarr);
-                    ClassDoc cd = getValidClass(classarr);
-                    topFile = DocPath.forClass(cd);
-                }
-            } else if (!packages.isEmpty()) {
-                topFile = DocPath.forPackage(packages.first()).resolve(DocPaths.PACKAGE_SUMMARY);
-            }
-        }
-    }
-
-    protected ClassDoc getValidClass(ClassDoc[] classarr) {
-        if (!nodeprecated) {
-            return classarr[0];
-        }
-        for (ClassDoc cd : classarr) {
-            if (cd.tags("deprecated").length == 0) {
-                return cd;
-            }
-        }
-        return null;
-    }
-
-    protected boolean checkForDeprecation(RootDoc root) {
-        for (ClassDoc cd : root.classes()) {
-            if (isGeneratedDoc(cd)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Generate "overview.html" page if option "-overview" is used or number of
-     * packages is more than one. Sets {@link #createoverview} field to true.
-     */
-    protected void setCreateOverview() {
-        if ((overview || packages.size() > 1) && !nooverview) {
-            createoverview = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public WriterFactory getWriterFactory() {
-        return new WriterFactoryImpl(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Comparator<ProgramElementDoc> getMemberComparator() {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Locale getLocale() {
-        if (root instanceof RootDocImpl)
-            return ((RootDocImpl)root).getLocale();
-        else
-            return Locale.getDefault();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public JavaFileManager getFileManager() {
-        if (fileManager == null) {
-            if (root instanceof RootDocImpl)
-                fileManager = ((RootDocImpl) root).getFileManager();
-            else
-                fileManager = new JavacFileManager(new Context(), false, null);
-        }
-        return fileManager;
-    }
-
-    private JavaFileManager fileManager;
-
-    @Override
-    public boolean showMessage(SourcePosition pos, String key) {
-        if (root instanceof RootDocImpl) {
-            return pos == null || ((RootDocImpl) root).showTagMessages();
-        }
-        return true;
-    }
-
-    @Override
-    public Content newContent() {
-        return new ContentBuilder();
-    }
-
-    @Override
-    public Location getLocationForPackage(PackageDoc pd) {
-        JavaFileManager fm = getFileManager();
-        return StandardLocation.SOURCE_PATH;
-    }
-
-    protected void buildSearchTagIndex() {
-        for (SearchIndexItem sii : tagSearchIndex) {
-            String tagLabel = sii.getLabel();
-            char ch = (tagLabel.length() == 0)
-                    ? '*'
-                    : Character.toUpperCase(tagLabel.charAt(0));
-            Character unicode = ch;
-            List<SearchIndexItem> list = tagSearchIndexMap.get(unicode);
-            if (list == null) {
-                list = new ArrayList<>();
-                tagSearchIndexMap.put(unicode, list);
-            }
-            list.add(sii);
-        }
-        tagSearchIndexKeys = tagSearchIndexMap.keySet();
-    }
-
-    /**
-     * Returns whether or not to allow JavaScript in comments.
-     * Default is off; can be set true from a command line option.
-     * @return the allowScriptInComments
-     */
-    public boolean isAllowScriptInComments() {
-        return allowScriptInComments;
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Write the Constants Summary Page in HTML format.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.4
- */
-@Deprecated
-public class ConstantsSummaryWriterImpl extends HtmlDocletWriter
-        implements ConstantsSummaryWriter {
-
-    /**
-     * The configuration used in this run of the standard doclet.
-     */
-    ConfigurationImpl configuration;
-
-    /**
-     * The current class being documented.
-     */
-    private ClassDoc currentClassDoc;
-
-    private final String constantsTableSummary;
-
-    private final String[] constantsTableHeader;
-
-    /**
-     * The HTML tree for main tag.
-     */
-    private HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * The HTML tree for constant values summary.
-     */
-    private HtmlTree summaryTree;
-
-    /**
-     * Construct a ConstantsSummaryWriter.
-     * @param configuration the configuration used in this run
-     *        of the standard doclet.
-     */
-    public ConstantsSummaryWriterImpl(ConfigurationImpl configuration)
-            throws IOException {
-        super(configuration, DocPaths.CONSTANT_VALUES);
-        this.configuration = configuration;
-        constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary",
-                configuration.getText("doclet.Constants_Summary"));
-        constantsTableHeader = new String[] {
-            getModifierTypeHeader(),
-            configuration.getText("doclet.ConstantField"),
-            configuration.getText("doclet.Value")
-        };
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getHeader() {
-        String label = configuration.getText("doclet.Constants_Summary");
-        HtmlTree bodyTree = getBody(true, getWindowTitle(label));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getContentsHeader() {
-        return new HtmlTree(HtmlTag.UL);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addLinkToPackageContent(PackageDoc pkg, String parsedPackageName,
-            Set<String> printedPackageHeaders, Content contentListTree) {
-        String packageName = pkg.name();
-        //add link to summary
-        Content link;
-        if (packageName.length() == 0) {
-            link = getHyperLink(getDocLink(
-                    SectionName.UNNAMED_PACKAGE_ANCHOR),
-                    defaultPackageLabel, "", "");
-        } else {
-            Content packageNameContent = getPackageLabel(parsedPackageName);
-            packageNameContent.addContent(".*");
-            link = getHyperLink(DocLink.fragment(parsedPackageName),
-                    packageNameContent, "", "");
-            printedPackageHeaders.add(parsedPackageName);
-        }
-        contentListTree.addContent(HtmlTree.LI(link));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addContentsList(Content contentTree, Content contentListTree) {
-        Content titleContent = getResource(
-                "doclet.Constants_Summary");
-        Content pHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.title, titleContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, pHeading);
-        Content headingContent = getResource(
-                "doclet.Contents");
-        Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
-                headingContent);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree section = HtmlTree.SECTION(heading);
-            section.addContent(contentListTree);
-            div.addContent(section);
-            mainTree.addContent(div);
-        } else {
-            div.addContent(heading);
-            div.addContent(contentListTree);
-            contentTree.addContent(div);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstantSummaries() {
-        HtmlTree summariesDiv = new HtmlTree(HtmlTag.DIV);
-        summariesDiv.addStyle(HtmlStyle.constantValuesContainer);
-        return summariesDiv;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageName(String parsedPackageName, Content summariesTree, boolean first) {
-        Content pkgNameContent;
-        if (!first && configuration.allowTag(HtmlTag.SECTION)) {
-            summariesTree.addContent(summaryTree);
-        }
-        if (parsedPackageName.length() == 0) {
-            summariesTree.addContent(getMarkerAnchor(
-                    SectionName.UNNAMED_PACKAGE_ANCHOR));
-            pkgNameContent = defaultPackageLabel;
-        } else {
-            summariesTree.addContent(getMarkerAnchor(
-                    parsedPackageName));
-            pkgNameContent = getPackageLabel(parsedPackageName);
-        }
-        Content headingContent = new StringContent(".*");
-        Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
-                pkgNameContent);
-        heading.addContent(headingContent);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            summaryTree = HtmlTree.SECTION(heading);
-        } else {
-            summariesTree.addContent(heading);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassConstantHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassConstant(Content summariesTree, Content classConstantTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            summaryTree.addContent(classConstantTree);
-        } else {
-            summariesTree.addContent(classConstantTree);
-        }
-    }
-
-    /**
-     * Get the table caption and header for the constant summary table
-     *
-     * @param cd classdoc to be documented
-     * @return constant members header content
-     */
-    public Content getConstantMembersHeader(ClassDoc cd) {
-        //generate links backward only to public classes.
-        Content classlink = (cd.isPublic() || cd.isProtected()) ?
-            getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CONSTANT_SUMMARY, cd)) :
-            new StringContent(cd.qualifiedName());
-        String name = cd.containingPackage().name();
-        if (name.length() > 0) {
-            Content cb = new ContentBuilder();
-            cb.addContent(name);
-            cb.addContent(".");
-            cb.addContent(classlink);
-            return getClassName(cb);
-        } else {
-            return getClassName(classlink);
-        }
-    }
-
-    /**
-     * Get the class name in the table caption and the table header.
-     *
-     * @param classStr the class name to print.
-     * @return the table caption and header
-     */
-    protected Content getClassName(Content classStr) {
-        Content caption = getTableCaption(classStr);
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.constantsSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.constantsSummary, constantsTableSummary, caption);
-        table.addContent(getSummaryTableHeader(constantsTableHeader, "col"));
-        return table;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addConstantMembers(ClassDoc cd, List<FieldDoc> fields,
-            Content classConstantTree) {
-        currentClassDoc = cd;
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        for (int i = 0; i < fields.size(); ++i) {
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i%2 == 0)
-                tr.addStyle(HtmlStyle.altColor);
-            else
-                tr.addStyle(HtmlStyle.rowColor);
-            addConstantMember(fields.get(i), tr);
-            tbody.addContent(tr);
-        }
-        Content table = getConstantMembersHeader(cd);
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        classConstantTree.addContent(li);
-    }
-
-    /**
-     * Add the row for the constant summary table.
-     *
-     * @param member the field to be documented.
-     * @param trTree an htmltree object for the table row
-     */
-    private void addConstantMember(FieldDoc member, HtmlTree trTree) {
-        trTree.addContent(getTypeColumn(member));
-        trTree.addContent(getNameColumn(member));
-        trTree.addContent(getValue(member));
-    }
-
-    /**
-     * Get the type column for the constant summary table row.
-     *
-     * @param member the field to be documented.
-     * @return the type column of the constant table row
-     */
-    private Content getTypeColumn(FieldDoc member) {
-        Content anchor = getMarkerAnchor(currentClassDoc.qualifiedName() +
-                "." + member.name());
-        Content tdType = HtmlTree.TD(HtmlStyle.colFirst, anchor);
-        Content code = new HtmlTree(HtmlTag.CODE);
-        StringTokenizer mods = new StringTokenizer(member.modifiers());
-        while(mods.hasMoreTokens()) {
-            Content modifier = new StringContent(mods.nextToken());
-            code.addContent(modifier);
-            code.addContent(getSpace());
-        }
-        Content type = getLink(new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CONSTANT_SUMMARY, member.type()));
-        code.addContent(type);
-        tdType.addContent(code);
-        return tdType;
-    }
-
-    /**
-     * Get the name column for the constant summary table row.
-     *
-     * @param member the field to be documented.
-     * @return the name column of the constant table row
-     */
-    private Content getNameColumn(FieldDoc member) {
-        Content nameContent = getDocLink(
-                LinkInfoImpl.Kind.CONSTANT_SUMMARY, member, member.name(), false);
-        Content code = HtmlTree.CODE(nameContent);
-        return HtmlTree.TD(code);
-    }
-
-    /**
-     * Get the value column for the constant summary table row.
-     *
-     * @param member the field to be documented.
-     * @return the value column of the constant table row
-     */
-    private Content getValue(FieldDoc member) {
-        Content valueContent = new StringContent(member.constantValueExpression());
-        Content code = HtmlTree.CODE(valueContent);
-        return HtmlTree.TD(HtmlStyle.colLast, code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addConstantSummaries(Content contentTree, Content summariesTree) {
-        if (configuration.allowTag(HtmlTag.SECTION) && summaryTree != null) {
-            summariesTree.addContent(summaryTree);
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(summariesTree);
-            contentTree.addContent(mainTree);
-        } else {
-            contentTree.addContent(summariesTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFooter(Content contentTree) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(null, true, contentTree);
-    }
-}
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Wed Jul 05 23:44:18 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Writes constructor documentation.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
-    implements ConstructorWriter, MemberSummaryWriter {
-
-    private boolean foundNonPubConstructor = false;
-
-    /**
-     * Construct a new ConstructorWriterImpl.
-     *
-     * @param writer The writer for the class that the constructors belong to.
-     * @param classDoc the class being documented.
-     */
-    public ConstructorWriterImpl(SubWriterHolderWriter writer,
-            ClassDoc classDoc) {
-        super(writer, classDoc);
-        VisibleMemberMap visibleMemberMap = new VisibleMemberMap(classDoc,
-            VisibleMemberMap.CONSTRUCTORS, configuration);
-        List<ProgramElementDoc> constructors = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc));
-        for (ProgramElementDoc constructor : constructors) {
-            if (constructor.isProtected() || constructor.isPrivate()) {
-                setFoundNonPubConstructor(true);
-            }
-        }
-    }
-
-    /**
-     * Construct a new ConstructorWriterImpl.
-     *
-     * @param writer The writer for the class that the constructors belong to.
-     */
-    public ConstructorWriterImpl(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_CONSTRUCTOR_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        memberDetailsTree.addContent(HtmlConstants.START_OF_CONSTRUCTOR_DETAILS);
-        Content constructorDetailsTree = writer.getMemberTreeHeader();
-        constructorDetailsTree.addContent(writer.getMarkerAnchor(
-                SectionName.CONSTRUCTOR_DETAIL));
-        Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                writer.constructorDetailsLabel);
-        constructorDetailsTree.addContent(heading);
-        return constructorDetailsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDocTreeHeader(ConstructorDoc constructor,
-            Content constructorDetailsTree) {
-        String erasureAnchor;
-        if ((erasureAnchor = getErasureAnchor(constructor)) != null) {
-            constructorDetailsTree.addContent(writer.getMarkerAnchor((erasureAnchor)));
-        }
-        constructorDetailsTree.addContent(
-                writer.getMarkerAnchor(writer.getAnchor(constructor)));
-        Content constructorDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(constructor.name());
-        constructorDocTree.addContent(heading);
-        return constructorDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(ConstructorDoc constructor) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(constructor, pre);
-        int annotationLength = pre.charCount();
-        addModifiers(constructor, pre);
-        if (configuration.linksource) {
-            Content constructorName = new StringContent(constructor.name());
-            writer.addSrcLink(constructor, constructorName, pre);
-        } else {
-            addName(constructor.name(), pre);
-        }
-        int indent = pre.charCount() - annotationLength;
-        addParameters(constructor, pre, indent);
-        addExceptions(constructor, pre, indent);
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setSummaryColumnStyle(HtmlTree tdTree) {
-        if (foundNonPubConstructor)
-            tdTree.addStyle(HtmlStyle.colLast);
-        else
-            tdTree.addStyle(HtmlStyle.colOne);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(ConstructorDoc constructor, Content constructorDocTree) {
-        addDeprecatedInfo(constructor, constructorDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(ConstructorDoc constructor, Content constructorDocTree) {
-        addComment(constructor, constructorDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(ConstructorDoc constructor, Content constructorDocTree) {
-        writer.addTagsInfo(constructor, constructorDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDetails(Content constructorDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(constructorDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(constructorDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDoc(Content constructorDocTree,
-            boolean isLastContent) {
-        return getMemberTree(constructorDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * Let the writer know whether a non public constructor was found.
-     *
-     * @param foundNonPubConstructor true if we found a non public constructor.
-     */
-    public void setFoundNonPubConstructor(boolean foundNonPubConstructor) {
-        this.foundNonPubConstructor = foundNonPubConstructor;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Constructor_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Constructor_Summary"),
-                configuration.getText("doclet.constructors"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Constructors");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header;
-        if (foundNonPubConstructor) {
-            header = new String[] {
-                configuration.getText("doclet.Modifier"),
-                configuration.getText("doclet.0_and_1",
-                        configuration.getText("doclet.Constructor"),
-                        configuration.getText("doclet.Description"))
-            };
-        }
-        else {
-            header = new String[] {
-                configuration.getText("doclet.0_and_1",
-                        configuration.getText("doclet.Constructor"),
-                        configuration.getText("doclet.Description"))
-            };
-        }
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.CONSTRUCTOR_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.CONSTRUCTORS;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(SectionName.CONSTRUCTOR_SUMMARY,
-                    writer.getResource("doclet.navConstructor"));
-        } else {
-            return writer.getResource("doclet.navConstructor");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.CONSTRUCTOR_DETAIL,
-                    writer.getResource("doclet.navConstructor")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navConstructor"));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        if (foundNonPubConstructor) {