From 1c79f0f7aaaf220043f9273ffe620a0c6331c693 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach <1842422+jtulach@users.noreply.github.com> Date: Wed, 21 Sep 2022 17:32:46 +0200 Subject: [PATCH] Recognize generatedDependencies tag (#4666) Co-authored-by: Jaroslav Tulach --- .../org/netbeans/modules/java/mx/project/CoreSuite.java | 7 +++++++ .../org/netbeans/modules/java/mx/project/SuiteSources.java | 5 ++++- .../modules/java/mx/project/suitepy/MxProject.java | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java index d2270096c369..28e1b85043a8 100644 --- a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java +++ b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java @@ -160,6 +160,13 @@ public List dependencies() { return dependencies; } + @Override + public List generatedDependencies() { + return Collections.emptyList(); + } + + + @Override public List annotationProcessors() { return annotationProcessors; diff --git a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java index 4f9347e27c6c..096d2bf2b1ff 100644 --- a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java +++ b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java @@ -771,7 +771,10 @@ ClassPath getCP() { @Override public Collection depNames() { - return mxPrj.dependencies(); + List both = new ArrayList<>(); + both.addAll(mxPrj.dependencies()); + both.addAll(mxPrj.generatedDependencies()); + return both; } @Override diff --git a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java index f9268dcd6446..6da50ae4af14 100644 --- a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java +++ b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java @@ -29,6 +29,8 @@ public interface MxProject { List dependencies(); + List generatedDependencies(); + List annotationProcessors(); String javaCompliance();