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 (rename)

Browse Source
This commit is contained in:
Vladimir Krivosheev
2019-01-14 08:11:24 +01:00
parent c5e246530b
commit a0477eb7c7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/src/FileBasedStorage.kt
+5 -5
View File
@@ -42,7 +42,7 @@ open class FileBasedStorage(file: Path,
@Volatile private var cachedVirtualFile: VirtualFile? = null
protected var lineSeparator: LineSeparator? = null
protected var blockSavingTheContent = false
protected var isBlockSavingTheContent = false
@Volatile
var file = file
@@ -75,7 +75,7 @@ open class FileBasedStorage(file: Path,
protected open class FileSaveSession(storageData: StateMap, storage: FileBasedStorage) :
XmlElementStorage.XmlElementStorageSaveSession<FileBasedStorage>(storageData, storage) {
override fun save() {
if (storage.blockSavingTheContent) {
if (storage.isBlockSavingTheContent) {
LOG.info("Save blocked for ${storage.fileSpec}")
}
else {
@@ -151,7 +151,7 @@ open class FileBasedStorage(file: Path,
}
override fun loadLocalData(): Element? {
blockSavingTheContent = false
isBlockSavingTheContent = false
return runAndHandleExceptions { loadLocalDataUsingIo() }
}
@@ -187,7 +187,7 @@ open class FileBasedStorage(file: Path,
protected fun processReadException(e: Exception?) {
val contentTruncated = e == null
blockSavingTheContent = !contentTruncated &&
isBlockSavingTheContent = !contentTruncated &&
(PROJECT_FILE == fileSpec || fileSpec.startsWith(PROJECT_CONFIG_DIR) ||
fileSpec == StoragePathMacros.MODULE_FILE || fileSpec == StoragePathMacros.WORKSPACE_FILE)
@@ -198,7 +198,7 @@ open class FileBasedStorage(file: Path,
val app = ApplicationManager.getApplication()
if (!app.isUnitTestMode && !app.isHeadlessEnvironment) {
val reason = if (contentTruncated) "content truncated" else e!!.message
val action = if (blockSavingTheContent) "Please correct the file content" else "File content will be recreated"
val action = if (isBlockSavingTheContent) "Please correct the file content" else "File content will be recreated"
Notification(Notifications.SYSTEM_MESSAGES_GROUP_ID,
"Load Settings",
"Cannot load settings from file '$file': $reason\n$action",
platform/configuration-store-impl/src/ModuleStateStorageManager.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.configurationStore
import com.intellij.openapi.components.*
@@ -81,7 +81,7 @@ internal class ModuleStateStorageManager(macroSubstitutor: TrackingPathMacroSubs
provider: StreamProvider? = null) : MyFileStorage(storageManager, file, fileSpec, rootElementName, roamingType, pathMacroManager, provider) {
// use VFS to load module file because it is refreshed and loaded into VFS in any case
override fun loadLocalData(): Element? {
blockSavingTheContent = false
isBlockSavingTheContent = false
val virtualFile = virtualFile
if (virtualFile == null || !virtualFile.exists()) {
// only on first load