src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
changeset 47216 71c04702a3d5
parent 46082 c65be9fae87b
child 47272 e0d686cdf608
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,1125 @@
+/*
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 jdk.javadoc.internal.doclets.formats.html;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.ElementFilter;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.DocletEnvironment.ModuleMode;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
+import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.ModuleSummaryWriter;
+import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.ModulePackageTypes;
+
+/**
+ * Class to generate file for each module contents in the right-hand frame. This will list all the
+ * required modules, packages and service types for the module. A click on any of the links will update
+ * the frame with the clicked element 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>
+ *
+ * @author Bhavesh Patel
+ */
+public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryWriter {
+
+    /**
+     * The prev module name in the alpha-order list.
+     */
+    protected ModuleElement prevModule;
+
+    /**
+     * The next module name in the alpha-order list.
+     */
+    protected ModuleElement nextModule;
+
+    /**
+     * The module being documented.
+     */
+    protected ModuleElement mdle;
+
+    /**
+     * The module mode for this javadoc run. It can be set to "api" or "all".
+     */
+    private final ModuleMode moduleMode;
+
+    /**
+     * Map of module elements and modifiers required by this module.
+     */
+    private final Map<ModuleElement, Content> requires
+            = new TreeMap<>(utils.makeModuleComparator());
+
+    /**
+     * Map of indirect modules and modifiers, transitive closure, required by this module.
+     */
+    private final Map<ModuleElement, Content> indirectModules
+            = new TreeMap<>(utils.makeModuleComparator());
+
+    /**
+     * Map of packages exported by this module and the modules it has been exported to.
+     */
+    private final Map<PackageElement, SortedSet<ModuleElement>> exportedPackages
+            = new TreeMap<>(utils.makePackageComparator());
+
+    /**
+     * Map of opened packages by this module and the modules it has been opened to.
+     */
+    private final Map<PackageElement, SortedSet<ModuleElement>> openedPackages
+            = new TreeMap<>(utils.makePackageComparator());
+
+    /**
+     * Set of concealed packages of this module.
+     */
+    private final SortedSet<PackageElement> concealedPackages = new TreeSet<>(utils.makePackageComparator());
+
+    /**
+     * Map of indirect modules (transitive closure) and their exported packages.
+     */
+    private final Map<ModuleElement, SortedSet<PackageElement>> indirectPackages
+            = new TreeMap<>(utils.makeModuleComparator());
+
+    /**
+     * Map of indirect modules (transitive closure) and their open packages.
+     */
+    private final Map<ModuleElement, SortedSet<PackageElement>> indirectOpenPackages
+            = new TreeMap<>(utils.makeModuleComparator());
+
+    /**
+     * Set of services used by the module.
+     */
+    private final SortedSet<TypeElement> uses
+            = new TreeSet<>(utils.makeAllClassesComparator());
+
+    /**
+     * Map of services used by the module and specified using @uses javadoc tag, and description.
+     */
+    private final Map<TypeElement, Content> usesTrees
+            = new TreeMap<>(utils.makeAllClassesComparator());
+
+    /**
+     * Map of services provided by this module, and set of its implementations.
+     */
+    private final Map<TypeElement, SortedSet<TypeElement>> provides
+            = new TreeMap<>(utils.makeAllClassesComparator());
+
+    /**
+     * Map of services provided by the module and specified using @provides javadoc tag, and
+     * description.
+     */
+    private final Map<TypeElement, Content> providesTrees
+            = new TreeMap<>(utils.makeAllClassesComparator());
+
+    private int packageTypesOr = 0;
+
+    protected Set<ModulePackageTypes> modulePackageTypes = EnumSet.noneOf(ModulePackageTypes.class);
+
+    protected Map<String, Integer> typeMap = new LinkedHashMap<>();
+
+    /**
+     * The HTML tree for main tag.
+     */
+    protected HtmlTree mainTree = HtmlTree.MAIN();
+
+    /**
+     * The HTML tree for section tag.
+     */
+    protected HtmlTree sectionTree = HtmlTree.SECTION();
+
+    /**
+     * Constructor to construct ModuleWriter object and to generate "moduleName-summary.html" file.
+     *
+     * @param configuration the configuration of the doclet.
+     * @param mdle        Module under consideration.
+     * @param prevModule   Previous module in the sorted array.
+     * @param nextModule   Next module in the sorted array.
+     */
+    public ModuleWriterImpl(HtmlConfiguration configuration,
+            ModuleElement mdle, ModuleElement prevModule, ModuleElement nextModule) {
+        super(configuration, DocPaths.moduleSummary(mdle));
+        this.prevModule = prevModule;
+        this.nextModule = nextModule;
+        this.mdle = mdle;
+        this.moduleMode = configuration.docEnv.getModuleMode();
+        computeModulesData();
+    }
+
+    /**
+     * Get the module header.
+     *
+     * @param heading the heading for the section
+     */
+    @Override
+    public Content getModuleHeader(String heading) {
+        HtmlTree bodyTree = getBody(true, getWindowTitle(mdle.getQualifiedName().toString()));
+        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
+                ? HtmlTree.HEADER()
+                : bodyTree;
+        addTop(htmlTree);
+        addNavLinks(true, htmlTree);
+        if (configuration.allowTag(HtmlTag.HEADER)) {
+            bodyTree.addContent(htmlTree);
+        }
+        HtmlTree div = new HtmlTree(HtmlTag.DIV);
+        div.addStyle(HtmlStyle.header);
+        Content annotationContent = new HtmlTree(HtmlTag.P);
+        addAnnotationInfo(mdle, annotationContent);
+        div.addContent(annotationContent);
+        Content label = mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
+                ? contents.openModuleLabel : contents.moduleLabel;
+        Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
+                HtmlStyle.title, label);
+        tHeading.addContent(Contents.SPACE);
+        Content moduleHead = new RawHtml(heading);
+        tHeading.addContent(moduleHead);
+        div.addContent(tHeading);
+        if (configuration.allowTag(HtmlTag.MAIN)) {
+            mainTree.addContent(div);
+        } else {
+            bodyTree.addContent(div);
+        }
+        return bodyTree;
+    }
+
+    /**
+     * Get the content header.
+     */
+    @Override
+    public Content getContentHeader() {
+        HtmlTree div = new HtmlTree(HtmlTag.DIV);
+        div.addStyle(HtmlStyle.contentContainer);
+        return div;
+    }
+
+    /**
+     * Get the summary section header.
+     */
+    @Override
+    public Content getSummaryHeader() {
+        HtmlTree li = new HtmlTree(HtmlTag.LI);
+        li.addStyle(HtmlStyle.blockList);
+        return li;
+    }
+
+    /**
+     * Get the summary tree.
+     *
+     * @param summaryContentTree the content tree to be added to the summary tree.
+     */
+    @Override
+    public Content getSummaryTree(Content summaryContentTree) {
+        HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, summaryContentTree);
+        return ul;
+    }
+
+    /**
+     * Compute the modules data that will be displayed in various tables on the module summary page.
+     */
+    public void computeModulesData() {
+        CommentHelper ch = utils.getCommentHelper(mdle);
+        // Get module dependencies using the module's transitive closure.
+        Map<ModuleElement, String> dependentModules = utils.getDependentModules(mdle);
+        // Add all dependent modules to indirect modules set. We will remove the modules,
+        // listed using the requires directive, from this set to come up with the table of indirect
+        // required modules.
+        dependentModules.forEach((module, mod) -> {
+            if (shouldDocument(module)) {
+                indirectModules.put(module, new StringContent(mod));
+            }
+        });
+        (ElementFilter.requiresIn(mdle.getDirectives())).forEach((directive) -> {
+            ModuleElement m = directive.getDependency();
+            if (shouldDocument(m)) {
+                if (moduleMode == ModuleMode.ALL || directive.isTransitive()) {
+                    requires.put(m, new StringContent(utils.getModifiers(directive)));
+            } else {
+                    // For api mode, just keep the public requires in dependentModules for display of
+                    // indirect packages in the "Packages" section.
+                    dependentModules.remove(m);
+                }
+                indirectModules.remove(m);
+        }
+        });
+
+        // Get all packages for the module and put it in the concealed packages set.
+        utils.getModulePackageMap().getOrDefault(mdle, Collections.emptySet()).forEach((pkg) -> {
+            if (shouldDocument(pkg) && moduleMode == ModuleMode.ALL) {
+                concealedPackages.add(pkg);
+            }
+        });
+
+        // Get all exported packages for the module using the exports directive for the module.
+        (ElementFilter.exportsIn(mdle.getDirectives())).forEach((directive) -> {
+            PackageElement p = directive.getPackage();
+            if (shouldDocument(p)) {
+                SortedSet<ModuleElement> mdleList = new TreeSet<>(utils.makeModuleComparator());
+                List<? extends ModuleElement> targetMdles = directive.getTargetModules();
+                if (targetMdles != null) {
+                    mdleList.addAll(targetMdles);
+                }
+                // Qualified exports should not be displayed in the api mode. So if mdleList is empty,
+                // its exported to all modules and hence can be added.
+                if (moduleMode == ModuleMode.ALL || mdleList.isEmpty()) {
+                    exportedPackages.put(p, mdleList);
+                }
+                if (moduleMode == ModuleMode.ALL) {
+                    concealedPackages.remove(p);
+                }
+            }
+        });
+        // Get all opened packages for the module using the opens directive for the module.
+        (ElementFilter.opensIn(mdle.getDirectives())).forEach((directive) -> {
+            PackageElement p = directive.getPackage();
+            if (shouldDocument(p)) {
+                SortedSet<ModuleElement> mdleList = new TreeSet<>(utils.makeModuleComparator());
+                List<? extends ModuleElement> targetMdles = directive.getTargetModules();
+                if (targetMdles != null) {
+                    mdleList.addAll(targetMdles);
+                }
+                // Qualified opens should not be displayed in the api mode. So if mdleList is empty,
+                // it is opened to all modules and hence can be added.
+                if (moduleMode == ModuleMode.ALL || mdleList.isEmpty()) {
+                    openedPackages.put(p, mdleList);
+                }
+                if (moduleMode == ModuleMode.ALL) {
+                    concealedPackages.remove(p);
+                }
+            }
+        });
+        // Get all the exported and opened packages, for the transitive closure of the module, to be displayed in
+        // the indirect packages tables.
+        dependentModules.forEach((module, mod) -> {
+            SortedSet<PackageElement> exportPkgList = new TreeSet<>(utils.makePackageComparator());
+            (ElementFilter.exportsIn(module.getDirectives())).forEach((directive) -> {
+                PackageElement pkg = directive.getPackage();
+                if (shouldDocument(pkg)) {
+                    // Qualified exports are not displayed in API mode
+                    if (moduleMode == ModuleMode.ALL || directive.getTargetModules() == null) {
+                        exportPkgList.add(pkg);
+                    }
+                }
+            });
+            // If none of the indirect modules have exported packages to be displayed, we should not be
+            // displaying the table and so it should not be added to the map.
+            if (!exportPkgList.isEmpty()) {
+                indirectPackages.put(module, exportPkgList);
+            }
+            SortedSet<PackageElement> openPkgList = new TreeSet<>(utils.makePackageComparator());
+            (ElementFilter.opensIn(module.getDirectives())).forEach((directive) -> {
+                PackageElement pkg = directive.getPackage();
+                if (shouldDocument(pkg)) {
+                    // Qualified opens are not displayed in API mode
+                    if (moduleMode == ModuleMode.ALL || directive.getTargetModules() == null) {
+                        openPkgList.add(pkg);
+                    }
+                }
+            });
+            // If none of the indirect modules have opened packages to be displayed, we should not be
+            // displaying the table and so it should not be added to the map.
+            if (!openPkgList.isEmpty()) {
+                indirectOpenPackages.put(module, openPkgList);
+            }
+        });
+        // Get all the services listed as uses directive.
+        (ElementFilter.usesIn(mdle.getDirectives())).forEach((directive) -> {
+            TypeElement u = directive.getService();
+            if (shouldDocument(u)) {
+                uses.add(u);
+            }
+        });
+        // Get all the services and implementations listed as provides directive.
+        (ElementFilter.providesIn(mdle.getDirectives())).forEach((directive) -> {
+            TypeElement u = directive.getService();
+            if (shouldDocument(u)) {
+                List<? extends TypeElement> implList = directive.getImplementations();
+                SortedSet<TypeElement> implSet = new TreeSet<>(utils.makeAllClassesComparator());
+                implSet.addAll(implList);
+                provides.put(u, implSet);
+            }
+        });
+        // Generate the map of all services listed using @provides, and the description.
+        (utils.getBlockTags(mdle, DocTree.Kind.PROVIDES)).forEach((tree) -> {
+            TypeElement t = ch.getServiceType(configuration, tree);
+            if (t != null) {
+                providesTrees.put(t, commentTagsToContent(tree, mdle, ch.getDescription(configuration, tree), false));
+            }
+        });
+        // Generate the map of all services listed using @uses, and the description.
+        (utils.getBlockTags(mdle, DocTree.Kind.USES)).forEach((tree) -> {
+            TypeElement t = ch.getServiceType(configuration, tree);
+            if (t != null) {
+                usesTrees.put(t, commentTagsToContent(tree, mdle, ch.getDescription(configuration, tree), false));
+            }
+        });
+    }
+
+    /**
+     * Returns true if the element should be documented on the module summary page.
+     *
+     * @param element the element to be checked
+     * @return true if the element should be documented
+     */
+    public boolean shouldDocument(Element element) {
+        return (moduleMode == ModuleMode.ALL || utils.isIncluded(element));
+    }
+
+    /**
+     * Returns true if there are elements to be displayed.
+     *
+     * @param section set of elements
+     * @return true if there are elements to be displayed
+     */
+    public boolean display(Set<? extends Element> section) {
+        return section != null && !section.isEmpty();
+    }
+
+    /**
+     * Returns true if there are elements to be displayed.
+     *
+     * @param section map of elements.
+     * @return true if there are elements to be displayed
+     */
+    public boolean display(Map<? extends Element, ?> section) {
+        return section != null && !section.isEmpty();
+    }
+
+    /*
+     * Returns true, in API mode, if at least one type element in
+     * the typeElements set is referenced by a javadoc tag in tagsMap.
+     */
+    private boolean displayServices(Set<TypeElement> typeElements,
+                                    Map<TypeElement, Content> tagsMap) {
+        return typeElements != null &&
+                typeElements.stream().anyMatch((v) -> displayServiceDirective(v, tagsMap));
+    }
+
+    /*
+     * Returns true, in API mode, if the type element is referenced
+     * from a javadoc tag in tagsMap.
+     */
+    private boolean displayServiceDirective(TypeElement typeElement,
+                                            Map<TypeElement, Content> tagsMap) {
+        return moduleMode == ModuleMode.ALL || tagsMap.containsKey(typeElement);
+    }
+
+    /**
+     * Add the summary header.
+     *
+     * @param startMarker the marker comment
+     * @param markerAnchor the marker anchor for the section
+     * @param heading the heading for the section
+     * @param htmltree the content tree to which the information is added
+     */
+    public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading, Content htmltree) {
+        htmltree.addContent(startMarker);
+        htmltree.addContent(getMarkerAnchor(markerAnchor));
+        htmltree.addContent(HtmlTree.HEADING(HtmlTag.H3, heading));
+    }
+
+    /**
+     * Get table header.
+     *
+     * @param text the table caption
+     * @param tableSummary the summary for the table
+     * @param tableStyle the table style
+     * @param tableHeader the table header
+     * @return a content object
+     */
+    public Content getTableHeader(String text, String tableSummary, HtmlStyle tableStyle,
+            List<String> tableHeader) {
+        return getTableHeader(getTableCaption(new RawHtml(text)), tableSummary, tableStyle, tableHeader);
+    }
+
+    /**
+     * Get table header.
+     *
+     * @param caption the table caption
+     * @param tableSummary the summary for the table
+     * @param tableStyle the table style
+     * @param tableHeader the table header
+     * @return a content object
+     */
+    public Content getTableHeader(Content caption, String tableSummary, HtmlStyle tableStyle,
+            List<String> tableHeader) {
+        Content table = (configuration.isOutputHtml5())
+                ? HtmlTree.TABLE(tableStyle, caption)
+                : HtmlTree.TABLE(tableStyle, tableSummary, caption);
+        table.addContent(getSummaryTableHeader(tableHeader, "col"));
+        return table;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void addModulesSummary(Content summaryContentTree) {
+        if (display(requires) || display(indirectModules)) {
+            HtmlTree li = new HtmlTree(HtmlTag.LI);
+            li.addStyle(HtmlStyle.blockList);
+            addSummaryHeader(HtmlConstants.START_OF_MODULES_SUMMARY, SectionName.MODULES,
+                    contents.navModules, li);
+            if (display(requires)) {
+                String text = configuration.getText("doclet.Requires_Summary");
+                String tableSummary = configuration.getText("doclet.Member_Table_Summary",
+                        configuration.getText("doclet.Requires_Summary"),
+                        configuration.getText("doclet.modules"));
+                Content table = getTableHeader(text, tableSummary, HtmlStyle.requiresSummary, requiresTableHeader);
+                Content tbody = new HtmlTree(HtmlTag.TBODY);
+                addModulesList(requires, tbody);
+                table.addContent(tbody);
+                li.addContent(table);
+            }
+            // Display indirect modules table in both "api" and "all" mode.
+            if (display(indirectModules)) {
+                String amrText = configuration.getText("doclet.Indirect_Requires_Summary");
+                String amrTableSummary = configuration.getText("doclet.Member_Table_Summary",
+                        configuration.getText("doclet.Indirect_Requires_Summary"),
+                        configuration.getText("doclet.modules"));
+                Content amrTable = getTableHeader(amrText, amrTableSummary, HtmlStyle.requiresSummary, requiresTableHeader);
+                Content amrTbody = new HtmlTree(HtmlTag.TBODY);
+                addModulesList(indirectModules, amrTbody);
+                amrTable.addContent(amrTbody);
+                li.addContent(amrTable);
+            }
+            HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
+            summaryContentTree.addContent(ul);
+        }
+    }
+
+    /**
+     * Add the list of modules.
+     *
+     * @param mdleMap map of modules and modifiers
+     * @param tbody the content tree to which the list will be added
+     */
+    public void addModulesList(Map<ModuleElement, Content> mdleMap, Content tbody) {
+        boolean altColor = true;
+        for (ModuleElement m : mdleMap.keySet()) {
+            Content tdModifiers = HtmlTree.TD(HtmlStyle.colFirst, mdleMap.get(m));
+            Content moduleLinkContent = getModuleLink(m, new StringContent(m.getQualifiedName()));
+            Content thModule = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colSecond, moduleLinkContent);
+            HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
+            tdSummary.addStyle(HtmlStyle.colLast);
+            addSummaryComment(m, tdSummary);
+            HtmlTree tr = HtmlTree.TR(tdModifiers);
+            tr.addContent(thModule);
+            tr.addContent(tdSummary);
+            tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+            tbody.addContent(tr);
+            altColor = !altColor;
+        }
+    }
+
+    public void addPackagesSummary(Content summaryContentTree) {
+        if (display(exportedPackages) || display(openedPackages) || display(concealedPackages)
+                || display(indirectPackages) || display(indirectOpenPackages)) {
+            HtmlTree li = new HtmlTree(HtmlTag.LI);
+            li.addStyle(HtmlStyle.blockList);
+            addSummaryHeader(HtmlConstants.START_OF_PACKAGES_SUMMARY, SectionName.PACKAGES,
+                    contents.navPackages, li);
+            String tableSummary = configuration.getText("doclet.Member_Table_Summary",
+                    configuration.getText("doclet.Packages_Summary"),
+                    configuration.getText("doclet.packages"));
+            if (display(exportedPackages) || display(openedPackages) || display(concealedPackages)) {
+                addPackageSummary(tableSummary, li);
+            }
+            if (display(indirectPackages)) {
+                String aepText = configuration.getText("doclet.Indirect_Exports_Summary");
+                String aepTableSummary = configuration.getText("doclet.Indirect_Packages_Table_Summary",
+                        configuration.getText("doclet.Indirect_Exports_Summary"),
+                        configuration.getText("doclet.modules"),
+                        configuration.getText("doclet.packages"));
+                Content aepTable = getTableHeader(aepText, aepTableSummary, HtmlStyle.packagesSummary,
+                        indirectPackagesTableHeader);
+                Content aepTbody = new HtmlTree(HtmlTag.TBODY);
+                addIndirectPackages(aepTbody, indirectPackages);
+                aepTable.addContent(aepTbody);
+                li.addContent(aepTable);
+            }
+            if (display(indirectOpenPackages)) {
+                String aopText = configuration.getText("doclet.Indirect_Opens_Summary");
+                String aopTableSummary = configuration.getText("doclet.Indirect_Packages_Table_Summary",
+                        configuration.getText("doclet.Indirect_Opens_Summary"),
+                        configuration.getText("doclet.modules"),
+                        configuration.getText("doclet.packages"));
+                Content aopTable = getTableHeader(aopText, aopTableSummary, HtmlStyle.packagesSummary,
+                        indirectPackagesTableHeader);
+                Content aopTbody = new HtmlTree(HtmlTag.TBODY);
+                addIndirectPackages(aopTbody, indirectOpenPackages);
+                aopTable.addContent(aopTbody);
+                li.addContent(aopTable);
+            }
+            HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
+            summaryContentTree.addContent(ul);
+        }
+    }
+
+    /**
+     * Add the package summary for the module.
+     *
+     * @param tableSummary
+     * @param li
+     */
+    public void addPackageSummary(String tableSummary, HtmlTree li) {
+        Content caption;
+        Content tbody = getPackageTableRows();
+        if (showTabs()) {
+            caption = getTableCaption();
+            generateTableTabTypesScript(typeMap, modulePackageTypes, "packages");
+        } else {
+            ModulePackageTypes type = modulePackageTypes.iterator().next();
+            caption = getTableCaption(configuration.getContent(type.tableTabs().resourceKey()));
+        }
+        Content table = getTableHeader(caption, tableSummary, HtmlStyle.packagesSummary, exportedPackagesTableHeader);
+        table.addContent(tbody);
+        li.addContent(table);
+    }
+
+    /**
+     * Returns true if the table tabs needs to be displayed.
+     *
+     * @return true if the tabs should be displayed
+     */
+    public boolean showTabs() {
+        int value;
+        for (ModulePackageTypes type : EnumSet.allOf(ModulePackageTypes.class)) {
+            value = type.tableTabs().value();
+            if ((value & packageTypesOr) == value) {
+                modulePackageTypes.add(type);
+            }
+        }
+        boolean showTabs = modulePackageTypes.size() > 1;
+        if (showTabs) {
+            modulePackageTypes.add(ModulePackageTypes.ALL);
+        }
+        return showTabs;
+    }
+
+    /**
+     * Get the summary table caption.
+     *
+     * @return the caption for the summary table
+     */
+    public Content getTableCaption() {
+        Content tabbedCaption = new HtmlTree(HtmlTag.CAPTION);
+        for (ModulePackageTypes type : modulePackageTypes) {
+            Content captionSpan;
+            Content span;
+            if (type.tableTabs().isDefaultTab()) {
+                captionSpan = HtmlTree.SPAN(configuration.getContent(type.tableTabs().resourceKey()));
+                span = HtmlTree.SPAN(type.tableTabs().tabId(),
+                        HtmlStyle.activeTableTab, captionSpan);
+            } else {
+                captionSpan = HtmlTree.SPAN(getPackageTypeLinks(type));
+                span = HtmlTree.SPAN(type.tableTabs().tabId(),
+                        HtmlStyle.tableTab, captionSpan);
+            }
+            Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, Contents.SPACE);
+            span.addContent(tabSpan);
+            tabbedCaption.addContent(span);
+        }
+        return tabbedCaption;
+    }
+
+    /**
+     * Get the package type links for the table caption.
+     *
+     * @param packageType the package type to be displayed as link
+     * @return the content tree for the package type link
+     */
+    public Content getPackageTypeLinks(ModulePackageTypes packageType) {
+        String jsShow = "javascript:showPkgs(" + packageType.tableTabs().value() + ");";
+        HtmlTree link = HtmlTree.A(jsShow, configuration.getContent(packageType.tableTabs().resourceKey()));
+        return link;
+    }
+
+    /**
+     * Get the package table rows.
+     *
+     * @return a content object
+     */
+    public Content getPackageTableRows() {
+        Content tbody = new HtmlTree(HtmlTag.TBODY);
+        boolean altColor = true;
+        int counter = 0;
+        counter = addPackageTableRows(tbody, counter, ModulePackageTypes.EXPORTED, exportedPackages);
+        counter = addPackageTableRows(tbody, counter, ModulePackageTypes.OPENED, openedPackages);
+        // Show concealed packages only in "all" mode.
+        if (moduleMode == ModuleMode.ALL) {
+            for (PackageElement pkg : concealedPackages) {
+                Content pkgLinkContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
+                Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, pkgLinkContent);
+                HtmlTree tdModules = new HtmlTree(HtmlTag.TD);
+                tdModules.addStyle(HtmlStyle.colSecond);
+                tdModules.addContent(configuration.getText("doclet.None"));
+        HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
+        tdSummary.addStyle(HtmlStyle.colLast);
+                addSummaryComment(pkg, tdSummary);
+        HtmlTree tr = HtmlTree.TR(thPackage);
+                tr.addContent(tdModules);
+        tr.addContent(tdSummary);
+        tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+                int pkgType = ModulePackageTypes.CONCEALED.tableTabs().value();
+                packageTypesOr = packageTypesOr | pkgType;
+                String tableId = "i" + counter;
+                counter++;
+                typeMap.put(tableId, pkgType);
+                tr.addAttr(HtmlAttr.ID, tableId);
+        tbody.addContent(tr);
+                altColor = !altColor;
+            }
+        }
+        return tbody;
+    }
+
+    public int addPackageTableRows(Content tbody, int counter, ModulePackageTypes pType,
+            Map<PackageElement,SortedSet<ModuleElement>> ap) {
+        boolean altColor = true;
+        for (Map.Entry<PackageElement, SortedSet<ModuleElement>> entry : ap.entrySet()) {
+            PackageElement pkg = entry.getKey();
+            SortedSet<ModuleElement> mdleList = entry.getValue();
+            Content pkgLinkContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
+            Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, pkgLinkContent);
+            HtmlTree tr = HtmlTree.TR(thPackage);
+            if (moduleMode == ModuleMode.ALL) {
+                HtmlTree tdModules = new HtmlTree(HtmlTag.TD);
+                tdModules.addStyle(HtmlStyle.colSecond);
+                if (!mdleList.isEmpty()) {
+                    int sep = 0;
+                    for (ModuleElement m : mdleList) {
+                        if (sep > 0) {
+                            tdModules.addContent(new HtmlTree(HtmlTag.BR));
+                        }
+                        tdModules.addContent(getModuleLink(m, new StringContent(m.getQualifiedName())));
+                        sep++;
+                    }
+                } else {
+                    tdModules.addContent(configuration.getText("doclet.All_Modules"));
+                }
+                tr.addContent(tdModules);
+            }
+            HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
+            tdSummary.addStyle(HtmlStyle.colLast);
+            addSummaryComment(pkg, tdSummary);
+            tr.addContent(tdSummary);
+            tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+            int pkgType = pType.tableTabs().value();
+            packageTypesOr = packageTypesOr | pkgType;
+            String tableId = "i" + counter;
+            counter++;
+            typeMap.put(tableId, pkgType);
+            tr.addAttr(HtmlAttr.ID, tableId);
+            tbody.addContent(tr);
+            altColor = !altColor;
+        }
+        return counter;
+    }
+
+    /**
+     * Add the indirect packages for the module being documented.
+     *
+     * @param tbody the content tree to which the table will be added
+     * @param ip indirect packages to be added
+     */
+    public void addIndirectPackages(Content tbody, Map<ModuleElement, SortedSet<PackageElement>> ip) {
+        boolean altColor = true;
+        for (Map.Entry<ModuleElement, SortedSet<PackageElement>> entry : ip.entrySet()) {
+            ModuleElement m = entry.getKey();
+            SortedSet<PackageElement> pkgList = entry.getValue();
+            Content moduleLinkContent = getModuleLink(m, new StringContent(m.getQualifiedName()));
+            Content thModule = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, moduleLinkContent);
+            HtmlTree tdPackages = new HtmlTree(HtmlTag.TD);
+            tdPackages.addStyle(HtmlStyle.colLast);
+            String sep = "";
+            for (PackageElement pkg : pkgList) {
+                tdPackages.addContent(sep);
+                tdPackages.addContent(getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))));
+                sep = " ";
+            }
+            HtmlTree tr = HtmlTree.TR(thModule);
+            tr.addContent(tdPackages);
+            tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+            tbody.addContent(tr);
+            altColor = !altColor;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void addServicesSummary(Content summaryContentTree) {
+
+        boolean haveUses = displayServices(uses, usesTrees);
+        boolean haveProvides = displayServices(provides.keySet(), providesTrees);
+
+        if (haveProvides || haveUses) {
+            HtmlTree li = new HtmlTree(HtmlTag.LI);
+            li.addStyle(HtmlStyle.blockList);
+            addSummaryHeader(HtmlConstants.START_OF_SERVICES_SUMMARY, SectionName.SERVICES,
+                    contents.navServices, li);
+            String text;
+            String tableSummary;
+            if (haveProvides) {
+                text = configuration.getText("doclet.Provides_Summary");
+                tableSummary = configuration.getText("doclet.Member_Table_Summary",
+                        configuration.getText("doclet.Provides_Summary"),
+                        configuration.getText("doclet.types"));
+                Content table = getTableHeader(text, tableSummary, HtmlStyle.providesSummary, providesTableHeader);
+                Content tbody = new HtmlTree(HtmlTag.TBODY);
+                addProvidesList(tbody);
+                if (!tbody.isEmpty()) {
+                    table.addContent(tbody);
+                    li.addContent(table);
+                }
+            }
+            if (haveUses){
+                text = configuration.getText("doclet.Uses_Summary");
+                tableSummary = configuration.getText("doclet.Member_Table_Summary",
+                        configuration.getText("doclet.Uses_Summary"),
+                        configuration.getText("doclet.types"));
+                Content table = getTableHeader(text, tableSummary, HtmlStyle.usesSummary, usesTableHeader);
+                Content tbody = new HtmlTree(HtmlTag.TBODY);
+                addUsesList(tbody);
+                if (!tbody.isEmpty()) {
+                    table.addContent(tbody);
+                    li.addContent(table);
+                }
+            }
+            HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
+            summaryContentTree.addContent(ul);
+        }
+    }
+
+    /**
+     * Add the uses list for the module.
+     *
+     * @param tbody the content tree to which the directive will be added
+     */
+    public void addUsesList(Content tbody) {
+        boolean altColor = true;
+        Content typeLinkContent;
+        Content thType;
+        HtmlTree tdSummary;
+        Content description;
+        for (TypeElement t : uses) {
+            if (!displayServiceDirective(t, usesTrees)) {
+                continue;
+            }
+            typeLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, t));
+            thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, typeLinkContent);
+            tdSummary = new HtmlTree(HtmlTag.TD);
+            tdSummary.addStyle(HtmlStyle.colLast);
+            if (display(usesTrees)) {
+                description = usesTrees.get(t);
+                if (description != null) {
+                    tdSummary.addContent(description);
+                }
+            }
+            addSummaryComment(t, tdSummary);
+            HtmlTree tr = HtmlTree.TR(thType);
+            tr.addContent(tdSummary);
+            tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+            tbody.addContent(tr);
+            altColor = !altColor;
+        }
+    }
+
+    /**
+     * Add the provides list for the module.
+     *
+     * @param tbody the content tree to which the directive will be added
+     */
+    public void addProvidesList(Content tbody) {
+        boolean altColor = true;
+        SortedSet<TypeElement> implSet;
+        Content description;
+        for (Map.Entry<TypeElement, SortedSet<TypeElement>> entry : provides.entrySet()) {
+            TypeElement srv = entry.getKey();
+            if (!displayServiceDirective(srv, providesTrees)) {
+                continue;
+            }
+            implSet = entry.getValue();
+            Content srvLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, srv));
+            HtmlTree thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, srvLinkContent);
+            HtmlTree tdDesc = new HtmlTree(HtmlTag.TD);
+            tdDesc.addStyle(HtmlStyle.colLast);
+            if (display(providesTrees)) {
+                description = providesTrees.get(srv);
+                if (description != null) {
+                    tdDesc.addContent(description);
+                }
+            }
+            addSummaryComment(srv, tdDesc);
+            // Only display the implementation details in the "all" mode.
+            if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) {
+                tdDesc.addContent(new HtmlTree(HtmlTag.BR));
+                tdDesc.addContent("(");
+                HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
+                tdDesc.addContent(implSpan);
+                tdDesc.addContent(Contents.SPACE);
+                String sep = "";
+                for (TypeElement impl : implSet) {
+                    tdDesc.addContent(sep);
+                    tdDesc.addContent(getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)));
+                    sep = ", ";
+                }
+                tdDesc.addContent(")");
+            }
+            HtmlTree tr = HtmlTree.TR(thType);
+            tr.addContent(tdDesc);
+            tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+            tbody.addContent(tr);
+            altColor = !altColor;
+        }
+    }
+
+    /**
+     * Add the module deprecation information to the documentation tree.
+     *
+     * @param div the content tree to which the deprecation information will be added
+     */
+    public void addDeprecationInfo(Content div) {
+        List<? extends DocTree> deprs = utils.getBlockTags(mdle, DocTree.Kind.DEPRECATED);
+        if (utils.isDeprecated(mdle)) {
+            CommentHelper ch = utils.getCommentHelper(mdle);
+            HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
+            deprDiv.addStyle(HtmlStyle.deprecatedContent);
+            Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
+            deprDiv.addContent(deprPhrase);
+            if (!deprs.isEmpty()) {
+                List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
+                if (!commentTags.isEmpty()) {
+                    addInlineDeprecatedComment(mdle, deprs.get(0), deprDiv);
+                }
+            }
+            div.addContent(deprDiv);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addModuleDescription(Content moduleContentTree) {
+        if (!utils.getFullBody(mdle).isEmpty()) {
+            Content tree = configuration.allowTag(HtmlTag.SECTION) ? HtmlTree.SECTION() : moduleContentTree;
+            addDeprecationInfo(tree);
+            tree.addContent(HtmlConstants.START_OF_MODULE_DESCRIPTION);
+            tree.addContent(getMarkerAnchor(SectionName.MODULE_DESCRIPTION));
+            addInlineComment(mdle, tree);
+            if (configuration.allowTag(HtmlTag.SECTION)) {
+                moduleContentTree.addContent(tree);
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addModuleTags(Content moduleContentTree) {
+        Content tree = (configuration.allowTag(HtmlTag.SECTION))
+                ? HtmlTree.SECTION()
+                : moduleContentTree;
+        addTagsInfo(mdle, tree);
+        if (configuration.allowTag(HtmlTag.SECTION)) {
+            moduleContentTree.addContent(tree);
+        }
+    }
+
+    /**
+     * Add summary details to the navigation bar.
+     *
+     * @param subDiv the content tree to which the summary detail links will be added
+     */
+    @Override
+    protected void addSummaryDetailLinks(Content subDiv) {
+        Content div = HtmlTree.DIV(getNavSummaryLinks());
+        subDiv.addContent(div);
+    }
+
+    /**
+     * Get summary links for navigation bar.
+     *
+     * @return the content tree for the navigation summary links
+     */
+    protected Content getNavSummaryLinks() {
+        Content li = HtmlTree.LI(contents.moduleSubNavLabel);
+        li.addContent(Contents.SPACE);
+        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
+        Content liNav = new HtmlTree(HtmlTag.LI);
+        liNav.addContent(!utils.getFullBody(mdle).isEmpty() && !configuration.nocomment
+                ? getHyperLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription)
+                : contents.navModuleDescription);
+        addNavGap(liNav);
+        liNav.addContent((display(requires) || display(indirectModules))
+                ? getHyperLink(SectionName.MODULES, contents.navModules)
+                : contents.navModules);
+        addNavGap(liNav);
+        liNav.addContent((display(exportedPackages) || display(openedPackages) || display(concealedPackages)
+                || display(indirectPackages) || display(indirectOpenPackages))
+                ? getHyperLink(SectionName.PACKAGES, contents.navPackages)
+                : contents.navPackages);
+        addNavGap(liNav);
+        liNav.addContent((displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees))
+                ? getHyperLink(SectionName.SERVICES, contents.navServices)
+                : contents.navServices);
+        ulNav.addContent(liNav);
+        return ulNav;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addModuleContent(Content contentTree, Content moduleContentTree) {
+        if (configuration.allowTag(HtmlTag.MAIN)) {
+            mainTree.addContent(moduleContentTree);
+            contentTree.addContent(mainTree);
+        } else {
+            contentTree.addContent(moduleContentTree);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addModuleFooter(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}
+     *
+     * @throws jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException
+     */
+    @Override
+    public void printDocument(Content contentTree) throws DocFileIOException {
+        printHtmlDocument(configuration.metakeywords.getMetaKeywordsForModule(mdle),
+                true, contentTree);
+    }
+
+    /**
+     * Add the module package deprecation information to the documentation tree.
+     *
+     * @param li the content tree to which the deprecation information will be added
+     * @param pkg the PackageDoc that is added
+     */
+    public void addPackageDeprecationInfo(Content li, PackageElement pkg) {
+        List<? extends DocTree> deprs;
+        if (utils.isDeprecated(pkg)) {
+            deprs = utils.getDeprecatedTrees(pkg);
+            HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
+            deprDiv.addStyle(HtmlStyle.deprecatedContent);
+            Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
+            deprDiv.addContent(deprPhrase);
+            if (!deprs.isEmpty()) {
+                CommentHelper ch = utils.getCommentHelper(pkg);
+                List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
+                if (!commentTags.isEmpty()) {
+                    addInlineDeprecatedComment(pkg, deprs.get(0), deprDiv);
+                }
+            }
+            li.addContent(deprDiv);
+        }
+    }
+
+    /**
+     * Get this module link.
+     *
+     * @return a content tree for the module link
+     */
+    @Override
+    protected Content getNavLinkModule() {
+        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.moduleLabel);
+        return li;
+    }
+
+    /**
+     * Get "PREV MODULE" link in the navigation bar.
+     *
+     * @return a content tree for the previous link
+     */
+    @Override
+    public Content getNavLinkPrevious() {
+        Content li;
+        if (prevModule == null) {
+            li = HtmlTree.LI(contents.prevModuleLabel);
+        } else {
+            li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(
+                    prevModule)), contents.prevModuleLabel, "", ""));
+        }
+        return li;
+    }
+
+    /**
+     * Get "NEXT MODULE" link in the navigation bar.
+     *
+     * @return a content tree for the next link
+     */
+    @Override
+    public Content getNavLinkNext() {
+        Content li;
+        if (nextModule == null) {
+            li = HtmlTree.LI(contents.nextModuleLabel);
+        } else {
+            li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(
+                    nextModule)), contents.nextModuleLabel, "", ""));
+        }
+        return li;
+    }
+}