jdk-sandbox: comparison langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java

equal deleted inserted replaced

-:e17429a7e843
+:1c355ea550ed
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import javax.tools.DocumentationTool;
 import javax.tools.FileObject;
 import javax.tools.JavaFileManager.Location;
 public StandardDocFileFactory(Configuration configuration) {
 super(configuration);
 fileManager = (StandardJavaFileManager) configuration.getFileManager();
 }
+@Override
+public void setDestDir(String destDirName) throws SimpleDocletException {
+if (destDir != null)
+throw new AssertionError("destDir already initialized: " + destDir);
+if (!destDirName.isEmpty()
+|| !fileManager.hasLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT)) {
+try {
+String dirName = destDirName.isEmpty() ? "." : destDirName;
+Path dir = Paths.get(dirName);
+fileManager.setLocationFromPaths(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir));
+} catch (IOException e) {
+// generic IOException from file manager, setting location, e.g. file not a directory
+String message = configuration.getResources().getText("doclet.error.initializing.dest.dir", e);
+throw new SimpleDocletException(message, e);
+}
+}
+destDir = fileManager.getLocationAsPaths(DocumentationTool.Location.DOCUMENTATION_OUTPUT).iterator().next();
+}
 private Path getDestDir() {
-if (destDir == null) {
+Objects.requireNonNull(destDir, "destDir not initialized");
-if (!configuration.destDirName.isEmpty()
-|| !fileManager.hasLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT)) {
-try {
-String dirName = configuration.destDirName.isEmpty() ? "." : configuration.destDirName;
-Path dir = Paths.get(dirName);
-fileManager.setLocationFromPaths(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir));
-} catch (IOException e) {
-throw new DocletAbortException(e);
-}
-}
-destDir = fileManager.getLocationAsPaths(DocumentationTool.Location.DOCUMENTATION_OUTPUT).iterator().next();
-}
 return destDir;
 }
+@Override
 public DocFile createFileForDirectory(String file) {
 return new StandardDocFile(Paths.get(file));
 }
+@Override
 public DocFile createFileForInput(String file) {
 return new StandardDocFile(Paths.get(file));
 }
