1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java Thu Nov 15 19:54:20 2012 -0800 1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java Thu Nov 15 23:07:24 2012 -0800 1.3 @@ -25,10 +25,14 @@ 1.4 1.5 package com.sun.tools.doclets.internal.toolkit.util; 1.6 1.7 +import java.io.BufferedReader; 1.8 +import java.io.BufferedWriter; 1.9 import java.io.FileNotFoundException; 1.10 import java.io.IOException; 1.11 import java.io.InputStream; 1.12 +import java.io.InputStreamReader; 1.13 import java.io.OutputStream; 1.14 +import java.io.OutputStreamWriter; 1.15 import java.io.UnsupportedEncodingException; 1.16 import java.io.Writer; 1.17 1.18 @@ -36,10 +40,6 @@ 1.19 import javax.tools.StandardLocation; 1.20 1.21 import com.sun.tools.doclets.internal.toolkit.Configuration; 1.22 -import java.io.BufferedReader; 1.23 -import java.io.BufferedWriter; 1.24 -import java.io.InputStreamReader; 1.25 -import java.io.OutputStreamWriter; 1.26 1.27 /** 1.28 * Abstraction for handling files, which may be specified directly 1.29 @@ -115,7 +115,8 @@ 1.30 /** 1.31 * Open an output stream for the file. 1.32 * The file must have been created with a location of 1.33 - * {@link StandardLocation#CLASS_OUTPUT} and a corresponding relative path. 1.34 + * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} 1.35 + * and a corresponding relative path. 1.36 */ 1.37 public abstract OutputStream openOutputStream() throws IOException, UnsupportedEncodingException; 1.38 1.39 @@ -123,7 +124,7 @@ 1.40 * Open an writer for the file, using the encoding (if any) given in the 1.41 * doclet configuration. 1.42 * The file must have been created with a location of 1.43 - * {@link StandardLocation#CLASS_OUTPUT} and a corresponding relative path. 1.44 + * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path. 1.45 */ 1.46 public abstract Writer openWriter() throws IOException, UnsupportedEncodingException; 1.47 1.48 @@ -251,7 +252,8 @@ 1.49 1.50 /** 1.51 * Resolve a relative file against the given output location. 1.52 - * @param locn Currently, only SOURCE_OUTPUT is supported. 1.53 + * @param locn Currently, only 1.54 + * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} is supported. 1.55 */ 1.56 - public abstract DocFile resolveAgainst(StandardLocation locn); 1.57 + public abstract DocFile resolveAgainst(Location locn); 1.58 }