1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Oct 10 18:08:19 2012 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Oct 10 18:34:46 2012 -0700 1.3 @@ -351,66 +351,6 @@ 1.4 } 1.5 1.6 /** 1.7 - * Print the html file header. Also print Html page title and stylesheet 1.8 - * default properties. 1.9 - * 1.10 - * @param title String window title to go in the <TITLE> tag 1.11 - * @param metakeywords Array of String keywords for META tag. Each element 1.12 - * of the array is assigned to a separate META tag. 1.13 - * Pass in null for no array. 1.14 - * @param includeScript boolean true if printing windowtitle script. 1.15 - * False for files that appear in the left-hand frames. 1.16 - */ 1.17 - public void printHtmlHeader(String title, String[] metakeywords, 1.18 - boolean includeScript) { 1.19 - println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 " + 1.20 - "Transitional//EN\" " + 1.21 - "\"http://www.w3.org/TR/html4/loose.dtd\">"); 1.22 - println("<!--NewPage-->"); 1.23 - html(); 1.24 - head(); 1.25 - if (! configuration.notimestamp) { 1.26 - print("<!-- Generated by javadoc (build " + ConfigurationImpl.BUILD_DATE + ") on "); 1.27 - print(today()); 1.28 - println(" -->"); 1.29 - } 1.30 - if (configuration.charset.length() > 0) { 1.31 - println("<META http-equiv=\"Content-Type\" content=\"text/html; " 1.32 - + "charset=" + configuration.charset + "\">"); 1.33 - } 1.34 - if ( configuration.windowtitle.length() > 0 ) { 1.35 - title += " (" + configuration.windowtitle + ")"; 1.36 - } 1.37 - title(title); 1.38 - println(title); 1.39 - titleEnd(); 1.40 - println(""); 1.41 - if (! configuration.notimestamp) { 1.42 - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); 1.43 - println("<META NAME=\"date\" " 1.44 - + "CONTENT=\"" + dateFormat.format(new Date()) + "\">"); 1.45 - } 1.46 - if ( metakeywords != null ) { 1.47 - for ( int i=0; i < metakeywords.length; i++ ) { 1.48 - println("<META NAME=\"keywords\" " 1.49 - + "CONTENT=\"" + metakeywords[i] + "\">"); 1.50 - } 1.51 - } 1.52 - println(""); 1.53 - printStyleSheetProperties(); 1.54 - println(""); 1.55 - // Don't print windowtitle script for overview-frame, allclasses-frame 1.56 - // and package-frame 1.57 - if (includeScript) { 1.58 - printWinTitleScript(title); 1.59 - } 1.60 - println(""); 1.61 - headEnd(); 1.62 - println(""); 1.63 - body("white", includeScript); 1.64 - } 1.65 - 1.66 - /** 1.67 * Generates the HTML document tree and prints it out. 1.68 * 1.69 * @param metakeywords Array of String keywords for META tag. Each element 1.70 @@ -426,8 +366,7 @@ 1.71 Content htmlComment = new Comment(configuration.getText("doclet.New_Page")); 1.72 Content head = new HtmlTree(HtmlTag.HEAD); 1.73 if (!configuration.notimestamp) { 1.74 - Content headComment = new Comment("Generated by javadoc (version " + 1.75 - ConfigurationImpl.BUILD_DATE + ") on " + today()); 1.76 + Content headComment = new Comment(getGeneratedByString()); 1.77 head.addContent(headComment); 1.78 } 1.79 if (configuration.charset.length() > 0) {