From 69421b9e074e5b02679a4c132f4f66a8dfdbeb1c Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 23 Mar 2012 18:22:54 +0400 Subject: [PATCH] IDEA-79927: "Create project from existing sources" doesn't work with HTML/JS only projects (cherry picked from commit 9f17876) --- .../importSources/ProjectFromSourcesBuilder.java | 2 ++ .../impl/ProjectFromSourcesBuilderImpl.java | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/ProjectFromSourcesBuilder.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/ProjectFromSourcesBuilder.java index 568311359726..fc28f8f6bf6d 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/ProjectFromSourcesBuilder.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/ProjectFromSourcesBuilder.java @@ -42,4 +42,6 @@ public interface ProjectFromSourcesBuilder { @NotNull WizardContext getContext(); + + boolean hasRootsFromOtherDetectors(ProjectStructureDetector thisDetector); } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java index 1ed00b0c054a..2980c4e25b09 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java @@ -32,6 +32,7 @@ import com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetecto import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.*; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; @@ -262,6 +263,15 @@ public class ProjectFromSourcesBuilderImpl extends ProjectBuilder implements Pro myUpdaters.add(updater); } + public boolean hasRootsFromOtherDetectors(ProjectStructureDetector thisDetector) { + for (ProjectStructureDetector projectStructureDetector : Extensions.getExtensions(ProjectStructureDetector.EP_NAME)) { + if (projectStructureDetector != thisDetector && !getProjectRoots(projectStructureDetector).isEmpty()) { + return true; + } + } + return false; + } + @NotNull private static Module createModule(ProjectDescriptor projectDescriptor, final ModuleDescriptor descriptor, final Map projectLibs, final ModifiableModuleModel moduleModel)