+@Override
 public DocFile createFileForOutput(DocPath path) {
 return new StandardDocFile(DocumentationTool.Location.DOCUMENTATION_OUTPUT, path);
 }
 @Override
 private static Path newFile(Path dir, String path) {
 return (dir == null) ? Paths.get(path) : dir.resolve(path);
 }
 class StandardDocFile extends DocFile {
-private Path file;
+private final Path file;
 /** Create a StandardDocFile for a given file. */
 private StandardDocFile(Path file) {
-super(configuration);
 this.file = file;
 }
 /** Create a StandardDocFile for a given location and relative path. */
 private StandardDocFile(Location location, DocPath path) {
-super(configuration, location, path);
+super(location, path);
 Assert.check(location == DocumentationTool.Location.DOCUMENTATION_OUTPUT);
 this.file = newFile(getDestDir(), path.getPath());
 }
-/** Open an input stream for the file. */
+/**
-public InputStream openInputStream() throws IOException {
+* Open an input stream for the file.
-JavaFileObject fo = getJavaFileObjectForInput(file);
+*
-return new BufferedInputStream(fo.openInputStream());
+* @throws DocFileIOException if there is a problem while opening stream
+*/
+@Override
+public InputStream openInputStream() throws DocFileIOException {
+try {
+JavaFileObject fo = getJavaFileObjectForInput(file);
+return new BufferedInputStream(fo.openInputStream());
+} catch (IOException e) {
+throw new DocFileIOException(this, DocFileIOException.Mode.READ, e);
+}
 }
 /**
 * Open an output stream for the file.
 * The file must have been created with a location of
 * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path.
-*/
+*
-public OutputStream openOutputStream() throws IOException, UnsupportedEncodingException {
+* @throws DocFileIOException if there is a problem while opening stream
+*/
+@Override
+public OutputStream openOutputStream() throws DocFileIOException {
 if (location != DocumentationTool.Location.DOCUMENTATION_OUTPUT)
 throw new IllegalStateException();
-OutputStream out = getFileObjectForOutput(path).openOutputStream();
+try {
-return new BufferedOutputStream(out);
+OutputStream out = getFileObjectForOutput(path).openOutputStream();
+return new BufferedOutputStream(out);
+} catch (IOException e) {
+throw new DocFileIOException(this, DocFileIOException.Mode.WRITE, e);
+}
 }
 /**
 * 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 DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path.
-*/
+*
-public Writer openWriter() throws IOException, UnsupportedEncodingException {
+* @throws DocFileIOException if there is a problem while opening stream
+* @throws UnsupportedEncodingException if the configured encoding is not supported
+*/
+@Override
+public Writer openWriter() throws DocFileIOException, UnsupportedEncodingException {
 if (location != DocumentationTool.Location.DOCUMENTATION_OUTPUT)
 throw new IllegalStateException();
-OutputStream out = getFileObjectForOutput(path).openOutputStream();
+try {
-if (configuration.docencoding == null) {
+OutputStream out = getFileObjectForOutput(path).openOutputStream();
-return new BufferedWriter(new OutputStreamWriter(out));
+if (configuration.docencoding == null) {
-} else {
+return new BufferedWriter(new OutputStreamWriter(out));
-return new BufferedWriter(new OutputStreamWriter(out, configuration.docencoding));
+} else {
+return new BufferedWriter(new OutputStreamWriter(out, configuration.docencoding));
+}
+} catch (IOException e) {
+throw new DocFileIOException(this, DocFileIOException.Mode.WRITE, e);
 }
 }
 /** Return true if the file can be read. */
+@Override
 public boolean canRead() {
 return Files.isReadable(file);
 }
 /** Return true if the file can be written. */
+@Override
 public boolean canWrite() {
 return Files.isWritable(file);
 }
 /** Return true if the file exists. */
+@Override
 public boolean exists() {
 return Files.exists(file);
 }
 /** Return the base name (last component) of the file name. */
+@Override
 public String getName() {
 return file.getFileName().toString();
 }
 /** Return the file system path for this file. */
+@Override
 public String getPath() {
 return file.toString();
 }
 /** Return true is file has an absolute path name. */
+@Override
 public boolean isAbsolute() {
 return file.isAbsolute();
 }
 /** Return true is file identifies a directory. */
+@Override
 public boolean isDirectory() {
 return Files.isDirectory(file);
 }
 /** Return true is file identifies a file. */
+@Override
 public boolean isFile() {
 return Files.isRegularFile(file);
 }
 /** Return true if this file is the same as another. */
+@Override
 public boolean isSameFile(DocFile other) {
 if (!(other instanceof StandardDocFile))
 return false;
 try {
 return false;
 }
 }
 /** If the file is a directory, list its contents. */
-public Iterable<DocFile> list() throws IOException {
+@Override
-List<DocFile> files = new ArrayList<DocFile>();
+public Iterable<DocFile> list() throws DocFileIOException {
+List<DocFile> files = new ArrayList<>();
 try (DirectoryStream<Path> ds = Files.newDirectoryStream(file)) {
 for (Path f: ds) {
 files.add(new StandardDocFile(f));
 }
+} catch (IOException e) {
+throw new DocFileIOException(this, DocFileIOException.Mode.READ, e);
 }
 return files;
 }
 /** Create the file as a directory, including any parent directories. */
+@Override
 public boolean mkdirs() {
 try {
 Files.createDirectories(file);
 return true;
 } catch (IOException e) {
 * Derive a new file by resolving a relative path against this file.
 * The new file will inherit the configuration and location of this file
 * If this file has a path set, the new file will have a corresponding
 * new path.
 */
+@Override
 public DocFile resolve(DocPath p) {
 return resolve(p.getPath());
 }
 /**
 * Derive a new file by resolving a relative path against this file.
 * The new file will inherit the configuration and location of this file
 * If this file has a path set, the new file will have a corresponding
 * new path.
 */
+@Override
 public DocFile resolve(String p) {
 if (location == null && path == null) {
 return new StandardDocFile(file.resolve(p));
 } else {
 return new StandardDocFile(location, path.resolve(p));
 /**
 * Resolve a relative file against the given output location.
 * @param locn Currently, only
 * {@link DocumentationTool.Location.DOCUMENTATION_OUTPUT} is supported.
 */
+@Override
 public DocFile resolveAgainst(Location locn) {
 if (locn != DocumentationTool.Location.DOCUMENTATION_OUTPUT)
 throw new IllegalArgumentException();
 return new StandardDocFile(getDestDir().resolve(file));
 }

changeset 40587	1c355ea550ed
parent 36526	3b41f1c69604
child 45417	f7479ee8de69