--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ModuleManager.java 2019-11-18 21:46:44.779349900 -0500 +++ /dev/null 2019-11-18 21:46:46.000000000 -0500 @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2016, 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.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.List; - -final class ModuleManager { - private final List folders = new ArrayList(); - - enum SearchType {UnnamedJar, ModularJar, Jmod, ExplodedModule} - - ModuleManager(String folders) { - super(); - String lfolders = folders.replaceAll("^\"|\"$", ""); - List paths = new ArrayList(); - - for (String folder : - Arrays.asList(lfolders.split(File.pathSeparator))) { - File file = new File(folder); - paths.add(file.toPath()); - } - - initialize(paths); - } - - ModuleManager(List Paths) { - super(); - initialize(Paths); - } - - private void initialize(List Paths) { - for (Path path : Paths) { - folders.add(path.toString().replaceAll("^\"|\"$", "")); - } - } - - List getModules() { - return getModules(EnumSet.of(SearchType.UnnamedJar, - SearchType.ModularJar, SearchType.Jmod, - SearchType.ExplodedModule)); - } - - List getModules(EnumSet Search) { - List result = new ArrayList(); - - for (String folder : folders) { - result.addAll(getAllModulesInDirectory(folder, Search)); - } - - return result; - } - - private static List getAllModulesInDirectory(String folder, - EnumSet Search) { - List result = new ArrayList(); - File lfolder = new File(folder); - File[] files = { lfolder }; - if (lfolder.isDirectory()) { - files = lfolder.listFiles(); - } - - if (files != null) { - for (File file : files) { - ModFile modFile = new ModFile(file); - - switch (modFile.getModType()) { - case Unknown: - break; - case UnnamedJar: - if (Search.contains(SearchType.UnnamedJar)) { - result.add(modFile); - } - break; - case ModularJar: - if (Search.contains(SearchType.ModularJar)) { - result.add(modFile); - } - break; - case Jmod: - if (Search.contains(SearchType.Jmod)) { - result.add(modFile); - } - break; - case ExplodedModule: - if (Search.contains(SearchType.ExplodedModule)) { - result.add(modFile); - } - break; - } - } - } - return result; - } -}