jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java

-:12cf6bfd8c05
+:78962d89f283
 */
 public static final String[][] HTML_ESCAPE_CHARS =
 {{"&", "&amp;"}, {"<", "&lt;"}, {">", "&gt;"}};
 /**
-* Name of the resource directory.
-*/
-public static final String RESOURCESDIR = "resources";
-/**
 * Return array of class members whose documentation is to be generated.
 * If the member is deprecated do not include such a member in the
 * returned array.
 *
 * @param  members             Array of members to choose from.
 * @param path The relative path to the directory to be copied.
 * @param dir The original directory name to copy from.
 * @param overwrite Overwrite files if true.
 */
 public static void copyDocFiles(Configuration configuration,
-String path, String dir, boolean overwrite) {
+File path, DocPath dir, boolean overwrite) {
 if (checkCopyDocFilesErrors(configuration, path, dir)) {
 return;
 }
-String destname = configuration.docFileDestDirName;
+File srcdir = new File(path, dir.getPath());
-File srcdir = new File(path + dir);
+File destdir = new File(configuration.docFileDestDirName, dir.getPath());
-if (destname.length() > 0 && !destname.endsWith(
-DirectoryManager.URL_FILE_SEPARATOR)) {
-destname += DirectoryManager.URL_FILE_SEPARATOR;
-}
-String dest = destname + dir;
 try {
-File destdir = new File(dest);
+createDirectory(configuration, destdir);
-DirectoryManager.createDirectory(configuration, dest);
 String[] files = srcdir.list();
 for (int i = 0; i < files.length; i++) {
 File srcfile = new File(srcdir, files[i]);
 File destfile = new File(destdir, files[i]);
 if (srcfile.isFile()) {
-if(destfile.exists() && ! overwrite) {
+if (destfile.exists() && ! overwrite) {
 configuration.message.warning((SourcePosition) null,
 "doclet.Copy_Overwrite_warning",
 srcfile.toString(), destdir.toString());
 } else {
 configuration.message.notice(
 "doclet.Copying_File_0_To_Dir_1",
 srcfile.toString(), destdir.toString());
 Util.copyFile(destfile, srcfile);
 }
-} else if(srcfile.isDirectory()) {
+} else if (srcfile.isDirectory()) {
-if(configuration.copydocfilesubdirs
+if (configuration.copydocfilesubdirs
 && ! configuration.shouldExcludeDocFileDir(
 srcfile.getName())){
-copyDocFiles(configuration, path, dir +
+copyDocFiles(configuration, path, dir.resolve(files[i]),
-DirectoryManager.URL_FILE_SEPARATOR + srcfile.getName(),
 overwrite);
 }
 }
 }
 } catch (SecurityException exc) {
 * @param configuration The configuration of the current doclet.
 * @param path The relative path to the directory to be copied.
 * @param dirName The original directory name to copy from.
 */
 private static boolean checkCopyDocFilesErrors (Configuration configuration,
-String path, String dirName) {
+File path, DocPath dirName) {
 if ((configuration.sourcepath == null || configuration.sourcepath.length() == 0) &&
 (configuration.destDirName == null || configuration.destDirName.length() == 0)) {
 //The destination path and source path are definitely equal.
 return true;
 }
 if(destPath.equals(sourcePath)){
 return true;
 }
 }
 //Make sure the doc-file being copied exists.
-File srcdir = new File(path + dirName);
+File srcdir = new File(path, dirName.getPath());
 if (! srcdir.exists()) {
 return true;
 }
 return false;
 }
 *                       destination directory will be overwritten if
 *                       it already exists.
 */
 public static void copyResourceFile(Configuration configuration,
 String resourcefile, boolean overwrite) {
-String destresourcesdir = configuration.destDirName + RESOURCESDIR;
+copyFile(configuration, resourcefile, DocPaths.RESOURCES, DocPaths.RESOURCES,
-copyFile(configuration, resourcefile, RESOURCESDIR, destresourcesdir,
 overwrite, false);
 }
 /**
 * Copy a file from a source directory to a destination directory
 *                  destination directory will be overwritten if
 *                  it already exists.
 * @param replaceNewLine true if the newline needs to be replaced with platform-
 *                  specific newline.
 */
+public static void copyFile(Configuration configuration, String file, DocPath source,
+DocPath destination, boolean overwrite, boolean replaceNewLine) {
+copyFile(configuration, file, source.getPath(), destination.getPath(),
+overwrite, replaceNewLine);
+}
 public static void copyFile(Configuration configuration, String file, String source,
 String destination, boolean overwrite, boolean replaceNewLine) {
-DirectoryManager.createDirectory(configuration, destination);
+File destdir = configuration.destDirName.isEmpty() ?
-File destfile = new File(destination, file);
+(destination.isEmpty() ? null : new File(destination)) :
-if(destfile.exists() && (! overwrite)) return;
+new File(configuration.destDirName, destination);
+File destfile = (destdir == null) ? new File(file) : new File(destdir, file);
+createDirectory(configuration, destfile.getParentFile());
+if (destfile.exists() && (! overwrite)) return;
 try {
 InputStream in = Configuration.class.getResourceAsStream(
-source + DirectoryManager.URL_FILE_SEPARATOR + file);
+source + '/' + file);
-if(in==null) return;
+if (in == null) return;
 OutputStream out = new FileOutputStream(destfile);
 try {
 if (!replaceNewLine) {
 byte[] buf = new byte[2048];
 int n;
 throw new DocletAbortException();
 }
 }
 /**
+* Given a path string create all the directories in the path. For example,
+* if the path string is "java/applet", the method will create directory
+* "java" and then "java/applet" if they don't exist. The file separator
+* string "/" is platform dependent system property.
+*
+* @param path Directory path string.
+*/
+public static void createDirectory(Configuration configuration, File dir) {
+if (dir == null) {
+return;
+}
+if (dir.exists()) {
+return;
+} else {
+if (dir.mkdirs()) {
+return;
+} else {
+configuration.message.error(
+"doclet.Unable_to_create_directory_0", dir.getPath());
+throw new DocletAbortException();
+}
+}
+}
+/**
 * Given a PackageDoc, return the source path for that package.
 * @param configuration The Configuration for the current Doclet.
-* @param pkgDoc The package to seach the path for.
+* @param pkgDoc The package to search the path for.
 * @return A string representing the path to the given package.
 */
-public static String getPackageSourcePath(Configuration configuration,
+public static File getPackageSourcePath(Configuration configuration,
-PackageDoc pkgDoc){
+PackageDoc pkgDoc) {
-try{
+DocPath pkgPath = DocPath.forPackage(pkgDoc);
-String pkgPath = DirectoryManager.getDirectoryPath(pkgDoc);
+File pkgDir = new SourcePath(configuration.sourcepath).getDirectory(pkgPath);
-String completePath = new SourcePath(configuration.sourcepath).
+if (pkgDir == null)
-getDirectory(pkgPath) + DirectoryManager.URL_FILE_SEPARATOR;
+return null;
 //Make sure that both paths are using the same separators.
-completePath = Util.replaceText(completePath, File.separator,
+String completePath = Util.replaceText(pkgDir.getPath(), File.separator, "/");
-DirectoryManager.URL_FILE_SEPARATOR);
+String pathForPkg = completePath.substring(0, completePath.lastIndexOf(pkgPath.getPath()));
-pkgPath = Util.replaceText(pkgPath, File.separator,
+return new File(pathForPkg);
-DirectoryManager.URL_FILE_SEPARATOR);
-return completePath.substring(0, completePath.lastIndexOf(pkgPath));
-} catch (Exception e){
-return "";
-}
 }
 /**
 * We want the list of types in alphabetical order.  However, types are not
 * comparable.  We need a comparator for now.
 public static String quote(String filepath) {
 return ("\"" + filepath + "\"");
 }
 /**
-* Given a package, return it's name.
+* Given a package, return its name.
 * @param packageDoc the package to check.
 * @return the name of the given package.
 */
 public static String getPackageName(PackageDoc packageDoc) {
 return packageDoc == null || packageDoc.name().length() == 0 ?
 DocletConstants.DEFAULT_PACKAGE_NAME : packageDoc.name();
 }
 /**
-* Given a package, return it's file name without the extension.
+* Given a package, return its file name without the extension.
 * @param packageDoc the package to check.
 * @return the file name of the given package.
 */
 public static String getPackageFileHeadName(PackageDoc packageDoc) {
 return packageDoc == null || packageDoc.name().length() == 0 ?
 DocletConstants.DEFAULT_PACKAGE_FILE_NAME : packageDoc.name();
 }
 /**
-* Given a string, replace all occurraces of 'newStr' with 'oldStr'.
+* Given a string, replace all occurrences of 'newStr' with 'oldStr'.
 * @param originalStr the string to modify.
 * @param oldStr the string to replace.
 * @param newStr the string to insert in place of the old string.
 */
 public static String replaceText(String originalStr, String oldStr,
 * OutputStreamWriter is passed on to next level.
 * @return Writer Writer for the file getting generated.
 * @see java.io.FileOutputStream
 * @see java.io.OutputStreamWriter
 */
-public static Writer genWriter(Configuration configuration,
+public static Writer genWriter(Configuration configuration, DocPath path)
-String path, String filename,
+throws IOException, UnsupportedEncodingException {
-String docencoding)
+File file = path.resolveAgainst(configuration.destDirName);
-throws IOException, UnsupportedEncodingException {
+createDirectory(configuration, file.getParentFile());
-FileOutputStream fos;
+FileOutputStream fos = new FileOutputStream(file);
-if (path != null) {
+if (configuration.docencoding == null) {
-DirectoryManager.createDirectory(configuration, path);
-fos = new FileOutputStream(((path.length() > 0)?
-path + File.separator: "") + filename);
-} else {
-fos = new FileOutputStream(filename);
-}
-if (docencoding == null) {
 return new BufferedWriter(new OutputStreamWriter(fos));
 } else {
-return new BufferedWriter(new OutputStreamWriter(fos, docencoding));
+return new BufferedWriter(new OutputStreamWriter(fos, configuration.docencoding));
 }
 }
 /**
 * Given an annotation, return true if it should be documented and false

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java

src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java