--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java	Thu May 17 08:41:01 2018 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java	Thu May 17 12:59:53 2018 -0700
@@ -195,13 +195,9 @@
      */
     @Override
     public void addInterfaceSummary(SortedSet<TypeElement> interfaces, Content summaryContentTree) {
-        String label = resources.getText("doclet.Interface_Summary");
-        String tableSummary = resources.getText("doclet.Member_Table_Summary",
-                        resources.getText("doclet.Interface_Summary"),
-                        resources.getText("doclet.interfaces"));
         TableHeader tableHeader= new TableHeader(contents.interfaceLabel, contents.descriptionLabel);
-
-        addClassesSummary(interfaces, label, tableSummary, tableHeader, summaryContentTree);
+        addClassesSummary(interfaces, resources.interfaceSummary, resources.interfaceTableSummary,
+                tableHeader, summaryContentTree);
     }
 
     /**
@@ -209,13 +205,9 @@
      */
     @Override
     public void addClassSummary(SortedSet<TypeElement> classes, Content summaryContentTree) {
-        String label = resources.getText("doclet.Class_Summary");
-        String tableSummary = resources.getText("doclet.Member_Table_Summary",
-                        resources.getText("doclet.Class_Summary"),
-                        resources.getText("doclet.classes"));
         TableHeader tableHeader= new TableHeader(contents.classLabel, contents.descriptionLabel);
-
-        addClassesSummary(classes, label, tableSummary, tableHeader, summaryContentTree);
+        addClassesSummary(classes, resources.classSummary, resources.classTableSummary,
+                tableHeader, summaryContentTree);
     }
 
     /**
@@ -223,13 +215,9 @@
      */
     @Override
     public void addEnumSummary(SortedSet<TypeElement> enums, Content summaryContentTree) {
-        String label = resources.getText("doclet.Enum_Summary");
-        String tableSummary = resources.getText("doclet.Member_Table_Summary",
-                        resources.getText("doclet.Enum_Summary"),
-                        resources.getText("doclet.enums"));
         TableHeader tableHeader= new TableHeader(contents.enum_, contents.descriptionLabel);
-
-        addClassesSummary(enums, label, tableSummary, tableHeader, summaryContentTree);
+        addClassesSummary(enums, resources.enumSummary, resources.enumTableSummary,
+                tableHeader, summaryContentTree);
     }
 
     /**
@@ -237,13 +225,9 @@
      */
     @Override
     public void addExceptionSummary(SortedSet<TypeElement> exceptions, Content summaryContentTree) {
-        String label = resources.getText("doclet.Exception_Summary");
-        String tableSummary = resources.getText("doclet.Member_Table_Summary",
-                        resources.getText("doclet.Exception_Summary"),
-                        resources.getText("doclet.exceptions"));
         TableHeader tableHeader= new TableHeader(contents.exception, contents.descriptionLabel);
-
-        addClassesSummary(exceptions, label, tableSummary, tableHeader, summaryContentTree);
+        addClassesSummary(exceptions, resources.exceptionSummary, resources.exceptionTableSummary,
+                tableHeader, summaryContentTree);
     }
 
     /**
@@ -251,13 +235,9 @@
      */
     @Override
     public void addErrorSummary(SortedSet<TypeElement> errors, Content summaryContentTree) {
-        String label = resources.getText("doclet.Error_Summary");
-        String tableSummary = resources.getText("doclet.Member_Table_Summary",
-                        resources.getText("doclet.Error_Summary"),
-                        resources.getText("doclet.errors"));
         TableHeader tableHeader= new TableHeader(contents.error, contents.descriptionLabel);
-
-        addClassesSummary(errors, label, tableSummary, tableHeader, summaryContentTree);
+        addClassesSummary(errors, resources.errorSummary, resources.errorTableSummary,
+                tableHeader, summaryContentTree);
     }
 
     /**
@@ -265,13 +245,9 @@
      */
     @Override
     public void addAnnotationTypeSummary(SortedSet<TypeElement> annoTypes, Content summaryContentTree) {
-        String label = resources.getText("doclet.Annotation_Types_Summary");
-        String tableSummary = resources.getText("doclet.Member_Table_Summary",
-                        resources.getText("doclet.Annotation_Types_Summary"),
-                        resources.getText("doclet.annotationtypes"));
         TableHeader tableHeader= new TableHeader(contents.annotationType, contents.descriptionLabel);
-
-        addClassesSummary(annoTypes, label, tableSummary, tableHeader, summaryContentTree);
+        addClassesSummary(annoTypes, resources.annotationTypeSummary, resources.annotationTypeTableSummary,
+                tableHeader, summaryContentTree);
     }
 
     public void addClassesSummary(SortedSet<TypeElement> classes, String label,