From 3f2471096a5dba9ead226313d5c2f3476ec48930 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 19 May 2017 17:58:08 +0200
Subject: [PATCH] cleanup before use new kotlin-friendly xml deserializer

---
 platform/configuration-store-impl/src/ComponentStoreImpl.kt     | 1 -
 .../src/com/intellij/configurationStore/StateStorageBase.kt     | 2 +-
 .../stores => configurationStore}/DefaultStateSerializer.kt     | 2 +-
 .../src/com/intellij/core/CoreProjectLoader.java                | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename platform/projectModel-impl/src/com/intellij/{openapi/components/impl/stores => configurationStore}/DefaultStateSerializer.kt (97%)

diff --git a/platform/configuration-store-impl/src/ComponentStoreImpl.kt b/platform/configuration-store-impl/src/ComponentStoreImpl.kt
index fc068eed1906..6cad8fcf1f44 100644
--- a/platform/configuration-store-impl/src/ComponentStoreImpl.kt
+++ b/platform/configuration-store-impl/src/ComponentStoreImpl.kt
@@ -27,7 +27,6 @@ import com.intellij.openapi.components.impl.ComponentManagerImpl
 import com.intellij.openapi.components.impl.stores.IComponentStore
 import com.intellij.openapi.components.impl.stores.StoreUtil
 import com.intellij.openapi.components.impl.stores.UnknownMacroNotification
-import com.intellij.openapi.components.impl.stores.deserializeState
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.debug
 import com.intellij.openapi.progress.ProcessCanceledException
diff --git a/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt b/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
index 3f96cbcef213..7514d190c5ce 100644
--- a/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
+++ b/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
@@ -39,7 +39,7 @@ abstract class StateStorageBase<T : Any> : StateStorage {
   }
 
   open fun <S: Any> deserializeState(serializedState: Element?, stateClass: Class<S>, mergeInto: S?): S? {
-    return com.intellij.openapi.components.impl.stores.deserializeState(serializedState, stateClass, mergeInto)
+    return com.intellij.configurationStore.deserializeState(serializedState, stateClass, mergeInto)
   }
 
   abstract fun getSerializedState(storageData: T, component: Any?, componentName: String, archive: Boolean = true): Element?
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DefaultStateSerializer.kt b/platform/projectModel-impl/src/com/intellij/configurationStore/DefaultStateSerializer.kt
similarity index 97%
rename from platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DefaultStateSerializer.kt
rename to platform/projectModel-impl/src/com/intellij/configurationStore/DefaultStateSerializer.kt
index 319a64e3c1de..9ef90bdc0fe6 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DefaultStateSerializer.kt
+++ b/platform/projectModel-impl/src/com/intellij/configurationStore/DefaultStateSerializer.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.components.impl.stores
+package com.intellij.configurationStore
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.util.JDOMExternalizable
diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
index 5757dac6df9d..1efcfd050afb 100644
--- a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
+++ b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
@@ -15,10 +15,10 @@
  */
 package com.intellij.core;
 
+import com.intellij.configurationStore.DefaultStateSerializerKt;
 import com.intellij.mock.MockProject;
 import com.intellij.openapi.components.ComponentManager;
 import com.intellij.openapi.components.PathMacroManager;
-import com.intellij.openapi.components.impl.stores.DefaultStateSerializerKt;
 import com.intellij.openapi.components.impl.stores.DirectoryStorageUtil;
 import com.intellij.openapi.components.impl.stores.FileStorageCoreUtil;
 import com.intellij.openapi.module.ModuleManager;