--- old/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java	2017-10-16 15:21:42.747606450 -0700
+++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java	2017-10-16 15:21:42.367589552 -0700
@@ -70,7 +70,7 @@
 
     private final String constantsTableSummary;
 
-    private final List<String> constantsTableHeader;
+    private final TableHeader constantsTableHeader;
 
     /**
      * The HTML tree for main tag.
@@ -92,10 +92,8 @@
         this.configuration = configuration;
         constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary",
                 configuration.getText("doclet.Constants_Summary"));
-        constantsTableHeader = new ArrayList<>();
-        constantsTableHeader.add(getModifierTypeHeader());
-        constantsTableHeader.add(configuration.getText("doclet.ConstantField"));
-        constantsTableHeader.add(configuration.getText("doclet.Value"));
+        constantsTableHeader = new TableHeader(
+                contents.modifierAndTypeLabel, contents.constantFieldLabel, contents.valueLabel);
     }
 
     /**
@@ -261,7 +259,7 @@
         Content table = (configuration.isOutputHtml5())
                 ? HtmlTree.TABLE(HtmlStyle.constantsSummary, caption)
                 : HtmlTree.TABLE(HtmlStyle.constantsSummary, constantsTableSummary, caption);
-        table.addContent(getSummaryTableHeader(constantsTableHeader, "col"));
+        table.addContent(constantsTableHeader.toContent());
         return table;
     }