jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java

-:92ab09ed59fd
+:babf86a1ac92
 import java.nio.file.FileSystems;
 import java.nio.file.FileVisitOption;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.Attributes;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 if (!pathIter.hasNext())
 throw new IllegalArgumentException("empty path for directory");
 Path path = pathIter.next();
 if (pathIter.hasNext())
 throw new IllegalArgumentException("path too long for directory");
-if (!path.exists())
+if (!isDirectory(path))
-throw new FileNotFoundException(path + ": does not exist");
-else if (!isDirectory(path))
 throw new IOException(path + ": not a directory");
 }
 private void setDefaultForLocation(Location locn) {
 Collection<File> files = null;
 }
 private void list(Path path, String packageName, final Set<Kind> kinds,
 boolean recurse, final ListBuffer<JavaFileObject> results)
 throws IOException {
-if (!path.exists())
+if (!Files.exists(path))
 return;
 final Path pathDir;
 if (isDirectory(path))
 pathDir = path;
 pathDir = fs.getRootDirectories().iterator().next();
 }
 String sep = path.getFileSystem().getSeparator();
 Path packageDir = packageName.isEmpty() ? pathDir
 : pathDir.resolve(packageName.replace(".", sep));
-if (!packageDir.exists())
+if (!Files.exists(packageDir))
 return;
 /* Alternate impl of list, superceded by use of Files.walkFileTree */
 //        Deque<Path> queue = new LinkedList<Path>();
 //        queue.add(packageDir);
 //        Path dir;
 //        while ((dir = queue.poll()) != null) {
 //            DirectoryStream<Path> ds = dir.newDirectoryStream();
 //            try {
 //                for (Path p: ds) {
-//                    String name = p.getName().toString();
+//                    String name = p.getFileName().toString();
 //                    if (isDirectory(p)) {
 //                        if (recurse && SourceVersion.isIdentifier(name)) {
 //                            queue.add(p);
 //                        }
 //                    } else {
 Set<FileVisitOption> opts = EnumSet.of(FOLLOW_LINKS);
 Files.walkFileTree(packageDir, opts, maxDepth,
 new SimpleFileVisitor<Path>() {
 @Override
 public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
-Path name = dir.getName();
+Path name = dir.getFileName();
 if (name == null || SourceVersion.isIdentifier(name.toString())) // JSR 292?
 return FileVisitResult.CONTINUE;
 else
 return FileVisitResult.SKIP_SUBTREE;
 }
 @Override
 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-if (attrs.isRegularFile() && kinds.contains(getKind(file.getName().toString()))) {
+if (attrs.isRegularFile() && kinds.contains(getKind(file.getFileName().toString()))) {
 JavaFileObject fe =
 PathFileObject.createDirectoryPathFileObject(
 JavacPathFileManager.this, file, pathDir);
 results.append(fe);
 }
 private JavaFileObject getFileForInput(Location location, String relativePath)
 throws IOException {
 for (Path p: getLocation(location)) {
 if (isDirectory(p)) {
 Path f = resolve(p, relativePath);
-if (f.exists())
+if (Files.exists(f))
 return PathFileObject.createDirectoryPathFileObject(this, f, p);
 } else {
 FileSystem fs = getFileSystem(p);
 if (fs != null) {
 Path file = getPath(fs, relativePath);
-if (file.exists())
+if (Files.exists(file))
 return PathFileObject.createJarPathFileObject(this, file);
 }
 }
 }
 return null;
 }
 private FileSystem getFileSystem(Path p) throws IOException {
 FileSystem fs = fileSystems.get(p);
 if (fs == null) {
-fs = FileSystems.newFileSystem(p, Collections.<String,Void>emptyMap(), null);
+fs = FileSystems.newFileSystem(p, null);
 fileSystems.put(p, fs);
 }
 return fs;
 }
 int lastSep = relativePath.lastIndexOf("/");
 return relativePath.substring(lastSep + 1); // safe if "/" not found
 }
 private static boolean isDirectory(Path path) throws IOException {
-BasicFileAttributes attrs = Attributes.readBasicFileAttributes(path);
+BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class);
 return attrs.isDirectory();
 }
 private static Path getPath(FileSystem fs, String relativePath) {
 return fs.getPath(relativePath.replace("/", fs.getSeparator()));

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

comparison: src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java

src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java