diff -r 400a4e8accd3 -r bdcef2ef52d2 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java Thu Nov 15 19:54:20 2012 -0800 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java Thu Nov 15 23:07:24 2012 -0800 @@ -43,6 +43,7 @@ import java.util.List; import java.util.Set; +import javax.tools.DocumentationTool; import javax.tools.JavaFileManager.Location; import javax.tools.StandardLocation; @@ -74,7 +75,7 @@ } public DocFile createFileForOutput(DocPath path) { - return new SimpleDocFile(StandardLocation.CLASS_OUTPUT, path); + return new SimpleDocFile(DocumentationTool.Location.DOCUMENTATION_OUTPUT, path); } @Override @@ -121,10 +122,10 @@ /** * Open an output stream for the file. * The file must have been created with a location of - * {@link StandardLocation#CLASS_OUTPUT} and a corresponding relative path. + * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path. */ public OutputStream openOutputStream() throws IOException, UnsupportedEncodingException { - if (location != StandardLocation.CLASS_OUTPUT) + if (location != DocumentationTool.Location.DOCUMENTATION_OUTPUT) throw new IllegalStateException(); createDirectoryForFile(file); @@ -135,10 +136,10 @@ * Open an writer for the file, using the encoding (if any) given in the * doclet configuration. * The file must have been created with a location of - * {@link StandardLocation#CLASS_OUTPUT} and a corresponding relative path. + * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path. */ public Writer openWriter() throws IOException, UnsupportedEncodingException { - if (location != StandardLocation.CLASS_OUTPUT) + if (location != DocumentationTool.Location.DOCUMENTATION_OUTPUT) throw new IllegalStateException(); createDirectoryForFile(file); @@ -243,10 +244,11 @@ /** * Resolve a relative file against the given output location. - * @param locn Currently, only SOURCE_OUTPUT is supported. + * @param locn Currently, only + * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} is supported. */ - public DocFile resolveAgainst(StandardLocation locn) { - if (locn != StandardLocation.CLASS_OUTPUT) + public DocFile resolveAgainst(Location locn) { + if (locn != DocumentationTool.Location.DOCUMENTATION_OUTPUT) throw new IllegalArgumentException(); return new SimpleDocFile( new File(configuration.destDirName, file.getPath()));