MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup before use new kotlin-friendly xml deserializer

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-05-20 09:52:28 +02:00
parent dcb73090cc
commit 3f2471096a
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/src/ComponentStoreImpl.kt
-1
View File
@@ -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
platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
+1 -1
View File
@@ -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?
platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DefaultStateSerializer.kt → platform/projectModel-impl/src/com/intellij/configurationStore/DefaultStateSerializer.kt
+1 -1
View File
@@ -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
platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
+1 -1
View File
@@ -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;