From f72113823fcd41b56fd8ef24dd71e99a5e2bf0b2 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 6 Dec 2011 14:29:49 +0400 Subject: [PATCH] filter facet detectors by module type in new project wizard --- .../importProject/FrameworkDetectionInWizardContext.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/FrameworkDetectionInWizardContext.java b/java/idea-ui/src/com/intellij/ide/util/importProject/FrameworkDetectionInWizardContext.java index a92af56900da..d8c14a28050e 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/FrameworkDetectionInWizardContext.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/FrameworkDetectionInWizardContext.java @@ -17,6 +17,7 @@ package com.intellij.ide.util.importProject; import com.intellij.facet.Facet; import com.intellij.facet.FacetConfiguration; +import com.intellij.facet.FacetType; import com.intellij.framework.detection.DetectedFrameworkDescription; import com.intellij.framework.detection.FacetBasedFrameworkDetector; import com.intellij.framework.detection.impl.FrameworkDetectionContextBase; @@ -54,8 +55,14 @@ public abstract class FrameworkDetectionInWizardContext extends FrameworkDetecti } final List result = new ArrayList(); + final FacetType facetType = detector.getFacetType(); for (ModuleDescriptor module : filesByModule.keySet()) { - final List>> pairs = detector.createConfigurations(filesByModule.get(module), Collections.emptyList()); + if (!facetType.isSuitableModuleType(module.getModuleType())) { + continue; + } + + final List>> pairs = + detector.createConfigurations(filesByModule.get(module), Collections.emptyList()); for (Pair> pair : pairs) { result.add(new FacetBasedDetectedFrameworkDescriptionInWizard(module, detector, pair.getFirst(), new HashSet(pair.getSecond())));