--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RelativeFileSet.java Thu Jun 06 19:31:11 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RelativeFileSet.java Thu Jun 06 19:51:17 2019 -0400
@@ -40,11 +40,6 @@
private File basedir;
private Set<String> files = new LinkedHashSet<>();
- RelativeFileSet(RelativeFileSet copy) {
- basedir = copy.basedir;
- files = new LinkedHashSet<>(copy.files);
- }
-
RelativeFileSet(File base, Collection<File> files) {
basedir = base;
String baseAbsolute = basedir.getAbsolutePath();
@@ -61,42 +56,10 @@
}
}
- void upshift() {
- String root = basedir.getName();
- basedir = basedir.getParentFile();
- Set<String> newFiles = new LinkedHashSet<>();
- for (String s : files) {
- newFiles.add(root + File.separator + s);
- }
- files = newFiles;
- }
-
RelativeFileSet(File base, Set<File> files) {
this(base, (Collection<File>) files);
}
- boolean contains(String[] requiredFiles) {
- boolean result = true;
-
- for(String fname: requiredFiles) {
- if (!files.contains(fname)) {
- Log.debug(" RelativeFileSet does not contain [" + fname + "]");
- result = false;
- }
- }
-
- return result;
- }
-
- boolean contains(String requiredFile) {
- if (files.contains(requiredFile)) {
- return true;
- } else {
- Log.debug("RelativeFileSet does not contain [" +requiredFile+ "]");
- return false;
- }
- }
-
File getBaseDirectory() {
return basedir;
}