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

*** 23,32 ****
--- 23,33 ----
   * questions.
   */
  
  package jdk.javadoc.internal.doclets.formats.html;
  
+ import java.text.MessageFormat;
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
*** 99,108 ****
--- 100,110 ----
      final String subclassUseTableSummary;
      final String subinterfaceUseTableSummary;
      final String fieldUseTableSummary;
      final String methodUseTableSummary;
      final String constructorUseTableSummary;
+     final String packageUseTableSummary;
  
      /**
       * The HTML tree for main tag.
       */
      protected HtmlTree mainTree = HtmlTree.MAIN();
*** 150,175 ****
              !pkgSet.equals(mapper.classToPackage.get(this.typeElement))) {
              configuration.reporter.print(Diagnostic.Kind.WARNING,
                      "Internal error: package sets don't match: "
                      + pkgSet + " with: " + mapper.classToPackage.get(this.typeElement));
          }
          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.
       *
--- 152,182 ----
              !pkgSet.equals(mapper.classToPackage.get(this.typeElement))) {
              configuration.reporter.print(Diagnostic.Kind.WARNING,
                      "Internal error: package sets don't match: "
                      + pkgSet + " with: " + mapper.classToPackage.get(this.typeElement));
          }
+ 
          methodSubWriter = new MethodWriterImpl(this);
          constrSubWriter = new ConstructorWriterImpl(this);
          fieldSubWriter = new FieldWriterImpl(this);
          classSubWriter = new NestedClassWriterImpl(this);
! 
!         String useTableSummary = resources.getText("doclet.Use_Table_Summary");
!         classUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.classes"));
!         subclassUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.subclasses"));
!         subinterfaceUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.subinterfaces"));
!         fieldUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.fields"));
!         methodUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.methods"));
!         constructorUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.constructors"));
!         packageUseTableSummary = MessageFormat.format(useTableSummary,
!                 resources.getText("doclet.packages"));
      }
  
      /**
       * Write out class use pages.
       *
*** 288,299 ****
                  "doclet.ClassUse_Packages.that.use.0",
                  getLink(new LinkInfoImpl(configuration,
                          LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
          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);
          boolean altColor = true;
          for (PackageElement pkg : pkgSet) {
              HtmlTree tr = new HtmlTree(HtmlTag.TR);
              tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
--- 295,306 ----
                  "doclet.ClassUse_Packages.that.use.0",
                  getLink(new LinkInfoImpl(configuration,
                          LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
          Content table = (configuration.isOutputHtml5())
                  ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
!                 : HtmlTree.TABLE(HtmlStyle.useSummary, packageUseTableSummary, caption);
!         table.addContent(getPackageTableHeader().toContent());
          Content tbody = new HtmlTree(HtmlTag.TBODY);
          boolean altColor = true;
          for (PackageElement pkg : pkgSet) {
              HtmlTree tr = new HtmlTree(HtmlTag.TR);
              tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
*** 321,332 ****
                  "doclet.ClassUse_PackageAnnotation",
                  getLink(new LinkInfoImpl(configuration,
                          LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
          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);
          boolean altColor = true;
          for (PackageElement pkg : pkgToPackageAnnotations) {
              HtmlTree tr = new HtmlTree(HtmlTag.TR);
              tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
--- 328,339 ----
                  "doclet.ClassUse_PackageAnnotation",
                  getLink(new LinkInfoImpl(configuration,
                          LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
          Content table = (configuration.isOutputHtml5())
                  ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
!                 : HtmlTree.TABLE(HtmlStyle.useSummary, packageUseTableSummary, caption);
!         table.addContent(getPackageTableHeader().toContent());
          Content tbody = new HtmlTree(HtmlTag.TBODY);
          boolean altColor = true;
          for (PackageElement pkg : pkgToPackageAnnotations) {
              HtmlTree tr = new HtmlTree(HtmlTag.TR);
              tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);