src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java

@@ -56,15 +56,19 @@
 public class PackageUseWriter extends SubWriterHolderWriter {
 
     final PackageElement packageElement;
     final SortedMap<String, Set<TypeElement>> usingPackageToUsedClasses = new TreeMap<>();
     protected HtmlTree mainTree = HtmlTree.MAIN();
+    final String packageUseTableSummary;
 
     /**
      * Constructor.
      *
-     * @param filename the file to be generated.
+     * @param configuration the configuration
+     * @param mapper a mapper to provide details of where elements are used
+     * @param filename the file to be generated
+     * @param pkgElement the package element to be documented
      */
     public PackageUseWriter(HtmlConfiguration configuration,
                             ClassUseMapper mapper, DocPath filename,
                             PackageElement pkgElement) {
         super(configuration, DocPath.forPackage(pkgElement).resolve(filename));

@@ -87,10 +91,13 @@
                     }
                     usedClasses.add(usedClass);
                 }
             }
         }
+
+        packageUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
+                configuration.getText("doclet.packages"));
     }
 
     /**
      * Generate a class page.
      *

@@ -161,12 +168,12 @@
         Content caption = getTableCaption(configuration.getContent(
                 "doclet.ClassUse_Packages.that.use.0",
                 getPackageLink(packageElement, utils.getPackageName(packageElement))));
         Content table = (configuration.isOutputHtml5())
                 ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
+                : HtmlTree.TABLE(HtmlStyle.useSummary, packageUseTableSummary, caption);
+        table.addContent(getPackageTableHeader().toContent());
         Content tbody = new HtmlTree(HtmlTag.TBODY);
         boolean altColor = true;
         for (String pkgname: usingPackageToUsedClasses.keySet()) {
             PackageElement pkg = utils.elementUtils.getPackageElement(pkgname);
             HtmlTree tr = new HtmlTree(HtmlTag.TR);

@@ -184,12 +191,12 @@
      * Add the list of classes that use the given package.
      *
      * @param contentTree the content tree to which the class list will be added
      */
     protected void addClassList(Content contentTree) {
-        List<String> classTableHeader = Arrays.asList(
-                resources.getText("doclet.Class"), resources.getText("doclet.Description"));
+        TableHeader classTableHeader = new TableHeader(
+                contents.classLabel, contents.descriptionLabel);
         for (String packageName : usingPackageToUsedClasses.keySet()) {
             PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
             HtmlTree li = new HtmlTree(HtmlTag.LI);
             li.addStyle(HtmlStyle.blockList);
             if (usingPackage != null) {

@@ -202,11 +209,11 @@
                     getPackageLink(packageElement, utils.getPackageName(packageElement)),
                     getPackageLink(usingPackage, utils.getPackageName(usingPackage))));
             Content table = (configuration.isOutputHtml5())
                     ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
                     : HtmlTree.TABLE(HtmlStyle.useSummary, tableSummary, caption);
-            table.addContent(getSummaryTableHeader(classTableHeader, "col"));
+            table.addContent(classTableHeader.toContent());
             Content tbody = new HtmlTree(HtmlTag.TBODY);
             boolean altColor = true;
             for (TypeElement te : usingPackageToUsedClasses.get(packageName)) {
                 HtmlTree tr = new HtmlTree(HtmlTag.TR);
                 tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);