diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java index b17508711d3b..2b44b90e6d3c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java @@ -15,38 +15,13 @@ */ package com.intellij.codeInsight.folding.impl; -import com.intellij.ide.IdeBundle; -import com.intellij.openapi.application.PathManager; -import com.intellij.openapi.components.ExportableComponent; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.util.xmlb.XmlSerializerUtil; -import org.jetbrains.annotations.NotNull; - -import java.io.File; - -@State( - name="JavaCodeFoldingSettings", - storages= { - @Storage("editor.codeinsight.xml")} -) -public class JavaCodeFoldingSettingsImpl extends JavaCodeFoldingSettingsBase implements PersistentStateComponent, - ExportableComponent { - - - @Override - @NotNull - public File[] getExportFiles() { - return new File[]{PathManager.getOptionsFile("editor.codeinsight")}; - } - - @Override - @NotNull - public String getPresentableName() { - return IdeBundle.message("code.folding.settings"); - } +@State(name = "JavaCodeFoldingSettings", storages = @Storage("editor.codeinsight.xml")) +public class JavaCodeFoldingSettingsImpl extends JavaCodeFoldingSettingsBase implements PersistentStateComponent { @Override public JavaCodeFoldingSettingsImpl getState() { return this; diff --git a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt index ed47ca66e2de..5c822c285ae7 100644 --- a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt @@ -128,16 +128,16 @@ internal class ApplicationStoreTest { assertThat(map).isNotEmpty fun test(item: ExportableItem) { - val file = item.files.first() + val file = item.file assertThat(map.get(file)).containsExactly(item) assertThat(file).doesNotExist() } - test(ExportableItem(listOf(Paths.get(optionsPath, "filetypes.xml")), "File types", RoamingType.DEFAULT)) - test(ExportableItem(listOf(Paths.get(rootConfigPath, "filetypes")), "File types", RoamingType.DEFAULT)) - test(ExportableItem(listOf(Paths.get(optionsPath, "customization.xml")), "Menus and toolbars customization", RoamingType.DEFAULT)) - test(ExportableItem(listOf(Paths.get(optionsPath, "templates.xml")), "Live templates", RoamingType.DEFAULT)) - test(ExportableItem(listOf(Paths.get(rootConfigPath, "templates")), "Live templates", RoamingType.DEFAULT)) + test(ExportableItem(Paths.get(optionsPath, "filetypes.xml"), "File types", RoamingType.DEFAULT)) + test(ExportableItem(Paths.get(rootConfigPath, "filetypes"), "File types", RoamingType.DEFAULT)) + test(ExportableItem(Paths.get(optionsPath, "customization.xml"), "Menus and toolbars customization", RoamingType.DEFAULT)) + test(ExportableItem(Paths.get(optionsPath, "templates.xml"), "Live templates", RoamingType.DEFAULT)) + test(ExportableItem(Paths.get(rootConfigPath, "templates"), "Live templates", RoamingType.DEFAULT)) } @Test fun `import settings`() { @@ -175,7 +175,7 @@ internal class ApplicationStoreTest { val componentKey = A::class.java.name picoContainer.registerComponent(InstanceComponentAdapter(componentKey, component)) try { - assertThat(getExportableComponentsMap(false, false, storageManager, relativePaths)).containsOnly(componentFile.to(listOf(ExportableItem(listOf(componentFile), ""))), additionalFile.to(listOf(ExportableItem(listOf(additionalFile), "")))) + assertThat(getExportableComponentsMap(false, false, storageManager, relativePaths)).containsOnly(componentFile.to(listOf(ExportableItem(componentFile, ""))), additionalFile.to(listOf(ExportableItem(additionalFile, "")))) } finally { picoContainer.unregisterComponent(componentKey) diff --git a/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java b/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java index bc683e53605e..205eb78c2497 100644 --- a/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java +++ b/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java @@ -15,5 +15,6 @@ */ package com.intellij.openapi.components; +@Deprecated public interface ExportableApplicationComponent extends ApplicationComponent, ExportableComponent { } diff --git a/platform/core-api/src/com/intellij/openapi/components/ExportableComponent.java b/platform/core-api/src/com/intellij/openapi/components/ExportableComponent.java index e0bce1e50233..ef7c92b9484a 100644 --- a/platform/core-api/src/com/intellij/openapi/components/ExportableComponent.java +++ b/platform/core-api/src/com/intellij/openapi/components/ExportableComponent.java @@ -20,9 +20,7 @@ import org.jetbrains.annotations.NotNull; import java.io.File; -/** - * @author yole - */ +@Deprecated public interface ExportableComponent { ExtensionPointName EXTENSION_POINT = new ExtensionPointName("com.intellij.exportable"); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesSettings.java index 73bb0a2deab9..94a8df2232bd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesSettings.java @@ -19,8 +19,10 @@ import com.intellij.codeInsight.template.impl.TemplateSettings; import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate; import com.intellij.codeInsight.template.postfix.templates.PostfixTemplateProvider; import com.intellij.codeInsight.template.postfix.templates.PostfixTemplatesUtils; -import com.intellij.openapi.application.PathManager; -import com.intellij.openapi.components.*; +import com.intellij.openapi.components.PersistentStateComponent; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; import com.intellij.openapi.util.Factory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters; @@ -30,12 +32,11 @@ import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.File; import java.util.Map; import java.util.Set; @State(name = "PostfixTemplatesSettings", storages = @Storage("postfixTemplates.xml")) -public class PostfixTemplatesSettings implements PersistentStateComponent, ExportableComponent { +public class PostfixTemplatesSettings implements PersistentStateComponent { public static final Factory> SET_FACTORY = () -> ContainerUtil.newHashSet(); private Map> myLangToDisabledTemplates = ContainerUtil.newHashMap(); @@ -136,16 +137,4 @@ public class PostfixTemplatesSettings implements PersistentStateComponent init { @@ -47,7 +47,7 @@ class QuickListsManager(private val myActionManager: ActionManager, schemeManage dataHolder.updateDigest(item) return item } - }) + }, presentableName = IdeBundle.message("quick.lists.presentable.name")) } companion object { @@ -56,10 +56,6 @@ class QuickListsManager(private val myActionManager: ActionManager, schemeManage get() = ApplicationManager.getApplication().getComponent(QuickListsManager::class.java) } - override fun getExportFiles() = arrayOf(mySchemeManager.rootDirectory) - - override fun getPresentableName() = IdeBundle.message("quick.lists.presentable.name")!! - override fun getComponentName() = "QuickListsManager" override fun initComponent() { diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties index d42b3dd515cb..e5cb67db67e7 100644 --- a/platform/platform-resources-en/src/messages/OptionsBundle.properties +++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties @@ -356,4 +356,7 @@ exportable.com.intellij.ide.ui.customization.CustomActionsSchema.presentable.nam exportable.ActionMacroManager.presentable.name=Macros exportable.ImportFilteringUsageViewSetting.presentable.name=Usage View: Imports exportable.XPathView.XPathViewPlugin.presentable.name=XPath Viewer -exportable.ExternalResourceManagerImpl.presentable.name=Java EE External Resources \ No newline at end of file +exportable.ExternalResourceManagerImpl.presentable.name=Java EE External Resources +exportable.JavaCodeFoldingSettings.presentable.name=Code Folding Settings +exportable.RubyI18nFoldingSettings.presentable.name=Code Folding Settings +exportable.PostfixTemplatesSettings.presentable.name=Postfix Completion \ No newline at end of file