MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 09:19:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

create project from existing sources: show project jdk chooser when it is possible that non java modules would be selected (IDEA-14488)

Browse Source
This commit is contained in:
anna
2011-04-19 20:33:38 +02:00
parent ac17bb983d
commit bf2b7cc9df
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectFromSourcesBuilder.java
+20
View File
@@ -38,11 +38,13 @@ import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jetbrains.annotations.NotNull;
@@ -316,6 +318,24 @@ public class ProjectFromSourcesBuilder extends ProjectBuilder implements SourceP
@Override
public boolean isSuitableSdk(final Sdk sdk) {
final List<ModuleDescriptor> suggestedModules = myModuleInsight.getSuggestedModules();
if (suggestedModules != null) {
for (ModuleDescriptor moduleDescriptor : suggestedModules) {
try {
final File file = new File(moduleDescriptor.computeModuleFilePath());
if (file.exists()) {
final Element rootElement = JDOMUtil.loadDocument(file).getRootElement();
final String type = rootElement.getAttributeValue("type");
if (type != null) {
final ModuleType moduleType = ModuleTypeManager.getInstance().findByID(type);
if (moduleType != null && !moduleType.createModuleBuilder().isSuitableSdk(sdk)) return false;
}
}
}
catch (Exception ignore) {
}
}
}
return sdk.getSdkType() == JavaSdk.getInstance();
}
}
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java
+2 -1
View File
@@ -97,7 +97,8 @@ public class ProjectWizardStepFactoryImpl extends ProjectWizardStepFactory {
public ModuleWizardStep createProjectJdkStep(final WizardContext wizardContext) {
return new ProjectJdkStep(wizardContext){
public boolean isStepVisible() {
return AddModuleWizard.getNewProjectJdk(wizardContext) == null;
final Sdk newProjectJdk = AddModuleWizard.getNewProjectJdk(wizardContext);
return newProjectJdk == null || !wizardContext.getProjectBuilder().isSuitableSdk(newProjectJdk);
}
};
}