< prev index next >

src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java

Print this page

        

*** 116,126 **** if (allDefaultModules) { mods.addAll(systemModulePath.defaultSystemRoots()); } this.configuration = Configuration.empty() ! .resolveRequires(finder, ModuleFinder.of(), mods); this.configuration.modules().stream() .map(ResolvedModule::reference) .forEach(this::addModuleReference); --- 116,126 ---- if (allDefaultModules) { mods.addAll(systemModulePath.defaultSystemRoots()); } this.configuration = Configuration.empty() ! .resolve(finder, ModuleFinder.of(), mods); this.configuration.modules().stream() .map(ResolvedModule::reference) .forEach(this::addModuleReference);
*** 270,280 **** public Stream<Module> resolve(Set<String> roots) { if (roots.isEmpty()) { return nameToModule.values().stream(); } else { return Configuration.empty() ! .resolveRequires(finder, ModuleFinder.of(), roots) .modules().stream() .map(ResolvedModule::name) .map(nameToModule::get); } } --- 270,280 ---- public Stream<Module> resolve(Set<String> roots) { if (roots.isEmpty()) { return nameToModule.values().stream(); } else { return Configuration.empty() ! .resolve(finder, ModuleFinder.of(), roots) .modules().stream() .map(ResolvedModule::name) .map(nameToModule::get); } }
*** 420,441 **** throw new UncheckedIOException(e); } } private ModuleDescriptor dropHashes(ModuleDescriptor md) { ! ModuleDescriptor.Builder builder = ModuleDescriptor.module(md.name()); md.requires().forEach(builder::requires); md.exports().forEach(builder::exports); md.opens().forEach(builder::opens); md.provides().stream().forEach(builder::provides); md.uses().stream().forEach(builder::uses); ! ! Set<String> concealed = new HashSet<>(md.packages()); ! md.exports().stream().map(Exports::source).forEach(concealed::remove); ! md.opens().stream().map(Opens::source).forEach(concealed::remove); ! concealed.forEach(builder::contains); ! return builder.build(); } @Override public Set<ModuleReference> findAll() { --- 420,436 ---- throw new UncheckedIOException(e); } } private ModuleDescriptor dropHashes(ModuleDescriptor md) { ! ModuleDescriptor.Builder builder = ModuleDescriptor.newModule(md.name()); md.requires().forEach(builder::requires); md.exports().forEach(builder::exports); md.opens().forEach(builder::opens); md.provides().stream().forEach(builder::provides); md.uses().stream().forEach(builder::uses); ! builder.packages(md.packages()); return builder.build(); } @Override public Set<ModuleReference> findAll() {
< prev index next >