IDEA-144877 Import Project From Gradle - .ipr file based not respected

This commit is contained in:
Vladislav.Soroka
2017-04-26 15:52:10 +03:00
parent 116768c625
commit 298707e887
@@ -82,18 +82,23 @@ public class GradleProjectOpenProcessor extends ProjectOpenProcessorBase<GradleP
getBuilder().getControl(null).setLinkedProjectPath(pathToUse);
final boolean result;
WizardContext dialogWizardContext = null;
if (ApplicationManager.getApplication().isHeadlessEnvironment()) {
result = setupGradleProjectSettingsInHeadlessMode(projectImportProvider, wizardContext);
}
else {
AddModuleWizard dialog = new AddModuleWizard(null, file.getPath(), projectImportProvider);
dialog.getWizardContext().setProjectBuilder(getBuilder());
dialogWizardContext = dialog.getWizardContext();
dialogWizardContext.setProjectBuilder(getBuilder());
dialog.navigateToStep(step -> step instanceof SelectExternalProjectStep);
result = dialog.showAndGet();
}
if (result && getBuilder().getExternalProjectNode() != null) {
wizardContext.setProjectName(getBuilder().getExternalProjectNode().getData().getInternalName());
}
if(result && dialogWizardContext != null) {
wizardContext.setProjectStorageFormat(dialogWizardContext.getProjectStorageFormat());
}
return result;
}