commit 2c2f9eba1a96564eeb6280870ba743c73e259d51
author Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com> Tue Sep 19 14:48:46 2017 +0300
committer Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> Tue Sep 19 20:49:09 2017 +0300
tree 5f627abebf238690556e8edcbd51939e6fec04da
parent 683c9c63e202e05e0677b7b51e87bf0c0fa96161

Fix compilation GradleModuleBuilder

idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleModuleBuilder.java

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleModuleBuilder.java b/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleModuleBuilder.java
index 48be5be..9a32dee 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleModuleBuilder.java
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleModuleBuilder.java
@@ -28,13 +28,10 @@
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.StorageScheme;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.externalSystem.importing.ImportSpec;
-import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder;
 import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys;
 import com.intellij.openapi.externalSystem.model.project.ProjectData;
 import com.intellij.openapi.externalSystem.model.project.ProjectId;
 import com.intellij.openapi.externalSystem.service.execution.ProgressExecutionMode;
-import com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManagerImpl;
 import com.intellij.openapi.externalSystem.service.project.wizard.AbstractExternalModuleBuilder;
 import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep;
 import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemSettings;
@@ -252,12 +249,9 @@
           settings.linkProject(gradleProjectSettings);
         }
 
-        ImportSpec importSpec = new ImportSpecBuilder(project, GradleConstants.SYSTEM_ID)
-          .use(ProgressExecutionMode.IN_BACKGROUND_ASYNC)
-          .createDirectoriesForEmptyContentRoots()
-          .useDefaultCallback()
-          .build();
-        ExternalSystemUtil.refreshProject(rootProjectPath, importSpec);
+        ExternalSystemUtil.refreshProject(
+                project, GradleConstants.SYSTEM_ID, rootProjectPath, false,
+                ProgressExecutionMode.IN_BACKGROUND_ASYNC);
 
         final PsiFile psiFile;
         if (finalBuildScriptFile != null) {
@@ -477,15 +471,4 @@
   public static BuildScriptDataBuilder getBuildScriptData(@Nullable Module module) {
     return module == null ? null : module.getUserData(BUILD_SCRIPT_DATA);
   }
-
-  @Nullable
-  @Override
-  public Project createProject(String name, String path) {
-    Project project = super.createProject(name, path);
-    if (project != null) {
-      GradleProjectSettings settings = getExternalProjectSettings();
-      ExternalProjectsManagerImpl.getInstance(project).setStoreExternally(settings.isStoreProjectFilesExternally());
-    }
-    return project;
-  }
 }