diff -r 12cf6bfd8c05 -r 78962d89f283 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Oct 17 16:43:26 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Tue Oct 23 13:20:37 2012 -0700 @@ -62,11 +62,6 @@ public static final String BUILD_DATE = System.getProperty("java.version"); /** - * The name of the constant values file. - */ - public static final String CONSTANTS_FILE_NAME = "constant-values.html"; - - /** * Argument for command line option "-header". */ public String header = ""; @@ -179,7 +174,7 @@ * First file to appear in the right-hand frame in the generated * documentation. */ - public String topFile = ""; + public DocPath topFile = DocPath.empty; /** * The classdoc for the class file getting generated. @@ -447,18 +442,17 @@ return; } if (createoverview) { - topFile = "overview-summary.html"; + topFile = DocPaths.OVERVIEW_SUMMARY; } else { if (packages.length == 1 && packages[0].name().equals("")) { if (root.classes().length > 0) { ClassDoc[] classarr = root.classes(); Arrays.sort(classarr); ClassDoc cd = getValidClass(classarr); - topFile = DirectoryManager.getPathToClass(cd); + topFile = DocPath.forClass(cd); } } else { - topFile = DirectoryManager.getPathToPackage(packages[0], - "package-summary.html"); + topFile = DocPath.forPackage(packages[0]).resolve(DocPaths.PACKAGE_SUMMARY); } } }