This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit d37e82540c2e259822fd35004c9ef532e76fb13a Author: Jan Lahoda <[email protected]> AuthorDate: Sat Sep 22 07:01:05 2018 +0200 Limit directories that are scanned for module for the OpenJDK project --- .../modules/java/openjdk/project/ModuleDescription.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java index 2cb9b2c..c4b8011 100644 --- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java +++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ModuleDescription.java @@ -128,9 +128,11 @@ public class ModuleDescription { if (projectDirectory.getFileObject("../../src/java.base/share/classes/module-info.java") != null && projectDirectory.getFileObject("../../src/java.compiler/share/classes/module-info.java") != null) return Pair.of(projectDirectory.getFileObject("../.."), Pair.of(true, false)); - if (projectDirectory.getFileObject("../../../modules.xml") != null || projectDirectory.getFileObject("../../../jdk/src/java.base/share/classes/module-info.java") != null) + if (projectDirectory.getFileObject("../../../modules.xml") != null || + (projectDirectory.getFileObject("../../../jdk/src/java.base/share/classes/module-info.java") != null && projectDirectory.getFileObject("../../../langtools/src/java.compiler/share/classes/module-info.java") != null)) return Pair.of(projectDirectory.getFileObject("../../.."), Pair.of(false, false)); - if (projectDirectory.getFileObject("../../../../modules.xml") != null || projectDirectory.getFileObject("../../../../jdk/src/java.base/share/classes/module-info.java") != null) + if (projectDirectory.getFileObject("../../../../modules.xml") != null || + (projectDirectory.getFileObject("../../../../jdk/src/java.base/share/classes/module-info.java") != null && projectDirectory.getFileObject("../../../langtools/src/java.compiler/share/classes/module-info.java") != null)) return Pair.of(projectDirectory.getFileObject("../../../.."), Pair.of(false, false)); return null; @@ -235,6 +237,10 @@ public class ModuleDescription { continue; //do not look inside test folders } + if (current.getParent().getNameExt().equals("test") && current.getFileObject("TEST.ROOT") != null) { + continue; //do not look inside test folders + } + todo.addAll(Arrays.asList(current.getChildren())); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
