From c612903b6abc6e8a4355efd1f94fa648edaca5b4 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 27 Jun 2017 15:30:44 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20External=20project=20storage=20?=
 =?UTF-8?q?=E2=80=94=20append=20postfix=20@maven=20to=20store=20maven=20mo?=
 =?UTF-8?q?dule=20data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2e4f94e68a248fda1b55179ea4f671c94d6241c3

because no easy way to fix JPS for now
---
 .../configurationStore/ExternalSystemStorage.kt        | 10 ++--------
 .../configurationStore/ExternalSystemStorageTest.kt    |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorage.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorage.kt
index f87802fe7072..e4cb512a9f3c 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorage.kt
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorage.kt
@@ -22,7 +22,6 @@ import com.intellij.configurationStore.XmlElementStorage
 import com.intellij.openapi.components.RoamingType
 import com.intellij.openapi.components.StateSplitterEx
 import com.intellij.openapi.components.StoragePathMacros
-import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.JDOMUtil
@@ -36,16 +35,11 @@ internal class ExternalModuleStorage(private val module: Module, storageManager:
   override fun createSaveSession(states: StateMap) = object : XmlElementStorageSaveSession<ExternalModuleStorage>(states, this) {
     override fun saveLocally(element: Element?) {
       // our customizeStorageSpecs on write will not return our storage for not applicable module, so, we don't need to check it here
-      var name = module.name
-      if (ExternalSystemModulePropertyManager.getInstance(module).isMavenized()) {
-        // to distinguish because one project can contain modules from different external systems
-        name += "@maven"
-      }
       if (element == null) {
-        manager.moduleStorage.remove(name)
+        manager.moduleStorage.remove(module.name)
       }
       else {
-        manager.moduleStorage.write(name, element)
+        manager.moduleStorage.write(module.name, element)
       }
     }
   }
diff --git a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorageTest.kt b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorageTest.kt
index 4d322f3339ff..2c58d5d86f28 100644
--- a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorageTest.kt
+++ b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorageTest.kt
@@ -82,7 +82,7 @@ class ExternalSystemStorageTest {
       <?xml version="1.0" encoding="UTF-8"?>
       <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />""")
 
-      assertThat(cacheDir.resolve("test@maven.xml")).isEqualTo("""
+      assertThat(cacheDir.resolve("test.xml")).isEqualTo("""
       <module>
         <component name="NewModuleRootManager" inherit-compiler-output="true">
           <exclude-output />