extract ProjectUtilCore.isUseExternalStorage()

This commit is contained in:
Vladimir Krivosheev
2018-01-22 14:35:52 +01:00
parent ce90003f9b
commit 7ee7ea94e8
3 changed files with 8 additions and 5 deletions
@@ -2,6 +2,7 @@
package com.intellij.openapi.externalSystem.service.project.manage;
import com.intellij.openapi.externalSystem.view.ExternalProjectsViewState;
import com.intellij.openapi.project.ProjectUtilCore;
import com.intellij.util.containers.FactoryMap;
import com.intellij.util.xmlb.annotations.Attribute;
import com.intellij.util.xmlb.annotations.MapAnnotation;
@@ -30,7 +31,7 @@ public class ExternalProjectsState {
}
@Attribute
public boolean storeExternally;
public boolean storeExternally = ProjectUtilCore.isUseExternalStorage();
@Tag("state")
public static class State {
@@ -53,5 +53,7 @@ val Project.isExternalStorageEnabled: Boolean
get() {
val key = "com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManager"
val manager = picoContainer.getComponentInstance(key) as? ProjectFileStoreOptionManager ?: return false
return manager.isStoredExternally || Registry.`is`("store.imported.project.elements.separately", ApplicationManager.getApplication().isUnitTestMode)
}
return manager.isStoredExternally || isUseExternalStorage()
}
fun isUseExternalStorage() = (ApplicationManager.getApplication()?.isUnitTestMode ?: false) || Registry.`is`("store.imported.project.elements.separately")
@@ -3,6 +3,7 @@ package org.jetbrains.plugins.gradle.settings;
import com.intellij.openapi.externalSystem.service.execution.ExternalSystemJdkUtil;
import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings;
import com.intellij.openapi.project.ProjectUtilCore;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xmlb.annotations.*;
@@ -17,7 +18,6 @@ import java.util.List;
* @since 4/24/13 11:57 AM
*/
public class GradleProjectSettings extends ExternalProjectSettings {
@Nullable private String myGradleHome;
@Nullable private String myGradleJvm = ExternalSystemJdkUtil.USE_PROJECT_JDK;
@Nullable private DistributionType distributionType;
@@ -25,7 +25,7 @@ public class GradleProjectSettings extends ExternalProjectSettings {
private boolean resolveModulePerSourceSet = true;
@Nullable private CompositeBuild myCompositeBuild;
private boolean storeProjectFilesExternally = false;
private boolean storeProjectFilesExternally = ProjectUtilCore.isUseExternalStorage();
@Nullable
public String getGradleHome() {