From 828e53ce82b9e43d7a2f8598d958e3a19473513d Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 1 Mar 2016 17:21:31 +0100 Subject: [PATCH] reuse Gradle external system ID --- .../jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java | 4 ++-- .../org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java index 11358b983f3..8462b3f0a32 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.idea; import com.intellij.facet.Facet; import com.intellij.facet.FacetManager; -import com.intellij.openapi.externalSystem.model.ProjectSystemId; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.configuration.KotlinModuleTypeManager; +import org.jetbrains.kotlin.idea.framework.KotlinLibraryUtilKt; public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager { @Override @@ -41,6 +41,6 @@ public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager { @Override public boolean isGradleModule(@NotNull Module module) { - return ExternalSystemApiUtil.isExternalSystemAwareModule(new ProjectSystemId("GRADLE"), module); + return ExternalSystemApiUtil.isExternalSystemAwareModule(KotlinLibraryUtilKt.getGRADLE_SYSTEM_ID(), module); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt index 9b6273803e8..bfa103b0924 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt @@ -37,7 +37,8 @@ fun > getLibraryProperties(provider: LibraryPres } private val MAVEN_SYSTEM_ID = ProjectSystemId("MAVEN") -private val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE") +val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE") + private fun isExternalLibrary(library: Library): Boolean { return ExternalSystemApiUtil.isExternalSystemLibrary(library, ProjectSystemId.IDE) || ExternalSystemApiUtil.isExternalSystemLibrary(library, GRADLE_SYSTEM_ID) ||