From 0f7d8bc2ac6c4791a8d97198192f522f43a38f8e Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 5 Aug 2014 14:56:41 +0400 Subject: [PATCH] Gradle: resources processing, fix OrderEnumerationHandler for OrderRootType.CLASSES --- .../gradle/execution/GradleOrderEnumeratorHandler.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java index 0dc670dbefa8..113e49a61a25 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java @@ -90,25 +90,23 @@ public class GradleOrderEnumeratorHandler extends OrderEnumerationHandler { if (externalProject == null) return false; if (includeProduction) { - addSourceRoots(externalProject.getSourceSets().get("main"), ExternalSystemSourceType.RESOURCE, result); + addOutputRoots(externalProject.getSourceSets().get("main"), ExternalSystemSourceType.RESOURCE, result); } if (includeTests) { - addSourceRoots(externalProject.getSourceSets().get("test"), ExternalSystemSourceType.TEST_RESOURCE, result); + addOutputRoots(externalProject.getSourceSets().get("test"), ExternalSystemSourceType.TEST_RESOURCE, result); } return true; } - private static void addSourceRoots(@Nullable ExternalSourceSet externalSourceSet, + private static void addOutputRoots(@Nullable ExternalSourceSet externalSourceSet, @NotNull ExternalSystemSourceType sourceType, @NotNull Collection result) { if (externalSourceSet == null) return; final ExternalSourceDirectorySet directorySet = externalSourceSet.getSources().get(sourceType); if (directorySet == null) return; - for (File file : directorySet.getSrcDirs()) { - result.add(VfsUtilCore.pathToUrl(file.getAbsolutePath())); - } + result.add(VfsUtilCore.pathToUrl(directorySet.getOutputDir().getAbsolutePath())); } }