From 9b50e1d665328e063ced9cbc95b5fc5a9f1f1934 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 27 Aug 2015 10:11:50 +0200 Subject: [PATCH] PER_USER -> DEFAULT --- .../src/ProjectStoreImpl.kt | 4 +-- .../src/SchemeManagerFactoryImpl.kt | 2 +- .../src/SchemeManagerImpl.kt | 2 +- .../src/StateStorageManagerImpl.kt | 8 ++--- .../src/StreamProvider.kt | 8 ++--- .../src/XmlElementStorage.kt | 10 ++++--- .../DefaultStorageAnnotation.java | 2 +- .../testSrc/ApplicationStoreTest.kt | 4 +-- .../testSrc/MockStreamProvider.kt | 2 +- .../testSrc/ModuleStoreRenameTest.kt | 8 ++--- .../testSrc/SchemeManagerTest.kt | 7 ++--- .../testSrc/StorageManagerTest.kt | 7 ++--- .../openapi/components/RoamingType.java | 6 ++-- .../options/SchemesManagerFactory.java | 2 +- .../template/impl/TemplateSettings.java | 4 +-- .../ex/InspectionProfileManagerImpl.java | 4 +-- .../openapi/module/impl/ModuleImpl.java | 2 +- .../codeStyle/CodeStyleSchemesImpl.java | 5 ++-- .../com/intellij/tools/BaseToolManager.java | 3 +- .../actionSystem/ex/QuickListsManager.java | 30 +++++++++---------- .../colors/impl/EditorColorsManagerImpl.java | 9 ++++-- .../fileTypes/impl/FileTypeManagerImpl.java | 4 +-- .../keymap/impl/KeymapManagerImpl.java | 2 +- .../intellij/openapi/components/Storage.java | 2 +- .../src/copyAppSettingsToRepository.kt | 2 +- .../settingsRepository/CommitToIcsDialog.java | 17 ++++++++++- .../settings-repository/testSrc/GitTest.kt | 5 ++-- .../settings-repository/testSrc/LoadTest.kt | 3 +- 28 files changed, 88 insertions(+), 76 deletions(-) diff --git a/platform/configuration-store-impl/src/ProjectStoreImpl.kt b/platform/configuration-store-impl/src/ProjectStoreImpl.kt index a6f61c412593..6f3191ebc03a 100644 --- a/platform/configuration-store-impl/src/ProjectStoreImpl.kt +++ b/platform/configuration-store-impl/src/ProjectStoreImpl.kt @@ -171,9 +171,9 @@ open class ProjectStoreImpl(override val project: ProjectImpl, private val pathM override fun getProjectFilePath() = storageManager.expandMacro(StoragePathMacros.PROJECT_FILE) - private fun getProjectFileStorage() = storageManager.getStateStorage(StoragePathMacros.PROJECT_FILE, RoamingType.PER_USER) as FileBasedStorage + private fun getProjectFileStorage() = storageManager.getOrCreateStorage(StoragePathMacros.PROJECT_FILE) as FileBasedStorage - override fun getWorkspaceFile() = (storageManager.getStateStorage(StoragePathMacros.WORKSPACE_FILE, RoamingType.DISABLED) as FileBasedStorage?)?.getVirtualFile() + override fun getWorkspaceFile() = (storageManager.getOrCreateStorage(StoragePathMacros.WORKSPACE_FILE, RoamingType.DISABLED) as FileBasedStorage?)?.getVirtualFile() override fun getWorkspaceFilePath() = storageManager.expandMacro(StoragePathMacros.WORKSPACE_FILE) diff --git a/platform/configuration-store-impl/src/SchemeManagerFactoryImpl.kt b/platform/configuration-store-impl/src/SchemeManagerFactoryImpl.kt index e6f4be59e7a3..de4019a335ff 100644 --- a/platform/configuration-store-impl/src/SchemeManagerFactoryImpl.kt +++ b/platform/configuration-store-impl/src/SchemeManagerFactoryImpl.kt @@ -40,7 +40,7 @@ public abstract class SchemeManagerFactoryBase : SchemesManagerFactory(), Settin val storageManager = (componentManager.stateStore).getStateStorageManager() val path = checkPath(directoryName) - val manager = SchemeManagerImpl(path, processor, roamingType, (storageManager as? StateStorageManagerImpl)?.streamProvider, pathToFile(path, storageManager), componentManager) + val manager = SchemeManagerImpl(path, processor, (storageManager as? StateStorageManagerImpl)?.streamProvider, pathToFile(path, storageManager), roamingType, componentManager) @suppress("CAST_NEVER_SUCCEEDS") managers.add(manager as SchemeManagerImpl) return manager diff --git a/platform/configuration-store-impl/src/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/SchemeManagerImpl.kt index 12b40931ab81..0981b39876f7 100644 --- a/platform/configuration-store-impl/src/SchemeManagerImpl.kt +++ b/platform/configuration-store-impl/src/SchemeManagerImpl.kt @@ -55,9 +55,9 @@ import java.util.Collections public class SchemeManagerImpl(private val fileSpec: String, private val processor: SchemeProcessor, - private val roamingType: RoamingType, private val provider: StreamProvider?, private val ioDirectory: File, + private val roamingType: RoamingType = RoamingType.DEFAULT, virtualFileTrackerDisposable: Disposable? = null) : SchemesManager(), SafeWriteRequestor { private val schemes = ArrayList() private val readOnlyExternalizableSchemes = THashMap() diff --git a/platform/configuration-store-impl/src/StateStorageManagerImpl.kt b/platform/configuration-store-impl/src/StateStorageManagerImpl.kt index d24c990e56aa..ce646656cc33 100644 --- a/platform/configuration-store-impl/src/StateStorageManagerImpl.kt +++ b/platform/configuration-store-impl/src/StateStorageManagerImpl.kt @@ -148,7 +148,7 @@ open class StateStorageManagerImpl(private val rootTagName: String, */ open fun fileSpecToPath(fileSpec: String): String = expandMacros(fileSpec) - fun getOrCreateStorage(fileSpec: String, roamingType: RoamingType, storageClass: Class = javaClass(), @SuppressWarnings("deprecation") stateSplitter: Class = javaClass()): StateStorage { + fun getOrCreateStorage(fileSpec: String, roamingType: RoamingType = RoamingType.DEFAULT, storageClass: Class = javaClass(), @SuppressWarnings("deprecation") stateSplitter: Class = javaClass()): StateStorage { val collapsedPath = normalizeFileSpec(fileSpec) val key = if (storageClass == javaClass()) collapsedPath else storageClass.getName() storageLock.withLock { @@ -206,7 +206,7 @@ open class StateStorageManagerImpl(private val rootTagName: String, throw IllegalArgumentException("Extension is missing for storage file: $filePath") } - val effectiveRoamingType = if (roamingType == RoamingType.PER_USER && fileSpec == StoragePathMacros.WORKSPACE_FILE) RoamingType.DISABLED else roamingType + val effectiveRoamingType = if (roamingType == RoamingType.DEFAULT && fileSpec == StoragePathMacros.WORKSPACE_FILE) RoamingType.DISABLED else roamingType val storage = MyFileStorage(this, File(filePath), fileSpec, rootTagName, effectiveRoamingType, getMacroSubstitutor(fileSpec), streamProvider) if (isUseVfsListener == ThreeState.YES) { virtualFileTracker?.put(filePath, storage) @@ -252,7 +252,7 @@ open class StateStorageManagerImpl(private val rootTagName: String, override final fun rename(path: String, newName: String) { storageLock.withLock { - val storage = getOrCreateStorage(collapseMacros(path), RoamingType.PER_USER) as FileBasedStorage + val storage = getOrCreateStorage(collapseMacros(path), RoamingType.DEFAULT) as FileBasedStorage val file = storage.getVirtualFile() try { @@ -391,7 +391,7 @@ open class StateStorageManagerImpl(private val rootTagName: String, override fun getOldStorage(component: Any, componentName: String, operation: StateStorageOperation): StateStorage? { val oldStorageSpec = getOldStorageSpec(component, componentName, operation) ?: return null @suppress("DEPRECATED_SYMBOL_WITH_MESSAGE") - return getStateStorage(oldStorageSpec, if (component is com.intellij.openapi.util.RoamingTypeDisabled) RoamingType.DISABLED else RoamingType.PER_USER) + return getStateStorage(oldStorageSpec, if (component is com.intellij.openapi.util.RoamingTypeDisabled) RoamingType.DISABLED else RoamingType.DEFAULT) } protected open fun getOldStorageSpec(component: Any, componentName: String, operation: StateStorageOperation): String? = null diff --git a/platform/configuration-store-impl/src/StreamProvider.kt b/platform/configuration-store-impl/src/StreamProvider.kt index e09dd685c704..ec4738a81f4a 100644 --- a/platform/configuration-store-impl/src/StreamProvider.kt +++ b/platform/configuration-store-impl/src/StreamProvider.kt @@ -22,16 +22,16 @@ public interface StreamProvider { public open val enabled: Boolean get() = true - public open fun isApplicable(fileSpec: String, roamingType: RoamingType = RoamingType.PER_USER): Boolean = true + public open fun isApplicable(fileSpec: String, roamingType: RoamingType = RoamingType.DEFAULT): Boolean = true /** * @param fileSpec * @param content bytes of content, size of array is not actual size of data, you must use `size` * @param size actual size of data */ - public fun write(fileSpec: String, content: ByteArray, size: Int = content.size(), roamingType: RoamingType = RoamingType.PER_USER) + public fun write(fileSpec: String, content: ByteArray, size: Int = content.size(), roamingType: RoamingType = RoamingType.DEFAULT) - public fun read(fileSpec: String, roamingType: RoamingType = RoamingType.PER_USER): InputStream? + public fun read(fileSpec: String, roamingType: RoamingType = RoamingType.DEFAULT): InputStream? /** * You must close passed input stream. @@ -41,7 +41,7 @@ public interface StreamProvider { /** * Delete file or directory */ - public fun delete(fileSpec: String, roamingType: RoamingType = RoamingType.PER_USER) + public fun delete(fileSpec: String, roamingType: RoamingType = RoamingType.DEFAULT) } public fun StreamProvider.write(fileSpec: String, content: String) { diff --git a/platform/configuration-store-impl/src/XmlElementStorage.kt b/platform/configuration-store-impl/src/XmlElementStorage.kt index 245e47d6f06c..b40a7ae645f3 100644 --- a/platform/configuration-store-impl/src/XmlElementStorage.kt +++ b/platform/configuration-store-impl/src/XmlElementStorage.kt @@ -18,7 +18,9 @@ package com.intellij.configurationStore import com.intellij.openapi.components.RoamingType import com.intellij.openapi.components.StateStorage import com.intellij.openapi.components.TrackingPathMacroSubstitutor -import com.intellij.openapi.components.impl.stores.* +import com.intellij.openapi.components.impl.stores.FileStorageCoreUtil +import com.intellij.openapi.components.impl.stores.StateStorageBase +import com.intellij.openapi.components.impl.stores.StorageUtil import com.intellij.openapi.util.JDOMUtil import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.SmartHashSet @@ -30,9 +32,9 @@ import java.io.IOException abstract class XmlElementStorage protected constructor(protected val fileSpec: String, protected val rootElementName: String, protected val pathMacroSubstitutor: TrackingPathMacroSubstitutor?, - roamingType: RoamingType?, - provider: StreamProvider?) : StateStorageBase() { - protected val roamingType: RoamingType = roamingType ?: RoamingType.PER_USER + roamingType: RoamingType? = RoamingType.DEFAULT, + provider: StreamProvider? = null) : StateStorageBase() { + protected val roamingType: RoamingType = roamingType ?: RoamingType.DEFAULT private val provider: StreamProvider? = if (provider == null || roamingType == RoamingType.DISABLED || !provider.isApplicable(fileSpec, this.roamingType)) null else provider protected abstract fun loadLocalData(): Element? diff --git a/platform/configuration-store-impl/src/com/intellij/configurationStore/DefaultStorageAnnotation.java b/platform/configuration-store-impl/src/com/intellij/configurationStore/DefaultStorageAnnotation.java index c06bad4fc0ad..c1bf7d107f59 100644 --- a/platform/configuration-store-impl/src/com/intellij/configurationStore/DefaultStorageAnnotation.java +++ b/platform/configuration-store-impl/src/com/intellij/configurationStore/DefaultStorageAnnotation.java @@ -29,7 +29,7 @@ public final class DefaultStorageAnnotation implements Storage { @Override public RoamingType roamingType() { - return RoamingType.PER_USER; + return RoamingType.DEFAULT; } @Override diff --git a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt index b37ba2304610..c3d866d13e22 100644 --- a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt @@ -63,7 +63,7 @@ class ApplicationStoreTest { component.foo = "newValue" componentStore.save(SmartList()) - assertThat(streamProvider.data.get(RoamingType.PER_USER)!!.get("proxy.settings.xml")).isEqualTo("\n" + " \n" + " \n" + "") + assertThat(streamProvider.data.get(RoamingType.DEFAULT)!!.get("proxy.settings.xml")).isEqualTo("\n" + " \n" + " \n" + "") } @Test fun testLoadFromStreamProvider() { @@ -73,7 +73,7 @@ class ApplicationStoreTest { val map = THashMap() val fileSpec = "proxy.settings.xml" map.put(fileSpec, "\n \n \n") - streamProvider.data.put(RoamingType.PER_USER, map) + streamProvider.data.put(RoamingType.DEFAULT, map) componentStore.storageManager.streamProvider = streamProvider componentStore.initComponent(component, false) diff --git a/platform/configuration-store-impl/testSrc/MockStreamProvider.kt b/platform/configuration-store-impl/testSrc/MockStreamProvider.kt index c765bb81c6b9..44b6139d197f 100644 --- a/platform/configuration-store-impl/testSrc/MockStreamProvider.kt +++ b/platform/configuration-store-impl/testSrc/MockStreamProvider.kt @@ -19,7 +19,7 @@ class MockStreamProvider(private val myBaseDir: File) : StreamProvider { } private fun listSubFiles(fileSpec: String, roamingType: RoamingType): Collection { - if (roamingType !== RoamingType.PER_USER) { + if (roamingType !== RoamingType.DEFAULT) { return emptyList() } diff --git a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt index 779ca39b2fb7..8fb95898ee25 100644 --- a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt +++ b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt @@ -83,7 +83,7 @@ class ModuleStoreRenameTest { // project structure @Test fun `rename module using model`() { runInEdtAndWait { module.saveStore() } - val storage = module.stateStore.getStateStorageManager().getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.PER_USER) as FileBasedStorage + val storage = module.stateStore.getStateStorageManager().getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.DEFAULT) as FileBasedStorage val oldFile = storage.file assertThat(oldFile).isFile() @@ -97,7 +97,7 @@ class ModuleStoreRenameTest { // project view @Test fun `rename module using rename virtual file`() { runInEdtAndWait { module.saveStore() } - var storage = module.stateStore.getStateStorageManager().getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.PER_USER) as FileBasedStorage + var storage = module.stateStore.getStateStorageManager().getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.DEFAULT) as FileBasedStorage val oldFile = storage.file assertThat(oldFile).isFile() @@ -112,7 +112,7 @@ class ModuleStoreRenameTest { private fun assertRename(newName: String, oldFile: File) { val storageManager = module.stateStore.getStateStorageManager() - val newFile = (storageManager.getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.PER_USER) as FileBasedStorage).file + val newFile = (storageManager.getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.DEFAULT) as FileBasedStorage).file assertThat(newFile.getName()).isEqualTo("$newName${ModuleFileType.DOT_DEFAULT_EXTENSION}") assertThat(oldFile) .doesNotExist() @@ -126,7 +126,7 @@ class ModuleStoreRenameTest { @Test fun `rename module parent virtual dir`() { runInEdtAndWait { module.saveStore() } val storageManager = module.stateStore.getStateStorageManager() - val storage = storageManager.getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.PER_USER) as FileBasedStorage + val storage = storageManager.getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.DEFAULT) as FileBasedStorage val oldFile = storage.file val parentVirtualDir = storage.getVirtualFile()!!.getParent() diff --git a/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt b/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt index 42caad166d9a..91c25b201d02 100644 --- a/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt +++ b/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt @@ -15,7 +15,6 @@ */ package com.intellij.configurationStore -import com.intellij.openapi.components.RoamingType import com.intellij.openapi.options.BaseSchemeProcessor import com.intellij.openapi.options.ExternalizableScheme import com.intellij.openapi.options.SchemesManagerFactory @@ -158,7 +157,7 @@ class SchemeManagerTest { override fun isUpgradeNeeded() = true override fun getSchemeExtension() = ".icls" - }, RoamingType.PER_USER, null, dir) + }, null, dir) schemesManager.loadSchemes() assertThat(schemesManager.getAllSchemes()).containsOnly(scheme) @@ -305,7 +304,7 @@ class SchemeManagerTest { assertThatThrownBy({SchemesManagerFactory.getInstance().create("foo\\bar", TestSchemesProcessor())}).hasMessage("Path must be system-independent, use forward slash instead of backslash") } - private fun createSchemeManager(dir: File) = SchemeManagerImpl(FILE_SPEC, TestSchemesProcessor(), RoamingType.PER_USER, null, dir) + private fun createSchemeManager(dir: File) = SchemeManagerImpl(FILE_SPEC, TestSchemesProcessor(), null, dir) private fun createAndLoad(testData: String): SchemeManagerImpl { createTempFiles(testData) @@ -325,7 +324,7 @@ class SchemeManagerTest { } private fun createAndLoad(): SchemeManagerImpl { - val schemesManager = SchemeManagerImpl(FILE_SPEC, TestSchemesProcessor(), RoamingType.PER_USER, MockStreamProvider(remoteBaseDir!!), localBaseDir!!) + val schemesManager = SchemeManagerImpl(FILE_SPEC, TestSchemesProcessor(), MockStreamProvider(remoteBaseDir!!), localBaseDir!!) schemesManager.loadSchemes() return schemesManager } diff --git a/platform/configuration-store-impl/testSrc/StorageManagerTest.kt b/platform/configuration-store-impl/testSrc/StorageManagerTest.kt index c71e24d3ad2f..6f028dc331bc 100644 --- a/platform/configuration-store-impl/testSrc/StorageManagerTest.kt +++ b/platform/configuration-store-impl/testSrc/StorageManagerTest.kt @@ -16,7 +16,6 @@ package com.intellij.configurationStore import com.intellij.openapi.components.ComponentManager -import com.intellij.openapi.components.RoamingType import com.intellij.openapi.components.stateStore import com.intellij.testFramework.ProjectRule import com.intellij.util.SmartList @@ -43,7 +42,7 @@ class StorageManagerTest { } public Test fun createFileStateStorageMacroSubstituted() { - assertThat(storageManager.getStateStorage("$MACRO/test.xml", RoamingType.PER_USER)).isNotNull() + assertThat(storageManager.getOrCreateStorage("$MACRO/test.xml")).isNotNull() } public Test fun `collapse macro`() { @@ -59,7 +58,7 @@ class StorageManagerTest { public Test fun `create storage assertion thrown when unknown macro`() { try { - storageManager.getStateStorage("\$UNKNOWN_MACRO$/test.xml", RoamingType.PER_USER) + storageManager.getOrCreateStorage("\$UNKNOWN_MACRO$/test.xml") TestCase.fail("Exception expected") } catch (e: IllegalArgumentException) { @@ -69,7 +68,7 @@ class StorageManagerTest { public Test fun `create file storage macro substituted when expansion has$`() { storageManager.addMacro("\$DOLLAR_MACRO$", "/temp/d$") - assertThat(storageManager.getStateStorage("\$DOLLAR_MACRO$/test.xml", RoamingType.PER_USER)).isNotNull() + assertThat(storageManager.getOrCreateStorage("\$DOLLAR_MACRO$/test.xml")).isNotNull() } } diff --git a/platform/core-api/src/com/intellij/openapi/components/RoamingType.java b/platform/core-api/src/com/intellij/openapi/components/RoamingType.java index 6ee6251eed1a..090ac54db5cc 100644 --- a/platform/core-api/src/com/intellij/openapi/components/RoamingType.java +++ b/platform/core-api/src/com/intellij/openapi/components/RoamingType.java @@ -28,13 +28,13 @@ public enum RoamingType { /** * Default, shared. */ - PER_USER, + DEFAULT, @Deprecated /** - * Use {@link #PER_USER} instead + * Use {@link #DEFAULT} instead */ - GLOBAL, + PER_USER, @Deprecated /** diff --git a/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java b/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java index 0992f0610b38..1629a7623829 100644 --- a/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java +++ b/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java @@ -31,7 +31,7 @@ public abstract class SchemesManagerFactory { @NotNull public final SchemesManager create(@NotNull String directoryName, @NotNull SchemeProcessor processor) { - return createSchemesManager(directoryName, processor, RoamingType.PER_USER); + return createSchemesManager(directoryName, processor, RoamingType.DEFAULT); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java index 084cba55b3d6..c1498426fe8c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java @@ -184,7 +184,7 @@ public class TemplateSettings implements PersistentStateComponent() { + mySchemesManager = schemesManagerFactory.create(TEMPLATES_DIR_PATH, new BaseSchemeProcessor() { @Nullable @Override public TemplateGroup readScheme(@NotNull Element element) throws InvalidDataException { @@ -239,7 +239,7 @@ public class TemplateSettings implements PersistentStateComponent() { + mySchemesManager = schemesManagerFactory.create(INSPECTION_DIR, new BaseSchemeProcessor() { @NotNull @Override public InspectionProfileImpl readScheme(@NotNull Element element) { @@ -139,7 +139,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple } onProfilesChanged(); } - }, RoamingType.PER_USER); + }); mySeverityRegistrar = new SeverityRegistrar(messageBus); } diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java index 23e6adde2b35..e4d95ab2cee9 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java @@ -86,7 +86,7 @@ public class ModuleImpl extends PlatformComponentManagerImpl implements ModuleEx @NotNull private static FileStorage getMainStorage(@NotNull Module module) { - return (FileStorage)ComponentsPackage.getStateStore(module).getStateStorageManager().getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.PER_USER); + return (FileStorage)ComponentsPackage.getStateStore(module).getStateStorageManager().getStateStorage(StoragePathMacros.MODULE_FILE, RoamingType.DEFAULT); } @Override diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java index 74d9a4ee4372..04980ae83012 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java @@ -15,7 +15,6 @@ */ package com.intellij.psi.impl.source.codeStyle; -import com.intellij.openapi.components.RoamingType; import com.intellij.openapi.options.BaseSchemeProcessor; import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.options.SchemesManagerFactory; @@ -39,7 +38,7 @@ public abstract class CodeStyleSchemesImpl extends CodeStyleSchemes { protected final SchemesManager mySchemesManager; public CodeStyleSchemesImpl(@NotNull SchemesManagerFactory schemesManagerFactory) { - mySchemesManager = schemesManagerFactory.createSchemesManager(CODE_STYLES_DIR_PATH, new BaseSchemeProcessor() { + mySchemesManager = schemesManagerFactory.create(CODE_STYLES_DIR_PATH, new BaseSchemeProcessor() { @NotNull @Override public CodeStyleSchemeImpl readScheme(@NotNull Element element) { @@ -64,7 +63,7 @@ public abstract class CodeStyleSchemesImpl extends CodeStyleSchemes { public void initScheme(@NotNull CodeStyleSchemeImpl scheme) { scheme.init(CodeStyleSchemesImpl.this); } - }, RoamingType.PER_USER); + }); mySchemesManager.loadSchemes(); addScheme(new CodeStyleSchemeImpl(DEFAULT_SCHEME_NAME, true, null)); diff --git a/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java b/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java index 64e40622061d..4cf179b2119b 100644 --- a/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java +++ b/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java @@ -17,7 +17,6 @@ package com.intellij.tools; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.components.ExportableComponent; -import com.intellij.openapi.components.RoamingType; import com.intellij.openapi.options.SchemeProcessor; import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.options.SchemesManagerFactory; @@ -40,7 +39,7 @@ public abstract class BaseToolManager implements ExportableCompo public BaseToolManager(@NotNull ActionManagerEx actionManagerEx, SchemesManagerFactory factory) { myActionManager = actionManagerEx; - mySchemesManager = factory.createSchemesManager(getSchemesPath(), createProcessor(), RoamingType.PER_USER); + mySchemesManager = factory.create(getSchemesPath(), createProcessor()); mySchemesManager.loadSchemes(); registerActions(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java index 8d15385bd74c..613f98d7f5fb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java @@ -21,7 +21,6 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.impl.BundledQuickListsProvider; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ExportableApplicationComponent; -import com.intellij.openapi.components.RoamingType; import com.intellij.openapi.options.BaseSchemeProcessor; import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.options.SchemesManagerFactory; @@ -44,22 +43,21 @@ public class QuickListsManager implements ExportableApplicationComponent { public QuickListsManager(@NotNull ActionManager actionManager, @NotNull SchemesManagerFactory schemesManagerFactory) { myActionManager = actionManager; - mySchemeManager = schemesManagerFactory.createSchemesManager("quicklists", - new BaseSchemeProcessor() { - @NotNull - @Override - public QuickList readScheme(@NotNull Element element) { - return createItem(element); - } + mySchemeManager = schemesManagerFactory.create("quicklists", + new BaseSchemeProcessor() { + @NotNull + @Override + public QuickList readScheme(@NotNull Element element) { + return createItem(element); + } - @Override - public Element writeScheme(@NotNull QuickList scheme) { - Element element = new Element(LIST_TAG); - scheme.writeExternal(element); - return element; - } - }, - RoamingType.PER_USER); + @Override + public Element writeScheme(@NotNull QuickList scheme) { + Element element = new Element(LIST_TAG); + scheme.writeExternal(element); + return element; + } + }); } @NotNull diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java index c5db992f656d..cf844b8921e7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java @@ -20,7 +20,10 @@ import com.intellij.ide.WelcomeWizardUtil; import com.intellij.ide.ui.LafManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.*; +import com.intellij.openapi.components.PersistentStateComponent; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.colors.EditorColorsListener; @@ -75,7 +78,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Pers public EditorColorsManagerImpl(@NotNull DefaultColorSchemesManager defaultColorSchemeManager, @NotNull SchemesManagerFactory schemeManagerFactory) { myDefaultColorSchemeManager = defaultColorSchemeManager; - mySchemeManager = schemeManagerFactory.createSchemesManager(FILE_SPEC, new BaseSchemeProcessor() { + mySchemeManager = schemeManagerFactory.create(FILE_SPEC, new BaseSchemeProcessor() { @NotNull @Override public EditorColorsSchemeImpl readScheme(@NotNull Element element) { @@ -122,7 +125,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Pers public boolean isUpgradeNeeded() { return true; } - }, RoamingType.PER_USER); + }); initDefaultSchemes(); loadBundledSchemes(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index 1a54c59dfb77..83fa8dc423bf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -143,7 +143,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent autoDetectedAttribute = new FileAttribute("AUTO_DETECTION_CACHE_ATTRIBUTE", fileTypeChangedCounter, true); myMessageBus = bus; - mySchemesManager = schemesManagerFactory.createSchemesManager(FILE_SPEC, new BaseSchemeProcessor() { + mySchemesManager = schemesManagerFactory.create(FILE_SPEC, new BaseSchemeProcessor() { @NotNull @Override public AbstractFileType readScheme(@NotNull Element element, boolean duringLoad) { @@ -196,7 +196,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent myPatternsTable.removeAllAssociations(scheme); fireFileTypesChanged(); } - }, RoamingType.PER_USER); + }); bus.connect().subscribe(VirtualFileManager.VFS_CHANGES, new BulkFileListener.Adapter() { @Override public void after(@NotNull List events) { diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java index 98a355433f9a..b6f58fc652e1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java @@ -84,7 +84,7 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat } } }; - mySchemesManager = factory.createSchemesManager(KEYMAPS_DIR_PATH, schemeProcessor, RoamingType.PER_USER); + mySchemesManager = factory.create(KEYMAPS_DIR_PATH, schemeProcessor); String systemDefaultKeymap = WelcomeWizardUtil.getWizardMacKeymap() != null ? WelcomeWizardUtil.getWizardMacKeymap() diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java b/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java index 0e27bb2bc05d..14862def6a00 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java +++ b/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java @@ -37,7 +37,7 @@ public @interface Storage { /** * You must not store components with different roaming types in one file ({@link #file()}). */ - RoamingType roamingType() default RoamingType.PER_USER; + RoamingType roamingType() default RoamingType.DEFAULT; /** * Class must have constructor (ComponentManager componentManager, StateStorageManager storageManager). componentManager parameter can have more concrete type - e.g. Module (if storage intended to support only one type) diff --git a/plugins/settings-repository/src/copyAppSettingsToRepository.kt b/plugins/settings-repository/src/copyAppSettingsToRepository.kt index 4dad5fb5b938..e42c1e8ab607 100644 --- a/plugins/settings-repository/src/copyAppSettingsToRepository.kt +++ b/plugins/settings-repository/src/copyAppSettingsToRepository.kt @@ -81,5 +81,5 @@ private fun getRoamingType(components: Collection): Roaming } } } - return RoamingType.PER_USER + return RoamingType.DEFAULT } \ No newline at end of file diff --git a/plugins/settings-repository/src/org/jetbrains/settingsRepository/CommitToIcsDialog.java b/plugins/settings-repository/src/org/jetbrains/settingsRepository/CommitToIcsDialog.java index a36fc8fb1000..6c9b908414d2 100644 --- a/plugins/settings-repository/src/org/jetbrains/settingsRepository/CommitToIcsDialog.java +++ b/plugins/settings-repository/src/org/jetbrains/settingsRepository/CommitToIcsDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.settingsRepository; import com.intellij.openapi.components.ComponentsPackage; @@ -57,7 +72,7 @@ public class CommitToIcsDialog extends DialogWrapper { VirtualFile file = change.getVirtualFile(); assert file != null; String fileSpec = macroSubstitutor.collapsePath(file.getPath()); - String repoPath = SettingsRepositoryPackage.buildPath(fileSpec, RoamingType.PER_USER, projectId); + String repoPath = SettingsRepositoryPackage.buildPath(fileSpec, RoamingType.DEFAULT, projectId); addToIcs.add(repoPath); if (!icsManager.getRepositoryManager().has(repoPath)) { // new, revert local diff --git a/plugins/settings-repository/testSrc/GitTest.kt b/plugins/settings-repository/testSrc/GitTest.kt index a05540105993..ec44e95b2f43 100644 --- a/plugins/settings-repository/testSrc/GitTest.kt +++ b/plugins/settings-repository/testSrc/GitTest.kt @@ -17,7 +17,6 @@ package org.jetbrains.settingsRepository.test import com.intellij.configurationStore.write import com.intellij.mock.MockVirtualFileSystem -import com.intellij.openapi.components.RoamingType import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vcs.merge.MergeSession import com.intellij.openapi.vfs.CharsetToolkit @@ -125,7 +124,7 @@ class GitTest : IcsTestCase() { val dir = "dir" val fullFileSpec = "$dir/file.xml" provider.write(fullFileSpec, SAMPLE_FILE_CONTENT) - provider.delete(if (directory) dir else fullFileSpec, RoamingType.PER_USER) + provider.delete(if (directory) dir else fullFileSpec) val diff = repository.computeIndexDiff() assertThat(diff.diff()).isFalse() @@ -295,7 +294,7 @@ class GitTest : IcsTestCase() { sync(SyncType.MERGE) - provider.delete("remote.xml", RoamingType.PER_USER) + provider.delete("remote.xml") repositoryManager.commit() remoteRepository.writePath("remote.xml", AM.MARKER_ACCEPT_THEIRS) diff --git a/plugins/settings-repository/testSrc/LoadTest.kt b/plugins/settings-repository/testSrc/LoadTest.kt index cb18aac876d9..287d21cf307d 100644 --- a/plugins/settings-repository/testSrc/LoadTest.kt +++ b/plugins/settings-repository/testSrc/LoadTest.kt @@ -18,7 +18,6 @@ package org.jetbrains.settingsRepository.test import com.intellij.configurationStore.SchemeManagerImpl import com.intellij.configurationStore.TestScheme import com.intellij.configurationStore.TestSchemesProcessor -import com.intellij.openapi.components.RoamingType import com.intellij.testFramework.ProjectRule import com.intellij.util.xmlb.serialize import com.intellij.util.xmlb.toByteArray @@ -38,7 +37,7 @@ class LoadTest : IcsTestCase() { private val dirPath = "\$ROOT_CONFIG$/keymaps" - private fun createSchemeManager(dirPath: String) = SchemeManagerImpl(dirPath, TestSchemesProcessor(), RoamingType.PER_USER, provider, tempDirManager.newDirectory("schemes")) + private fun createSchemeManager(dirPath: String) = SchemeManagerImpl(dirPath, TestSchemesProcessor(), provider, tempDirManager.newDirectory("schemes")) @Test fun `load scheme`() { val localScheme = TestScheme("local")