From 7198085cd4cc7174cf23e522ee66b36c165c9f0e Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 24 Oct 2012 15:00:16 +0200 Subject: [PATCH] disable all cucumber features producer when no cucumber in classpath --- .../execution/junit2/info/LocationUtil.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit2/info/LocationUtil.java b/java/execution/impl/src/com/intellij/execution/junit2/info/LocationUtil.java index 338701e3af6e..0cef2a7bbb8c 100644 --- a/java/execution/impl/src/com/intellij/execution/junit2/info/LocationUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit2/info/LocationUtil.java @@ -17,7 +17,7 @@ package com.intellij.execution.junit2.info; import com.intellij.execution.Location; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiPackage; @@ -29,7 +29,13 @@ import org.jetbrains.annotations.NotNull; * Date: 2/20/12 */ public class LocationUtil { - public static boolean isJarAttached(@NotNull Location location, final PsiPackage aPackage, final String fqn) { + public static boolean isJarAttached(@NotNull Location location, @NotNull final PsiPackage aPackage, final String fqn) { + return isJarAttached(location, fqn, aPackage.getDirectories()); + } + + public static boolean isJarAttached(@NotNull Location location, + final String fqn, + final PsiDirectory[] directories) { final JavaPsiFacade facade = JavaPsiFacade.getInstance(location.getProject()); boolean testngJarFound = false; final Module locationModule = location.getModule(); @@ -37,8 +43,8 @@ public class LocationUtil { testngJarFound = facade.findClass(fqn, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(locationModule, true)) != null; } else { - for (PsiDirectory directory : aPackage.getDirectories()) { - final Module module = ModuleUtil.findModuleForFile(directory.getVirtualFile(), location.getProject()); + for (PsiDirectory directory : directories) { + final Module module = ModuleUtilCore.findModuleForFile(directory.getVirtualFile(), location.getProject()); if (module != null) { if (facade.findClass(fqn, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true)) != null) { testngJarFound = true;