--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RelativeFileSet.java 2019-11-18 20:58:28.841807400 -0500 +++ /dev/null 2019-11-18 20:58:30.000000000 -0500 @@ -1,117 +0,0 @@ -/* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package jdk.jpackage.internal; - -import java.io.File; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * RelativeFileSet - * - * A class encapsulating a directory and a set of files within it. - */ -class RelativeFileSet { - - private File basedir; - private Set files = new LinkedHashSet<>(); - - RelativeFileSet(RelativeFileSet copy) { - basedir = copy.basedir; - files = new LinkedHashSet<>(copy.files); - } - - RelativeFileSet(File base, Collection files) { - basedir = base; - String baseAbsolute = basedir.getAbsolutePath(); - for (File f: files) { - String absolute = f.getAbsolutePath(); - if (!absolute.startsWith(baseAbsolute)) { - throw new RuntimeException("File " + f.getAbsolutePath() + - " does not belong to " + baseAbsolute); - } - if (!absolute.equals(baseAbsolute)) { - // possible in jpackage case - this.files.add(absolute.substring(baseAbsolute.length()+1)); - } - } - } - - void upshift() { - String root = basedir.getName(); - basedir = basedir.getParentFile(); - Set newFiles = new LinkedHashSet<>(); - for (String s : files) { - newFiles.add(root + File.separator + s); - } - files = newFiles; - } - - RelativeFileSet(File base, Set files) { - this(base, (Collection) 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; - } - - Set getIncludedFiles() { - return files; - } - - @Override - public String toString() { - if (files.size() == 1) { - return "" + basedir + File.pathSeparator + files; - } - return "RelativeFileSet {basedir:" + basedir - + ", files: {" + files + "}"; - } - -} --- /dev/null 2019-11-18 20:58:30.000000000 -0500 +++ new/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RelativeFileSet.java 2019-11-18 20:58:25.298532600 -0500 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.incubator.jpackage.internal; + +import java.io.File; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * RelativeFileSet + * + * A class encapsulating a directory and a set of files within it. + */ +class RelativeFileSet { + + private File basedir; + private Set files = new LinkedHashSet<>(); + + RelativeFileSet(File base, Collection files) { + basedir = base; + String baseAbsolute = basedir.getAbsolutePath(); + for (File f: files) { + String absolute = f.getAbsolutePath(); + if (!absolute.startsWith(baseAbsolute)) { + throw new RuntimeException("File " + f.getAbsolutePath() + + " does not belong to " + baseAbsolute); + } + if (!absolute.equals(baseAbsolute)) { + // possible in jpackage case + this.files.add(absolute.substring(baseAbsolute.length()+1)); + } + } + } + + RelativeFileSet(File base, Set files) { + this(base, (Collection) files); + } + + File getBaseDirectory() { + return basedir; + } + + Set getIncludedFiles() { + return files; + } + + @Override + public String toString() { + if (files.size() == 1) { + return "" + basedir + File.pathSeparator + files; + } + return "RelativeFileSet {basedir:" + basedir + + ", files: {" + files + "}"; + } + +}