Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: e7d71688c83961922b6089e719226fc631d65e9a
This commit is contained in:
commit
c1fb07bc57
1 changed files with 20 additions and 21 deletions
|
@ -21,10 +21,6 @@ package com.raytheon.uf.common.util.file;
|
|||
|
||||
import java.io.File;
|
||||
import java.io.FilenameFilter;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.DirectoryStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
/**
|
||||
* Consolidates common filename filters.
|
||||
|
@ -179,23 +175,26 @@ public final class FilenameFilters {
|
|||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Accepts Path directories.
|
||||
*/
|
||||
public static final DirectoryStream.Filter<Path> ACCEPT_PATH_DIRECTORIES = new DirectoryStream.Filter<Path>() {
|
||||
public boolean accept(Path path) throws IOException {
|
||||
return (Files.isDirectory(path));
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Accepts Path files.
|
||||
*/
|
||||
public static final DirectoryStream.Filter<Path> ACCEPT_PATH_FILES = new DirectoryStream.Filter<Path>() {
|
||||
public boolean accept(Path path) throws IOException {
|
||||
return (Files.isRegularFile(path));
|
||||
}
|
||||
};
|
||||
// TODO Code that can be uncommented after a transition to Java 1.7
|
||||
// /**
|
||||
// * Accepts Path directories.
|
||||
// */
|
||||
// public static final DirectoryStream.Filter<Path> ACCEPT_PATH_DIRECTORIES
|
||||
// = new DirectoryStream.Filter<Path>() {
|
||||
// public boolean accept(Path path) throws IOException {
|
||||
// return (Files.isDirectory(path));
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// /**
|
||||
// * Accepts Path files.
|
||||
// */
|
||||
// public static final DirectoryStream.Filter<Path> ACCEPT_PATH_FILES = new
|
||||
// DirectoryStream.Filter<Path>() {
|
||||
// public boolean accept(Path path) throws IOException {
|
||||
// return (Files.isRegularFile(path));
|
||||
// }
|
||||
// };
|
||||
|
||||
/**
|
||||
* Returns a {@link FilenameFilter} that matches the specified file
|
||||
|
|
Loading…
Add table
Reference in a new issue