8219497: Unused parameter in HtmlDocletWriter::printHtmlDocument
Reviewed-by: hannesw
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -145,7 +145,6 @@
printHtmlDocument(
configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle),
description,
- includeScript,
body);
}
@@ -178,7 +177,6 @@
printHtmlDocument(
configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle),
description,
- includeScript,
body);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -129,7 +129,7 @@
body.addContent(footer);
printHtmlDocument(
configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle),
- description, includeScript, body);
+ description, body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -120,7 +120,7 @@
HtmlTree div = HtmlTree.DIV(HtmlStyle.indexContainer, ul);
htmlTree.addContent(div);
body.addContent(htmlTree);
- printHtmlDocument(null, "all classes (frame)", false, body);
+ printHtmlDocument(null, "all classes (frame)", body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -116,7 +116,7 @@
footer.addContent(navBar.getContent(false));
addBottom(footer);
bodyTree.addContent(footer);
- printHtmlDocument(null, "class index", true, bodyTree);
+ printHtmlDocument(null, "class index", bodyTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -104,7 +104,7 @@
footer.addContent(navBar.getContent(false));
addBottom(footer);
bodyTree.addContent(footer);
- printHtmlDocument(null, "package index", true, bodyTree);
+ printHtmlDocument(null, "package index", bodyTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -155,7 +155,7 @@
PackageElement pkg = utils.containingPackage(this.annotationType);
Content stylesheetContent = getLocalStylesheetContent(pkg);
printHtmlDocument(configuration.metakeywords.getMetaKeywords(annotationType),
- description, true, stylesheetContent, contentTree);
+ description, stylesheetContent, contentTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -240,7 +240,7 @@
addBottom(footer);
body.addContent(footer);
String description = getDescription("use", typeElement);
- printHtmlDocument(null, description, true, body);
+ printHtmlDocument(null, description, body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -180,7 +180,7 @@
PackageElement pkg = utils.containingPackage(typeElement);
Content stylesheetContent = getLocalStylesheetContent(pkg);
printHtmlDocument(configuration.metakeywords.getMetaKeywords(typeElement),
- description, true, stylesheetContent, contentTree);
+ description, stylesheetContent, contentTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -327,6 +327,6 @@
*/
@Override
public void printDocument(Content contentTree) throws DocFileIOException {
- printHtmlDocument(null, "summary of constants", true, contentTree);
+ printHtmlDocument(null, "summary of constants", contentTree);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -308,7 +308,7 @@
addBottom(htmlTree);
body.addContent(htmlTree);
String description = "deprecated elements";
- printHtmlDocument(null, description, true, body);
+ printHtmlDocument(null, description, body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -206,7 +206,7 @@
footer.addContent(navBar.getContent(false));
docletWriter.addBottom(footer);
htmlContent.addContent(footer);
- docletWriter.printHtmlDocument(Collections.emptyList(), null, false, localTagsContent, htmlContent);
+ docletWriter.printHtmlDocument(Collections.emptyList(), null, localTagsContent, htmlContent);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -99,7 +99,7 @@
htmlTree.addContent(navBar.getContent(false));
addBottom(htmlTree);
body.addContent(htmlTree);
- printHtmlDocument(null, "help", true, body);
+ printHtmlDocument(null, "help", body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -423,17 +423,14 @@
* of the array is assigned to a separate META tag.
* Pass in null for no array
* @param description the content for the description META tag.
- * @param includeScript true if printing windowtitle script
- * false for files that appear in the left-hand frames
* @param body the body htmltree to be included in the document
* @throws DocFileIOException if there is a problem writing the file
*/
public void printHtmlDocument(List<String> metakeywords,
String description,
- boolean includeScript,
Content body)
throws DocFileIOException {
- printHtmlDocument(metakeywords, description, includeScript, new ContentBuilder(), body);
+ printHtmlDocument(metakeywords, description, new ContentBuilder(), body);
}
/**
@@ -443,15 +440,12 @@
* of the array is assigned to a separate META tag.
* Pass in null for no array
* @param description the content for the description META tag.
- * @param includeScript true if printing windowtitle script
- * false for files that appear in the left-hand frames
* @param extraHeadContent any additional content to be included in the HEAD element
* @param body the body htmltree to be included in the document
* @throws DocFileIOException if there is a problem writing the file
*/
public void printHtmlDocument(List<String> metakeywords,
String description,
- boolean includeScript,
Content extraHeadContent,
Content body)
throws DocFileIOException {
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -111,7 +111,6 @@
mdlgen.printHtmlDocument(
configuration.metakeywords.getMetaKeywordsForModule(moduleElement),
"module summary (frame)",
- false,
body);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -915,7 +915,7 @@
public void printDocument(Content contentTree) throws DocFileIOException {
printHtmlDocument(configuration.metakeywords.getMetaKeywordsForModule(mdle),
getDescription("declaration", mdle),
- true, contentTree);
+ contentTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -112,7 +112,6 @@
packgen.printHtmlDocument(
configuration.metakeywords.getMetaKeywords(packageElement),
getDescription("package summary (frame)", packageElement),
- false,
body);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -120,7 +120,7 @@
footer.addContent(navBar.getContent(false));
addBottom(footer);
body.addContent(footer);
- printHtmlDocument(null, getDescription("tree", packageElement), true, body);
+ printHtmlDocument(null, getDescription("tree", packageElement), body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -142,7 +142,6 @@
body.addContent(footer);
printHtmlDocument(null,
getDescription("use", packageElement),
- true,
body);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -318,6 +318,6 @@
String description = getDescription("declaration", packageElement);
Content stylesheetContent = getLocalStylesheetContent(packageElement);
printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageElement),
- description, true, stylesheetContent, contentTree);
+ description, stylesheetContent, contentTree);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Thu Feb 21 15:05:47 2019 -0800
@@ -253,7 +253,7 @@
*/
@Override
public void printDocument(Content serializedTree) throws DocFileIOException {
- printHtmlDocument(null, "serialized forms", true, serializedTree);
+ printHtmlDocument(null, "serialized forms", serializedTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -121,7 +121,7 @@
addBottom(htmlTree);
body.addContent(htmlTree);
createSearchIndexFiles();
- printHtmlDocument(null, "index", true, body);
+ printHtmlDocument(null, "index", body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -145,7 +145,7 @@
addBottom(footer);
body.addContent(footer);
String description = "index: " + unicode;
- printHtmlDocument(null, description, true, body);
+ printHtmlDocument(null, description, body);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Thu Feb 21 14:03:57 2019 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Thu Feb 21 15:05:47 2019 -0800
@@ -126,7 +126,7 @@
htmlTree.addContent(navBar.getContent(false));
addBottom(htmlTree);
body.addContent(htmlTree);
- printHtmlDocument(null, "class tree", true, body);
+ printHtmlDocument(null, "class tree", body);
}
/**