This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push: new 6e4a507 [NETBEANS-6068] Add back SOURCES_TYPE_JAVA into GroovySources::getGroovySourceGroups new 2b43656 Merge pull request #3292 from neilcsmith-net/netbeans-6068 6e4a507 is described below commit 6e4a507a7678f23b7f3a10f4dfb81ccab334e935 Author: Neil C Smith <neilcsm...@apache.org> AuthorDate: Mon Nov 1 16:03:11 2021 +0000 [NETBEANS-6068] Add back SOURCES_TYPE_JAVA into GroovySources::getGroovySourceGroups This change added as part of [NETBEANS-4975] seems to be a cause of some issues reported in [NETBEANS-6068]. --- .../src/org/netbeans/modules/groovy/support/api/GroovySources.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java index c25953d..dee1865 100644 --- a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java +++ b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/api/GroovySources.java @@ -22,6 +22,7 @@ package org.netbeans.modules.groovy.support.api; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; @@ -60,6 +61,7 @@ public class GroovySources { public static List<SourceGroup> getGroovySourceGroups(Sources sources) { List<SourceGroup> result = new ArrayList<SourceGroup>(); result.addAll(Arrays.asList(sources.getSourceGroups(GroovySources.SOURCES_TYPE_GROOVY))); + result.addAll(Arrays.asList(sources.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA))); result.addAll(Arrays.asList(sources.getSourceGroups(GroovySources.SOURCES_TYPE_GRAILS))); result.addAll(Arrays.asList(sources.getSourceGroups(GroovySources.SOURCES_TYPE_GRAILS_UNKNOWN))); return result; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists