From 02083c5ad3ac7e56d131e85dec35e66cc73a7e43 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 14 Dec 2011 15:24:14 +0400 Subject: [PATCH] java run configuration: search main class in runtime dependencies (IDEA-78837) --- .../openapi/src/com/intellij/execution/JavaExecutionUtil.java | 2 +- .../execution/configurations/JavaRunConfigurationModule.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java index da7e9477770b..3239824d4ada 100644 --- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java +++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java @@ -135,7 +135,7 @@ public class JavaExecutionUtil { @Nullable public static PsiClass findMainClass(final Module module, final String mainClassName) { - return findMainClass(module.getProject(), mainClassName, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module)); + return findMainClass(module.getProject(), mainClassName, module.getModuleRuntimeScope(true)); } @Nullable diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java index a8cc13d35cc7..27a27adf3ae8 100644 --- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java +++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java @@ -53,8 +53,7 @@ public class JavaRunConfigurationModule extends RunConfigurationModule { final Module module = getModule(); final GlobalSearchScope scope; if (module != null) { - scope = myClassesInLibraries ? GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module) - : GlobalSearchScope.moduleWithDependenciesScope(module); + scope = myClassesInLibraries ? module.getModuleRuntimeScope(true) : GlobalSearchScope.moduleWithDependenciesScope(module); } else { scope = myClassesInLibraries ? GlobalSearchScope.allScope(getProject()) : GlobalSearchScope.projectScope(getProject());