--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java Wed Nov 21 22:33:33 2018 -0800
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java Wed Nov 21 22:34:01 2018 -0800
@@ -137,17 +137,13 @@
}
}
- boolean notFound(Archive m) {
- return m == NOT_FOUND || m == REMOVED_JDK_INTERNALS;
- }
-
private Module toNormalModule(Module module, Set<Archive> requiresTransitive)
throws IOException
{
// done analysis
module.close();
- if (analyzer.requires(module).anyMatch(this::notFound)) {
+ if (analyzer.requires(module).anyMatch(Analyzer::notFound)) {
// missing dependencies
return null;
}
@@ -182,9 +178,9 @@
void visitMissingDeps(Analyzer.Visitor visitor) {
automaticModules().stream()
- .filter(m -> analyzer.requires(m).anyMatch(this::notFound))
+ .filter(m -> analyzer.requires(m).anyMatch(Analyzer::notFound))
.forEach(m -> {
- analyzer.visitDependences(m, visitor, Analyzer.Type.VERBOSE);
+ analyzer.visitDependences(m, visitor, Analyzer.Type.VERBOSE, Analyzer::notFound);
});
}