From 30ebcf7d2b6adee2385ab7628b2a08bbea42110b Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 9 Mar 2017 14:54:18 +0300 Subject: [PATCH] external system: cleanup, do not use module options explicitly --- .../settings/AbstractExternalSystemLocalSettings.java | 8 ++------ .../execution/ExternalSystemBeforeRunTaskProvider.java | 6 +++--- .../jetbrains/plugins/gradle/config/GradleScriptType.java | 7 +++---- .../runner/AllInPackageGradleConfigurationProducer.java | 3 +-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java index 7453a51674d4..b975789e5064 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java @@ -22,7 +22,6 @@ import com.intellij.openapi.externalSystem.model.execution.ExternalTaskPojo; import com.intellij.openapi.externalSystem.model.project.ExternalProjectBuildClasspathPojo; import com.intellij.openapi.externalSystem.model.project.ExternalProjectPojo; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; -import com.intellij.openapi.externalSystem.util.ExternalSystemConstants; import com.intellij.openapi.externalSystem.view.ExternalProjectsViewState; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -252,11 +251,8 @@ public abstract class AbstractExternalSystemLocalSettings { pathsToForget.remove(projectSettings.getExternalProjectPath()); } for (Module module : ModuleManager.getInstance(myProject).getModules()) { - String id = module.getOptionValue(ExternalSystemConstants.EXTERNAL_SYSTEM_ID_KEY); - if (!myExternalSystemId.toString().equals(id)) { - continue; - } - pathsToForget.remove(module.getOptionValue(ExternalSystemConstants.LINKED_PROJECT_PATH_KEY)); + if (!ExternalSystemApiUtil.isExternalSystemAwareModule(myExternalSystemId, module)) continue; + pathsToForget.remove(ExternalSystemApiUtil.getExternalProjectPath(module)); } if (!pathsToForget.isEmpty()) { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTaskProvider.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTaskProvider.java index db53f3e76499..4357a52f8250 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTaskProvider.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTaskProvider.java @@ -26,8 +26,8 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.externalSystem.model.ProjectSystemId; import com.intellij.openapi.externalSystem.model.execution.ExternalSystemTaskExecutionSettings; import com.intellij.openapi.externalSystem.model.execution.ExternalTaskPojo; +import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.externalSystem.util.ExternalSystemBundle; -import com.intellij.openapi.externalSystem.util.ExternalSystemConstants; import com.intellij.openapi.externalSystem.util.ExternalSystemUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -138,9 +138,9 @@ public abstract class ExternalSystemBeforeRunTaskProvider extends BeforeRunTaskP String desc = StringUtil.join(task.getTaskExecutionSettings().getTaskNames(), " "); for (Module module : ModuleManager.getInstance(myProject).getModules()) { - if (!mySystemId.toString().equals(module.getOptionValue(ExternalSystemConstants.EXTERNAL_SYSTEM_ID_KEY))) continue; + if (!ExternalSystemApiUtil.isExternalSystemAwareModule(mySystemId, module)) continue; - if (StringUtil.equals(externalProjectPath, module.getOptionValue(ExternalSystemConstants.LINKED_PROJECT_PATH_KEY))) { + if (StringUtil.equals(externalProjectPath, ExternalSystemApiUtil.getExternalProjectPath(module))) { desc = module.getName() + ": " + desc; break; } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java index a4393c8dec05..09f7e7dd0bfe 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java @@ -23,6 +23,7 @@ import com.intellij.execution.RunManagerEx; import com.intellij.execution.configurations.JavaParameters; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.externalSystem.psi.search.ExternalModuleBuildGlobalSearchScope; +import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.externalSystem.util.ExternalSystemConstants; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; @@ -317,9 +318,7 @@ public class GradleScriptType extends GroovyRunnableScriptType { public GlobalSearchScope patchResolveScopeInner(@Nullable Module module, @NotNull GlobalSearchScope baseScope) { if (module == null) return GlobalSearchScope.EMPTY_SCOPE; - final String externalSystemId = module.getOptionValue(ExternalSystemConstants.EXTERNAL_SYSTEM_ID_KEY); - if (!GradleConstants.SYSTEM_ID.toString().equals(externalSystemId)) return baseScope; - + if (!ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module)) return baseScope; GlobalSearchScope result = GlobalSearchScope.EMPTY_SCOPE; final Project project = module.getProject(); for (OrderEntry entry : ModuleRootManager.getInstance(module).getOrderEntries()) { @@ -329,7 +328,7 @@ public class GradleScriptType extends GroovyRunnableScriptType { } } - String modulePath = module.getOptionValue(ExternalSystemConstants.LINKED_PROJECT_PATH_KEY); + String modulePath = ExternalSystemApiUtil.getExternalProjectPath(module); if (modulePath == null) return result; final Collection files = GradleBuildClasspathManager.getInstance(project).getModuleClasspathEntries(modulePath); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/AllInPackageGradleConfigurationProducer.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/AllInPackageGradleConfigurationProducer.java index c1ed0c559a7b..a795aee93ac9 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/AllInPackageGradleConfigurationProducer.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/AllInPackageGradleConfigurationProducer.java @@ -20,7 +20,6 @@ import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.junit.JavaRuntimeConfigurationProducerBase; import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; -import com.intellij.openapi.externalSystem.util.ExternalSystemConstants; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; @@ -81,7 +80,7 @@ public class AllInPackageGradleConfigurationProducer extends GradleTestRunConfig if (context.getModule() == null) return false; if (!StringUtil.equals( - context.getModule().getOptionValue(ExternalSystemConstants.LINKED_PROJECT_PATH_KEY), + ExternalSystemApiUtil.getExternalProjectPath(context.getModule()), configuration.getSettings().getExternalProjectPath())) { return false; }