From 8a37791ae14940fc48d094c215e03bf13ec8bc2b Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 26 Jul 2011 22:45:13 +0400 Subject: [PATCH] do not insert id for Storage when only one can be used - provide default value --- .../images/options/impl/OptionsManagerImpl.java | 4 +--- .../compiler/CompilerConfigurationImpl.java | 4 ++-- .../api/CompilerAPIConfiguration.java | 4 ++-- .../eclipse/EclipseCompilerConfiguration.java | 8 +++++--- .../EclipseEmbeddedCompilerConfiguration.java | 8 +++++--- .../javaCompiler/javac/JavacConfiguration.java | 4 ++-- .../javaCompiler/jikes/JikesConfiguration.java | 14 ++------------ .../impl/javaCompiler/jikes/JikesSettings.java | 4 ++-- .../impl/rmiCompiler/RmicConfiguration.java | 16 ++-------------- .../compiler/impl/rmiCompiler/RmicSettings.java | 4 ++-- .../impl/artifacts/ArtifactManagerImpl.java | 4 ++-- .../compiler/ArtifactsWorkspaceSettings.java | 2 +- .../compiler/CompilerWorkspaceConfiguration.java | 1 - .../debugger/settings/NodeRendererSettings.java | 1 - .../debugger/settings/ThreadsViewSettings.java | 1 - .../debugger/settings/ViewsGeneralSettings.java | 1 - .../FacetAutodetectingManagerImpl.java | 1 - .../impl/ui/FacetEditorsStateManagerImpl.java | 3 +-- .../com/intellij/ide/RecentProjectsManager.java | 1 - .../AnalyzeDependenciesSettings.java | 1 - .../impl/JavaCodeFoldingSettingsImpl.java | 1 - .../ex/EntryPointsManagerImpl.java | 2 +- .../javadoc/JavadocGenerationManager.java | 1 - .../impl/JavaAwareProjectJdkTableImpl.java | 1 - .../refactoring/JavaRefactoringSettings.java | 1 - .../src/com/intellij/slicer/SliceManager.java | 2 +- .../intellij/slicer/SliceToolwindowSettings.java | 4 ++-- .../codeInsight/NullableNotNullManager.java | 12 +++++++++--- .../codeInsight/folding/CodeFoldingSettings.java | 1 - .../logging/LogConsolePreferences.java | 1 - .../codeStyle/AppCodeStyleSettingsManager.java | 1 - .../ProjectCodeStyleSettingsManager.java | 4 ++-- .../scope/packageSet/NamedScopeManager.java | 1 - .../com/intellij/analysis/AnalysisUIOptions.java | 1 - .../printing/ExportToHTMLSettings.java | 1 - .../codeEditor/printing/PrintSettings.java | 1 - .../codeInsight/CodeInsightSettings.java | 1 - .../daemon/DaemonCodeAnalyzerSettings.java | 1 - .../analysis/HighlightingSettingsPerFile.java | 2 +- .../impl/config/IntentionManagerSettings.java | 1 - .../template/impl/TemplateSettings.java | 1 - .../AppInspectionProfilesVisibleTreeState.java | 1 - ...rojectInspectionProfilesVisibleTreeState.java | 1 - .../console/ConsoleFoldingSettings.java | 2 +- .../impl/ProjectRunConfigurationManager.java | 4 ++-- .../ui/layout/impl/RunnerLayoutSettings.java | 1 - .../src/com/intellij/facet/FacetManagerImpl.java | 1 - .../facet/impl/ProjectFacetManagerImpl.java | 6 ++++-- .../impl/invalid/InvalidFacetManagerImpl.java | 5 +++-- .../com/intellij/find/impl/FindManagerImpl.java | 1 - .../com/intellij/find/impl/FindSettingsImpl.java | 1 - .../intellij/ide/bookmarks/BookmarkManager.java | 2 +- .../ide/hierarchy/HierarchyBrowserManager.java | 6 ++++-- .../ide/impl/convert/ProjectFileVersionImpl.java | 1 - .../ide/projectView/impl/ProjectViewImpl.java | 1 - .../impl/StructureViewFactoryImpl.java | 1 - .../src/com/intellij/ide/todo/TodoView.java | 1 - .../gotoByName/GotoClassSymbolConfiguration.java | 1 - .../util/gotoByName/GotoFileConfiguration.java | 1 - .../internal/psiView/PsiViewerSettings.java | 2 +- .../DependenciesAnalyzeManager.java | 2 +- .../EnforcedPlainTextFileTypeManager.java | 2 +- .../exclude/ProjectFileExclusionManager.java | 4 ++-- .../openapi/module/impl/ModuleManagerImpl.java | 4 ++-- .../projectRoots/impl/ProjectJdkTableImpl.java | 1 - .../impl/libraries/ApplicationLibraryTable.java | 2 +- .../impl/libraries/ProjectLibraryTable.java | 4 ++-- .../DependencyUISettings.java | 1 - .../DependencyValidationManagerImpl.java | 3 +-- .../InspectionProjectProfileManager.java | 3 +-- .../com/intellij/psi/stubs/StubIndexImpl.java | 1 - .../TemplateDataLanguageMappings.java | 4 ++-- .../TemplateDataLanguagePatterns.java | 4 ++-- .../refactoring/RefactoringSettings.java | 5 ++--- .../ui/debugger/extensions/PlaybackDebugger.java | 4 ++-- .../intellij/ui/tabs/FileColorManagerImpl.java | 2 +- .../FileColorSharedConfigurationManager.java | 4 ++-- .../src/com/intellij/ide/ui/UISettings.java | 1 - .../com/intellij/openapi/components/Storage.java | 2 +- .../openapi/ui/MasterDetailsStateService.java | 1 - .../intellij/openapi/util/DimensionService.java | 1 - .../openapi/util/registry/RegistryState.java | 1 - .../com/intellij/util/net/HttpConfigurable.java | 2 +- .../FeatureUsageTrackerImpl.java | 3 --- .../ide/RecentDirectoryProjectsManager.java | 1 - .../impl/ErrorTreeViewConfiguration.java | 1 - .../config/PasswordSafeSettings.java | 1 - .../providers/masterKey/PasswordDatabase.java | 1 - .../ide/plugins/PluginManagerUISettings.java | 1 - .../src/com/intellij/ide/ui/LafManagerImpl.java | 1 - .../ide/util/AppPropertiesComponentImpl.java | 1 - .../ide/util/ProjectPropertiesComponentImpl.java | 1 - ...pplicationStatisticsPersistenceComponent.java | 3 --- .../UsageStatisticsPersistenceComponent.java | 7 +++---- .../impl/NotificationsConfiguration.java | 2 +- .../fileEditor/impl/IdeDocumentHistoryImpl.java | 2 +- .../openapi/keymap/impl/KeymapManagerImpl.java | 1 - .../updateSettings/impl/UpdateSettings.java | 1 - .../ReadonlyStatusHandlerImpl.java | 1 - .../vfs/encoding/EncodingManagerImpl.java | 2 +- .../vfs/encoding/EncodingProjectManagerImpl.java | 4 ++-- .../src/com/intellij/ui/RecentsManager.java | 1 - .../com/intellij/ui/SystemNotificationsImpl.java | 1 - .../ui/docking/impl/DockManagerImpl.java | 1 - .../export/ExportTestResultsConfiguration.java | 1 - .../com/intellij/usages/UsageViewSettings.java | 1 - .../impl/ImportFilteringUsageViewSetting.java | 3 +-- .../vcs/IssueNavigationConfiguration.java | 3 +-- .../intellij/openapi/vcs/VcsConfiguration.java | 1 - .../changes/committed/CommittedChangesCache.java | 1 - .../vcs/impl/VcsDirectoryMappingStorage.java | 3 +-- .../xdebugger/impl/XDebuggerManagerImpl.java | 1 - .../impl/settings/XDebuggerSettingsManager.java | 1 - .../plugins/intelliLang/Configuration.java | 6 +++--- .../AndroidDexCompilerConfiguration.java | 4 ++-- .../logcat/AndroidLogcatFiltersPreferences.java | 1 - .../ant/config/impl/AntConfigurationImpl.java | 4 ++-- .../config/impl/AntWorkspaceConfiguration.java | 1 - .../com/intellij/ide/commander/Commander.java | 1 - .../idea/copyright/CopyrightManager.java | 3 +-- .../UpdateCopyrightCheckinHandlerState.java | 1 - .../cvsSupport2/config/CvsConfiguration.java | 1 - .../eclipse/config/EclipseModuleManager.java | 2 -- .../tostring/GenerateToStringContext.java | 1 - .../tostring/template/TemplatesManager.java | 1 - .../branches/GitBranchConfigurations.java | 1 - .../config/GitVcsApplicationSettings.java | 4 +--- .../src/git4idea/config/GitVcsSettings.java | 1 - .../git4idea/config/SSHConnectionSettings.java | 1 - .../history/wholeTree/GitLogSettings.java | 3 +-- .../src/git4idea/remote/GitRememberedInputs.java | 2 +- .../jetbrains/plugins/github/GithubSettings.java | 1 - .../intentions/dynamic/DynamicManagerImpl.java | 6 +++--- .../compiler/GroovyCompilerConfiguration.java | 4 ++-- .../debugger/filters/GroovyDebuggerSettings.java | 1 - .../plugins/groovy/gant/GantSettings.java | 4 ++-- .../plugins/groovy/gradle/GradleSettings.java | 4 ++-- .../groovy/mvc/MvcRunTargetHistoryService.java | 2 -- .../settings/GroovyApplicationSettings.java | 1 - .../src/org/zmlx/hg4idea/HgGlobalSettings.java | 4 ++-- .../src/org/zmlx/hg4idea/HgProjectSettings.java | 2 +- .../idea/maven/execution/MavenRunner.java | 2 +- .../maven/navigator/MavenProjectsNavigator.java | 2 +- .../idea/maven/project/MavenProjectsManager.java | 2 +- .../project/MavenWorkspaceSettingsComponent.java | 2 +- .../services/MavenRepositoryServicesManager.java | 1 - .../idea/maven/tasks/MavenTasksManager.java | 2 +- .../LastSelectedPropertiesFileStore.java | 7 +++---- .../PropertiesSeparatorManager.java | 1 - .../relaxNG/config/NoNamespaceConfigImpl.java | 1 - .../settings/SpellCheckerSettings.java | 1 - .../state/CachedDictionaryState.java | 1 - .../state/ProjectDictionaryState.java | 11 ++--------- .../idea/svn/SvnApplicationSettings.java | 1 - .../idea/svn/SvnBranchConfigurationManager.java | 1 - .../idea/svn/SvnBranchMapperManager.java | 1 - .../idea/svn/SvnFileUrlMappingImpl.java | 1 - .../tasks/config/RecentTaskRepositories.java | 1 - .../com/intellij/tasks/impl/TaskManagerImpl.java | 2 +- .../tasks/impl/TaskProjectConfiguration.java | 2 +- .../uiDesigner/GuiDesignerConfiguration.java | 3 +-- .../com/intellij/uiDesigner/palette/Palette.java | 4 ++-- .../impl/FileAssociationsConfigurable.java | 2 +- .../plugins/xpathView/XPathProjectComponent.java | 1 - .../application/options/XmlSettings.java | 1 - .../options/editor/WebEditorOptions.java | 1 - .../options/editor/XmlFoldingSettings.java | 1 - .../ide/browsers/BrowsersConfiguration.java | 2 +- .../javaee/ExternalResourceManagerImpl.java | 2 +- .../com/intellij/javaee/ProjectResources.java | 4 ++-- 170 files changed, 139 insertions(+), 267 deletions(-) diff --git a/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java index c3ee0ca6a12a..5e70cc10ae09 100644 --- a/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java +++ b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java @@ -33,9 +33,7 @@ import org.jdom.Element; @State( name = "Images.OptionsManager", storages = { - @Storage( - id = "other", - file = "$APP_CONFIG$/images.support.xml") + @Storage(file = "$APP_CONFIG$/images.support.xml") } ) final class OptionsManagerImpl extends OptionsManager implements PersistentStateComponent, RoamingTypeDisabled { diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index f616a7c5febd..1884f603953b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -47,8 +47,8 @@ import java.util.*; @State( name = "CompilerConfiguration", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class CompilerConfigurationImpl extends CompilerConfiguration implements PersistentStateComponent, ProjectComponent { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerAPIConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerAPIConfiguration.java index 4092fb0e859a..b1a03b510eec 100755 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerAPIConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerAPIConfiguration.java @@ -23,8 +23,8 @@ import com.intellij.openapi.components.StorageScheme; @State( name = "CompilerAPISettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class CompilerAPIConfiguration extends JavacConfiguration { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfiguration.java index 30429fda8f0e..f9a27da8fe10 100755 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfiguration.java @@ -16,13 +16,15 @@ package com.intellij.compiler.impl.javaCompiler.eclipse; import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration; -import com.intellij.openapi.components.*; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; +import com.intellij.openapi.components.StorageScheme; @State( name = "EclipseCompilerSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class EclipseCompilerConfiguration extends JavacConfiguration { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompilerConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompilerConfiguration.java index 36ebe40f62b7..cb43d6aada0c 100755 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompilerConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompilerConfiguration.java @@ -16,13 +16,15 @@ package com.intellij.compiler.impl.javaCompiler.eclipse; import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration; -import com.intellij.openapi.components.*; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; +import com.intellij.openapi.components.StorageScheme; @State( name = "EclipseEmbeddedCompilerSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class EclipseEmbeddedCompilerConfiguration extends JavacConfiguration { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfiguration.java index bff86f55026e..7bc2aa3878bd 100755 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfiguration.java @@ -22,8 +22,8 @@ import com.intellij.util.xmlb.XmlSerializerUtil; @State( name = "JavacSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class JavacConfiguration implements PersistentStateComponent { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfiguration.java index a54359181ca1..a88ae4130c00 100755 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfiguration.java @@ -15,25 +15,15 @@ */ package com.intellij.compiler.impl.javaCompiler.jikes; -import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration; -import com.intellij.compiler.impl.javaCompiler.javac.JavacSettings; import com.intellij.openapi.components.*; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.DefaultJDOMExternalizer; -import com.intellij.openapi.util.InvalidDataException; -import com.intellij.openapi.util.WriteExternalException; import com.intellij.util.xmlb.XmlSerializerUtil; -import org.jdom.Element; -import org.jetbrains.annotations.NonNls; - -import java.util.StringTokenizer; @State( name = "JikesSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class JikesConfiguration implements PersistentStateComponent { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesSettings.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesSettings.java index 5250074ef7db..c3c60e6a62ac 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesSettings.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesSettings.java @@ -26,8 +26,8 @@ import java.util.StringTokenizer; @State( name = "JikesSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class JikesSettings extends JavacSettings { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicConfiguration.java index d81a391f1a2f..33d4f220aeb2 100755 --- a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicConfiguration.java @@ -15,27 +15,15 @@ */ package com.intellij.compiler.impl.rmiCompiler; -import com.intellij.compiler.impl.javaCompiler.jikes.JikesSettings; import com.intellij.openapi.components.*; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.DefaultJDOMExternalizer; -import com.intellij.openapi.util.InvalidDataException; -import com.intellij.openapi.util.WriteExternalException; -import com.intellij.util.ArrayUtil; import com.intellij.util.xmlb.XmlSerializerUtil; -import org.jdom.Element; -import org.jetbrains.annotations.NonNls; - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; @State( name = "RmicSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class RmicConfiguration implements PersistentStateComponent { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicSettings.java b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicSettings.java index 78d3d6370f7e..cb0b6d24cc77 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicSettings.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicSettings.java @@ -29,8 +29,8 @@ import java.util.StringTokenizer; @State( name = "RmicSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class RmicSettings extends JavacSettings { diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java index d02cbcf99906..3ca690f67147 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java @@ -46,8 +46,8 @@ import java.util.*; @State( name = ArtifactManagerImpl.COMPONENT_NAME, storages = { - @Storage(id = "other", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/artifacts/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ArtifactManagerStateSplitter.class) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/artifacts/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ArtifactManagerStateSplitter.class) } ) public class ArtifactManagerImpl extends ArtifactManager implements ProjectComponent, PersistentStateComponent { diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsWorkspaceSettings.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsWorkspaceSettings.java index 1f078659493f..5438c1109379 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsWorkspaceSettings.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsWorkspaceSettings.java @@ -37,7 +37,7 @@ import java.util.List; */ @State(name = "ArtifactsWorkspaceSettings", storages = { - @Storage(id = "other", file = "$WORKSPACE_FILE$") + @Storage( file = "$WORKSPACE_FILE$") }) public class ArtifactsWorkspaceSettings implements PersistentStateComponent { private ArtifactsWorkspaceSettingsState myState = new ArtifactsWorkspaceSettingsState(); diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java index 066599eec6fa..84b9b4b53629 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java +++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java @@ -30,7 +30,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "CompilerWorkspaceConfiguration", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java index 11d65b5f9760..5d70676c68cc 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java @@ -55,7 +55,6 @@ import java.util.List; name="NodeRendererSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/debugger.renderers.xml" )} ) diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java index 7125ca37d8c4..cefb6894c3d8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java @@ -25,7 +25,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name="ThreadsViewSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/debugger.threadsview.xml" )} ) diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java index 01ca44908b16..6558a3f97422 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java @@ -28,7 +28,6 @@ import org.jdom.Element; name="ViewsSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/debugger.frameview.xml" )} ) diff --git a/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java index ac114322ae6b..9bf00c07c103 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java +++ b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java @@ -56,7 +56,6 @@ import java.util.*; name = FacetAutodetectingManagerImpl.COMPONENT_NAME, storages = { @Storage( - id="other", file = "$PROJECT_FILE$" ) } diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java index 4233bc4211d2..4a5385e0a463 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java @@ -21,8 +21,8 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.util.xmlb.XmlSerializer; import com.intellij.util.xmlb.annotations.MapAnnotation; -import com.intellij.util.xmlb.annotations.Tag; import com.intellij.util.xmlb.annotations.Property; +import com.intellij.util.xmlb.annotations.Tag; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,7 +37,6 @@ import java.util.Map; name = "FacetEditorsStateManager", storages = { @Storage( - id = "other", file = "$WORKSPACE_FILE$" ) } diff --git a/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java b/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java index 91c3ebb1e629..c3ff4043ae1e 100644 --- a/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java +++ b/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java @@ -30,7 +30,6 @@ import java.io.File; roamingType = RoamingType.DISABLED, storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesSettings.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesSettings.java index d0dc1d79d0ed..53b9f7640641 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesSettings.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesSettings.java @@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project; @State( name = "AnalyzeDependenciesSettings", storages = {@Storage( - id = "ws", file = "$WORKSPACE_FILE$")}) public class AnalyzeDependenciesSettings implements PersistentStateComponent { /** 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 1d61a3230cdb..d1b5d6c516c2 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 @@ -32,7 +32,6 @@ import java.io.File; name="JavaCodeFoldingSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/editor.codeinsight.xml" )} ) diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java index cb31487a1939..d9ae487120db 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java @@ -53,7 +53,7 @@ import java.util.*; @State( name = "EntryPointsManager", - storages = {@Storage(id = "default", file = "$PROJECT_FILE$")} + storages = {@Storage( file = "$PROJECT_FILE$")} ) public class EntryPointsManagerImpl implements PersistentStateComponent, EntryPointsManager { @NonNls private static final String[] STANDARD_ANNOS = { diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java index 27e0964f5be1..a48e1d87ccf6 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java @@ -37,7 +37,6 @@ import org.jetbrains.annotations.NotNull; @State(name = "JavadocGenerationManager", storages = { @Storage( - id="other", file = "$PROJECT_FILE$" ) } diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java index 25c66a44db93..69c59c5b088d 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java @@ -37,7 +37,6 @@ import org.jdom.Element; roamingType = RoamingType.DISABLED, storages= { @Storage( - id="other", file = "$APP_CONFIG$/jdk.table.xml" )} ) diff --git a/java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java b/java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java index 872dd38eb888..912ddee79898 100644 --- a/java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java +++ b/java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java @@ -25,7 +25,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "RefactoringSettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/java/java-impl/src/com/intellij/slicer/SliceManager.java b/java/java-impl/src/com/intellij/slicer/SliceManager.java index 566402b9b8e3..e032ce166f24 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceManager.java +++ b/java/java-impl/src/com/intellij/slicer/SliceManager.java @@ -40,7 +40,7 @@ import java.util.regex.Pattern; @State( name = "SliceManager", - storages = {@Storage(id = "other", file = "$WORKSPACE_FILE$")} + storages = {@Storage( file = "$WORKSPACE_FILE$")} ) public class SliceManager implements PersistentStateComponent { private final Project myProject; diff --git a/java/java-impl/src/com/intellij/slicer/SliceToolwindowSettings.java b/java/java-impl/src/com/intellij/slicer/SliceToolwindowSettings.java index 3b5a9b8ac548..96adfe60876b 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceToolwindowSettings.java +++ b/java/java-impl/src/com/intellij/slicer/SliceToolwindowSettings.java @@ -16,15 +16,15 @@ package com.intellij.slicer; 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.components.ServiceManager; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @State( name = "SliceToolwindowSettings", - storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")} + storages = {@Storage( file = "$WORKSPACE_FILE$")} ) public class SliceToolwindowSettings implements PersistentStateComponent { private boolean isPreview; diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java index ad17820b7926..7325311fa625 100644 --- a/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java +++ b/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java @@ -21,12 +21,18 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.DefaultJDOMExternalizer; +import com.intellij.openapi.util.InvalidDataException; +import com.intellij.openapi.util.JDOMExternalizableStringList; +import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.PsiModifierListOwner; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * User: anna @@ -34,7 +40,7 @@ import java.util.*; */ @State( name = "NullableNotNullManager", - storages = {@Storage(id = "default", file = "$PROJECT_FILE$")} + storages = {@Storage( file = "$PROJECT_FILE$")} ) public class NullableNotNullManager implements PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#" + NullableNotNullManager.class.getName()); diff --git a/platform/lang-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java b/platform/lang-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java index 3c356c6a7683..09b12e317fef 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java +++ b/platform/lang-api/src/com/intellij/codeInsight/folding/CodeFoldingSettings.java @@ -31,7 +31,6 @@ import java.io.File; name="CodeFoldingSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/editor.codeinsight.xml" )} ) diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java b/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java index fdb82ea8b889..22fb96f49210 100644 --- a/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java +++ b/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java @@ -42,7 +42,6 @@ import java.util.regex.Pattern; @State( name = "LogFilters", storages = {@Storage( - id = "LogFilters", file = "$WORKSPACE_FILE$")}) @SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod"}) public class LogConsolePreferences extends LogFilterRegistrar { diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java index 6befb7582704..4d004644a7d9 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java @@ -24,7 +24,6 @@ import com.intellij.openapi.components.Storage; name = "CodeStyleSettingsManager", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java index d5c2ffef9dda..3d5ba6b43a67 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java @@ -24,8 +24,8 @@ import com.intellij.openapi.components.StorageScheme; @State( name = "CodeStyleSettingsManager", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/projectCodeStyle.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/projectCodeStyle.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class ProjectCodeStyleSettingsManager extends CodeStyleSettingsManager{ diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java b/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java index 1b272c33ee03..8925eea0a762 100644 --- a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java +++ b/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java @@ -28,7 +28,6 @@ import javax.swing.*; name="NamedScopeManager", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java b/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java index 7fb4db60a591..23c472d1fd71 100644 --- a/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java +++ b/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java @@ -39,7 +39,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "AnalysisUIOptions", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLSettings.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLSettings.java index d86f2e4ed7db..83922f0a5d46 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLSettings.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLSettings.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.NonNls; name = "ExportToHTMLSettings", storages = { @Storage( - id ="other", file = "$PROJECT_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintSettings.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintSettings.java index 00594b6e8178..c457ead8cf69 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintSettings.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintSettings.java @@ -31,7 +31,6 @@ import java.io.File; name="PrintSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/print.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java index d08d346ce5f8..e082d3389f2a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java @@ -38,7 +38,6 @@ import java.util.List; name = "CodeInsightSettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/editor.codeinsight.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/DaemonCodeAnalyzerSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/DaemonCodeAnalyzerSettings.java index 6bb75f5d667a..c93f46603f9d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/DaemonCodeAnalyzerSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/DaemonCodeAnalyzerSettings.java @@ -34,7 +34,6 @@ import java.io.File; name="DaemonCodeAnalyzerSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/editor.codeinsight.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java index 8fd4e211dd58..0a71e917e7f5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -@State(name="HighlightingSettingsPerFile", storages = @Storage(id = "other", file ="$WORKSPACE_FILE$")) +@State(name="HighlightingSettingsPerFile", storages = @Storage( file ="$WORKSPACE_FILE$")) public class HighlightingSettingsPerFile implements PersistentStateComponent { @NonNls private static final String SETTING_TAG = "setting"; @NonNls private static final String ROOT_ATT_PREFIX = "root"; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerSettings.java index 1dac58177564..983318f47426 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionManagerSettings.java @@ -47,7 +47,6 @@ import java.util.regex.Pattern; name = "IntentionManagerSettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/intentionSettings.xml" )} ) 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 a5b40e8b27f5..1b75bffe17a8 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 @@ -48,7 +48,6 @@ import java.util.*; name="TemplateSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/AppInspectionProfilesVisibleTreeState.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/AppInspectionProfilesVisibleTreeState.java index bcb043ded7e9..ec8cfd63e7cb 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/AppInspectionProfilesVisibleTreeState.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/AppInspectionProfilesVisibleTreeState.java @@ -26,7 +26,6 @@ import com.intellij.openapi.components.Storage; name = "AppInspectionProfilesVisibleTreeState", storages = { @Storage( - id="other", file = "$OPTIONS$/other.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/ProjectInspectionProfilesVisibleTreeState.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/ProjectInspectionProfilesVisibleTreeState.java index d7c90387150d..d9f3237371d4 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/ProjectInspectionProfilesVisibleTreeState.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/ProjectInspectionProfilesVisibleTreeState.java @@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project; name = "ProjectInspectionProfilesVisibleTreeState", storages = { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java index cc91e1a703ff..9018204b88de 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java @@ -14,7 +14,7 @@ import java.util.Set; /** * @author peter */ -@State(name="ConsoleFoldingSettings", storages=@Storage(id = "other", file = "$APP_CONFIG$/consoleFolding.xml")) +@State(name="ConsoleFoldingSettings", storages=@Storage( file = "$APP_CONFIG$/consoleFolding.xml")) public class ConsoleFoldingSettings implements PersistentStateComponent { private final List myPositivePatterns = new ArrayList(); private final List myNegativePatterns = new ArrayList(); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java index 9f801349cc63..4c20dab810ee 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java @@ -44,8 +44,8 @@ import java.util.Set; @State( name = "ProjectRunConfigurationManager", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/runConfigurations/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectRunConfigurationManager.RunConfigurationStateSplitter.class) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/runConfigurations/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectRunConfigurationManager.RunConfigurationStateSplitter.class) } ) public class ProjectRunConfigurationManager implements ProjectComponent, PersistentStateComponent { diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutSettings.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutSettings.java index d264fc6493f8..9afbf067ff04 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutSettings.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutSettings.java @@ -29,7 +29,6 @@ import java.util.Map; @State( name = "RunnerLayoutSettings", storages = {@Storage( - id = "other", file = "$APP_CONFIG$/runner.layout.xml")}) public class RunnerLayoutSettings implements PersistentStateComponent { public static RunnerLayoutSettings getInstance() { diff --git a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java index 9d79a0668894..451c3a505bed 100644 --- a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java @@ -48,7 +48,6 @@ import java.util.*; name = FacetManagerImpl.COMPONENT_NAME, storages = { @Storage( - id = "default", file = "$MODULE_FILE$" ) } diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java index b55907cf42b5..6481b83a4f53 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java @@ -32,7 +32,10 @@ import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author nik @@ -41,7 +44,6 @@ import java.util.*; name = ProjectFacetManagerImpl.COMPONENT_NAME, storages = { @Storage( - id="other", file="$PROJECT_FILE$" ) } diff --git a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetManagerImpl.java index bb8adc8e4420..7ffe6ac28e2a 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetManagerImpl.java @@ -25,7 +25,9 @@ import com.intellij.util.xmlb.annotations.AbstractCollection; import com.intellij.util.xmlb.annotations.Tag; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author nik @@ -34,7 +36,6 @@ import java.util.*; name = "InvalidFacetManager", storages = { @Storage( - id = "other", file = "$WORKSPACE_FILE$" ) } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java index f8fc81aaeb04..2a5d75e38389 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java @@ -79,7 +79,6 @@ import java.util.regex.PatternSyntaxException; name = "FindManager", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java index 9011378ad8bf..9780a81ce23e 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java @@ -38,7 +38,6 @@ import java.util.List; name = "FindSettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java index cb23ca337c0a..e948cc9fc232 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java @@ -41,7 +41,7 @@ import java.util.List; @State( name = "BookmarkManager", storages = { - @Storage(id = "default", file = "$WORKSPACE_FILE$") + @Storage( file = "$WORKSPACE_FILE$") } ) public class BookmarkManager implements PersistentStateComponent { diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java index 8369f5037539..9393f609d3fa 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java @@ -23,14 +23,16 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.IconLoader; -import com.intellij.openapi.wm.*; +import com.intellij.openapi.wm.ToolWindow; +import com.intellij.openapi.wm.ToolWindowAnchor; +import com.intellij.openapi.wm.ToolWindowId; +import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.ui.content.ContentManager; @State( name="HierarchyBrowserManager", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/ide/impl/convert/ProjectFileVersionImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/convert/ProjectFileVersionImpl.java index 008cf52d4352..957a5285cbe6 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/convert/ProjectFileVersionImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/convert/ProjectFileVersionImpl.java @@ -35,7 +35,6 @@ import org.jetbrains.annotations.NotNull; name = ProjectFileVersionImpl.COMPONENT_NAME, storages = { @Storage( - id="other", file = "$PROJECT_FILE$" ) } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index cd13f6fc89ba..3ca81af7f4aa 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -114,7 +114,6 @@ import java.util.List; name="ProjectView", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java b/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java index 86a7ae19162d..18f50d1dca1c 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java @@ -49,7 +49,6 @@ import java.util.HashSet; name="StructureViewFactory", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java index 566ea076569a..f86deb45ca37 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java @@ -57,7 +57,6 @@ import java.util.List; name="TodoView", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java index 846ae7cba592..69503f8aa4ce 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java @@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project; @State( name = "GotoClassSymbolConfiguration", storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class GotoClassSymbolConfiguration extends ChooseByNameFilterConfiguration { public static GotoClassSymbolConfiguration getInstance(Project project) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java index 2e543dc148aa..37ddd4591c58 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java @@ -30,7 +30,6 @@ import com.intellij.openapi.project.Project; @State( name = "GotoFileConfiguration", storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class GotoFileConfiguration extends ChooseByNameFilterConfiguration { /** diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerSettings.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerSettings.java index 83282b2563c2..27f63cf29937 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerSettings.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerSettings.java @@ -26,7 +26,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil; */ @State( name = "PsiViewerSettings", - storages = {@Storage(id = "other",file = "$APP_CONFIG$/other.xml")}) + storages = {@Storage(file = "$APP_CONFIG$/other.xml")}) public class PsiViewerSettings implements PersistentStateComponent { public boolean showWhiteSpaces = true; public boolean showTreeNodes = true; diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java b/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java index 06a7b8e5288a..556c37813b89 100644 --- a/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java +++ b/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java @@ -37,7 +37,7 @@ import com.intellij.ui.content.ContentManager; */ @State( name = "DependenciesAnalyzeManager", - storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")} + storages = {@Storage( file = "$WORKSPACE_FILE$")} ) public class DependenciesAnalyzeManager implements PersistentStateComponent { private final Project myProject; diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java index bd96809b3c26..19128cfa737b 100644 --- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java @@ -33,7 +33,7 @@ import com.intellij.util.indexing.FileBasedIndex; /** * @author Rustam Vishnyakov */ -@State(name = "EnforcedPlainTextFileTypeManager", storages = {@Storage(id = "default", file = "$APP_CONFIG$/plainTextFiles.xml")}) +@State(name = "EnforcedPlainTextFileTypeManager", storages = {@Storage( file = "$APP_CONFIG$/plainTextFiles.xml")}) public class EnforcedPlainTextFileTypeManager extends PersistentFileSetManager { public boolean isMarkedAsPlainText(VirtualFile file) { diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java index d5b0152c1e28..fcf5ea70732b 100644 --- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectFileExclusionManager.java @@ -26,12 +26,12 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.Collection; /** * @author Rustam Vishnyakov */ -@State(name = "ProjectFileExclusionManager", storages = {@Storage(id = "default", file = "$PROJECT_FILE$")}) +@State(name = "ProjectFileExclusionManager", storages = {@Storage( file = "$PROJECT_FILE$")}) public class ProjectFileExclusionManager extends PersistentFileSetManager { diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java index 214863e04f1a..b626c8141747 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java @@ -69,8 +69,8 @@ import java.util.*; @State( name = ModuleManagerImpl.COMPONENT_NAME, storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/modules.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/modules.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class ModuleManagerImpl extends ModuleManager implements ProjectComponent, PersistentStateComponent, ModificationTracker { diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java index da04e4a9c040..755d4a6207be 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java @@ -49,7 +49,6 @@ import java.util.Map; roamingType = RoamingType.DISABLED, storages= { @Storage( - id="other", file = "$APP_CONFIG$/jdk.table.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ApplicationLibraryTable.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ApplicationLibraryTable.java index de609c422860..deca37cdec88 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ApplicationLibraryTable.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ApplicationLibraryTable.java @@ -32,7 +32,7 @@ import java.io.File; name = "libraryTable", roamingType = RoamingType.DISABLED, storages = { - @Storage(id = "default", file = "$OPTIONS$/applicationLibraries.xml") + @Storage( file = "$OPTIONS$/applicationLibraries.xml") } ) public class ApplicationLibraryTable extends LibraryTableBase implements ExportableComponent { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java index 862ba73902a5..b840b2b51e71 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java @@ -37,8 +37,8 @@ import java.util.List; @State( name = "libraryTable", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/libraries/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectLibraryTable.LibraryStateSplitter.class) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/libraries/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectLibraryTable.LibraryStateSplitter.class) } ) public class ProjectLibraryTable extends LibraryTableBase { diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/DependencyUISettings.java b/platform/lang-impl/src/com/intellij/packageDependencies/DependencyUISettings.java index 2956febdde51..a6e438a3c6d0 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/DependencyUISettings.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/DependencyUISettings.java @@ -28,7 +28,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "DependencyUISettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java b/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java index 08b8a0ee7f20..be6df3e9c249 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java @@ -49,9 +49,8 @@ import java.util.*; name="DependencyValidationManager", storages= { @Storage( - id="other", file = "$PROJECT_FILE$" - ), @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/scopes/", scheme = StorageScheme.DIRECTORY_BASED, + ), @Storage( file = "$PROJECT_CONFIG_DIR$/scopes/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = DependencyValidationManagerImpl.ScopesStateSplitter.class)} ) public class DependencyValidationManagerImpl extends DependencyValidationManager { diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java index 6789471004b1..68be7d3890b8 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java @@ -54,10 +54,9 @@ import java.util.concurrent.ConcurrentHashMap; name = "InspectionProjectProfileManager", storages = { @Storage( - id ="default", file = "$PROJECT_FILE$" ) - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/inspectionProfiles/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = InspectionProjectProfileManager.ProfileStateSplitter.class) + ,@Storage( file = "$PROJECT_CONFIG_DIR$/inspectionProfiles/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = InspectionProjectProfileManager.ProfileStateSplitter.class) } ) public class InspectionProjectProfileManager extends DefaultProjectProfileManager implements SeverityProvider, ProjectComponent, PersistentStateComponent { diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java index 724a9cf8c945..453220e66a75 100644 --- a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java @@ -61,7 +61,6 @@ import java.util.concurrent.locks.Lock; roamingType = RoamingType.DISABLED, storages = { @Storage( - id = "stubIndex", file = "$APP_CONFIG$/stubIndex.xml") } ) diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageMappings.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageMappings.java index 5ed491e3c017..773276743adb 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageMappings.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageMappings.java @@ -37,8 +37,8 @@ import java.util.List; @State( name = "TemplateDataLanguageMappings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/templateLanguages.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/templateLanguages.xml", scheme = StorageScheme.DIRECTORY_BASED) }) public class TemplateDataLanguageMappings extends LanguagePerFileMappings { diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguagePatterns.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguagePatterns.java index 7dd04527dd45..84781ed998dc 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguagePatterns.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguagePatterns.java @@ -28,8 +28,8 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Function; import gnu.trove.THashMap; import org.jdom.Element; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.Nullable; import java.util.List; @@ -38,7 +38,7 @@ import java.util.List; */ @State( name = "TemplateDataLanguagePatterns", - storages = @Storage(id="default", file = "$OPTIONS$/templateLanguages.xml") ) + storages = @Storage(file = "$OPTIONS$/templateLanguages.xml") ) public class TemplateDataLanguagePatterns implements PersistentStateComponent { private FileTypeAssocTable myAssocTable = new FileTypeAssocTable(); @NonNls private static final String SEPARATOR = ";"; diff --git a/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java b/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java index 37d28ecb1818..6c66232b2255 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java +++ b/platform/lang-impl/src/com/intellij/refactoring/RefactoringSettings.java @@ -16,10 +16,10 @@ package com.intellij.refactoring; -import com.intellij.openapi.components.State; -import com.intellij.openapi.components.Storage; 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.util.xmlb.XmlSerializerUtil; /** @@ -29,7 +29,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "BaseRefactoringSettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java index efc048410b4a..25ecd9392179 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java @@ -53,7 +53,8 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import java.io.*; +import java.io.File; +import java.io.IOException; public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.StatusCallback { @@ -456,7 +457,6 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta name = "PlaybackDebugger", storages = { @Storage( - id = "other", file="$APP_CONFIG$/other.xml")} ) public static class PlaybackDebuggerState implements PersistentStateComponent { diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java index 2f6866f58737..2fc9cb6daad4 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java @@ -44,7 +44,7 @@ import java.util.List; */ @State( name = "FileColors", - storages = {@Storage(id = "other", file = "$WORKSPACE_FILE$")}) + storages = {@Storage( file = "$WORKSPACE_FILE$")}) public class FileColorManagerImpl extends FileColorManager implements PersistentStateComponent { public static final String FC_ENABLED = "FileColorsEnabled"; public static final String FC_TABS_ENABLED = "FileColorsForTabsEnabled"; diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java index b988be5e504a..27b576ea200b 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java @@ -31,8 +31,8 @@ import org.jetbrains.annotations.NotNull; @State( name="SharedFileColors", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "other", file = "$PROJECT_CONFIG_DIR$/fileColors.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/fileColors.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class FileColorSharedConfigurationManager implements PersistentStateComponent { diff --git a/platform/platform-api/src/com/intellij/ide/ui/UISettings.java b/platform/platform-api/src/com/intellij/ide/ui/UISettings.java index 99dccb725823..8eb300e2ff5b 100644 --- a/platform/platform-api/src/com/intellij/ide/ui/UISettings.java +++ b/platform/platform-api/src/com/intellij/ide/ui/UISettings.java @@ -43,7 +43,6 @@ import java.util.Map; name = "UISettings", storages = { @Storage( - id ="uilnf", file = "$APP_CONFIG$/ui.lnf.xml" )} ) diff --git a/platform/platform-api/src/com/intellij/openapi/components/Storage.java b/platform/platform-api/src/com/intellij/openapi/components/Storage.java index 8b79e6d24c4d..b3b655987dc6 100644 --- a/platform/platform-api/src/com/intellij/openapi/components/Storage.java +++ b/platform/platform-api/src/com/intellij/openapi/components/Storage.java @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface Storage { - @NonNls String id(); + @NonNls String id() default "default"; boolean isDefault() default true; @NonNls String file() default ""; StorageScheme scheme() default StorageScheme.DEFAULT; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsStateService.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsStateService.java index a76d2cf819f2..ed99cb3be9ac 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsStateService.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsStateService.java @@ -41,7 +41,6 @@ import java.util.*; name="masterDetails", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java b/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java index ae2e32d2dba0..7d60581d48f4 100644 --- a/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java +++ b/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java @@ -44,7 +44,6 @@ import java.util.Map; @State( name = "DimensionService", storages = {@Storage( - id = "other", file = "$APP_CONFIG$/options.xml")}) public class DimensionService implements PersistentStateComponent, ApplicationComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.DimensionService"); diff --git a/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java b/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java index e56d3bc9cb71..69b5aca48102 100644 --- a/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java +++ b/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java @@ -26,7 +26,6 @@ import org.jetbrains.annotations.NotNull; name = "Registry", storages = { @Storage( - id = "other", file="$APP_CONFIG$/other.xml")} ) public class RegistryState implements BaseComponent, PersistentStateComponent { diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java index 54511e8db2b4..d5c81155d018 100644 --- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java +++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java @@ -43,7 +43,7 @@ import java.net.*; @State( name = "HttpConfigurable", storages = { - @Storage(id = "other", file = "$APP_CONFIG$/other.xml") + @Storage( file = "$APP_CONFIG$/other.xml") } ) public class HttpConfigurable implements PersistentStateComponent, JDOMExternalizable { diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java b/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java index 3cc76b37d269..cae142f6537a 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java @@ -19,11 +19,9 @@ import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; -import com.intellij.util.ArrayUtil; import org.jdom.Element; import org.jetbrains.annotations.NonNls; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -31,7 +29,6 @@ import java.util.Set; @State( name = "FeatureUsageStatistics", storages = {@Storage( - id = "other", file = "$APP_CONFIG$/feature.usage.statistics.xml")}) public class FeatureUsageTrackerImpl extends FeatureUsageTracker implements PersistentStateComponent { private static final int HOUR = 1000 * 60 * 60; diff --git a/platform/platform-impl/src/com/intellij/ide/RecentDirectoryProjectsManager.java b/platform/platform-impl/src/com/intellij/ide/RecentDirectoryProjectsManager.java index 5e9d9ccb7ca2..7ff782bd244e 100644 --- a/platform/platform-impl/src/com/intellij/ide/RecentDirectoryProjectsManager.java +++ b/platform/platform-impl/src/com/intellij/ide/RecentDirectoryProjectsManager.java @@ -36,7 +36,6 @@ import org.jetbrains.annotations.Nullable; roamingType = RoamingType.DISABLED, storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorTreeViewConfiguration.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorTreeViewConfiguration.java index f4524c13f1dd..63ce1284e76d 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorTreeViewConfiguration.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/impl/ErrorTreeViewConfiguration.java @@ -27,7 +27,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "ErrorTreeViewConfiguration", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeSettings.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeSettings.java index 01bcbacf4946..f5a153e42654 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeSettings.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeSettings.java @@ -28,7 +28,6 @@ import com.intellij.openapi.components.Storage; @State( name = "PasswordSafe", storages = {@Storage( - id = "PasswordSafe", file = "$APP_CONFIG$/security.xml")}) public class PasswordSafeSettings implements PersistentStateComponent { /** diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordDatabase.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordDatabase.java index 039f1166a6f7..bd8f28eef7bb 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordDatabase.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordDatabase.java @@ -35,7 +35,6 @@ import java.util.TreeMap; @State( name = "PasswordDatabase", storages = {@Storage( - id = "PasswordDatabase", file = "$APP_CONFIG$/security.xml")}) public class PasswordDatabase implements PersistentStateComponent { /** diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java index 81e88bbcbf8d..ad456135bd93 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java @@ -37,7 +37,6 @@ import javax.swing.*; name = "PluginManagerConfigurable", storages = { @Storage( - id = "other", file = "$APP_CONFIG$/other.xml") } ) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java index fc04cfd7a187..2592bde3c25c 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java @@ -77,7 +77,6 @@ import java.util.HashMap; name = "LafManager", roamingType = RoamingType.PER_PLATFORM, storages = {@Storage( - id = "other", file = "$APP_CONFIG$/options.xml")}) public final class LafManagerImpl extends LafManager implements ApplicationComponent, PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ui.LafManager"); diff --git a/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java b/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java index 0262bc99e35a..d73725ebbb77 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java @@ -22,7 +22,6 @@ import com.intellij.openapi.components.Storage; @State( name = "PropertiesComponent", storages = {@Storage( - id = "other", file = "$APP_CONFIG$/options.xml")}) public class AppPropertiesComponentImpl extends PropertiesComponentImpl implements ApplicationComponent { public void disposeComponent() { diff --git a/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java b/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java index 25ecfaf75cb8..fcd0fd0baba4 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java @@ -22,7 +22,6 @@ import com.intellij.openapi.components.Storage; @State( name = "PropertiesComponent", storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class ProjectPropertiesComponentImpl extends PropertiesComponentImpl implements ProjectComponent { public void projectClosed() { diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistenceComponent.java b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistenceComponent.java index efab7c59fead..e241f2139cc9 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistenceComponent.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistenceComponent.java @@ -21,7 +21,6 @@ import com.intellij.internal.statistic.AbstractApplicationUsagesCollector; import com.intellij.internal.statistic.UsagesCollector; import com.intellij.internal.statistic.beans.GroupDescriptor; import com.intellij.internal.statistic.beans.UsageDescriptor; -import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.components.ApplicationComponent; @@ -32,7 +31,6 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerListener; -import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; @@ -51,7 +49,6 @@ import java.util.Set; name = "StatisticsApplicationUsages", storages = { @Storage( - id = "statistics.application.usages", file = "$APP_CONFIG$/statistics.application.usages.xml" )} ) diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java index d1d9e916b956..d840a0f88994 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java @@ -16,6 +16,9 @@ package com.intellij.internal.statistic.persistence; +import com.intellij.internal.statistic.beans.ConvertUsagesUtil; +import com.intellij.internal.statistic.beans.GroupDescriptor; +import com.intellij.internal.statistic.beans.UsageDescriptor; import com.intellij.internal.statistic.configurable.SendPeriod; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationManagerEx; @@ -23,9 +26,6 @@ import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; -import com.intellij.internal.statistic.beans.ConvertUsagesUtil; -import com.intellij.internal.statistic.beans.GroupDescriptor; -import com.intellij.internal.statistic.beans.UsageDescriptor; import com.intellij.openapi.util.text.StringUtil; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -40,7 +40,6 @@ import java.util.Set; name = "UsagesStatistic", storages = { @Storage( - id = "usages", file = "$APP_CONFIG$/usage.statistics.xml" )} ) diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfiguration.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfiguration.java index 3855a32c5e1a..63d093fd2083 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfiguration.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfiguration.java @@ -40,7 +40,7 @@ import java.util.*; * @author spleaner */ @State(name = "NotificationConfiguration", - storages = {@Storage(id = "other", file = "$APP_CONFIG$/notifications.xml")}) + storages = {@Storage( file = "$APP_CONFIG$/notifications.xml")}) public class NotificationsConfiguration implements ApplicationComponent, Notifications, PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.notification.impl.NotificationsConfiguration"); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java index 37885441e252..e3b977545f29 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java @@ -46,7 +46,7 @@ import java.util.*; @State( name = "IdeDocumentHistory", - storages = {@Storage(id = "other", file = "$WORKSPACE_FILE$")} + storages = {@Storage( file = "$WORKSPACE_FILE$")} ) public class IdeDocumentHistoryImpl extends IdeDocumentHistory implements ProjectComponent, PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl"); 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 db2c48bc5a07..d55e7f71619e 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 @@ -44,7 +44,6 @@ import java.util.*; roamingType = RoamingType.PER_PLATFORM, storages = { @Storage( - id="keymap", file = "$APP_CONFIG$/keymap.xml" )} ) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java index 44742d93dceb..1784b6ce1402 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java @@ -38,7 +38,6 @@ import java.util.List; name = "UpdatesConfigurable", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java index bbbf3377917b..1147457f8939 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java @@ -37,7 +37,6 @@ import java.util.*; name="ReadonlyStatusHandler", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java index 2933ac43550c..770e8bee021e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java @@ -65,7 +65,7 @@ import java.util.Set; @State( name = "Encoding", storages = { - @Storage(id = "Encoding", file = "$APP_CONFIG$/encoding.xml") + @Storage( file = "$APP_CONFIG$/encoding.xml") } ) public class EncodingManagerImpl extends EncodingManager implements PersistentStateComponent, Disposable { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java index 43499ac57170..6f041e476ef2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java @@ -53,8 +53,8 @@ import java.util.*; @State( name = "Encoding", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/encodings.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/encodings.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class EncodingProjectManagerImpl extends EncodingProjectManager { diff --git a/platform/platform-impl/src/com/intellij/ui/RecentsManager.java b/platform/platform-impl/src/com/intellij/ui/RecentsManager.java index deea9c065d26..7014381d937a 100644 --- a/platform/platform-impl/src/com/intellij/ui/RecentsManager.java +++ b/platform/platform-impl/src/com/intellij/ui/RecentsManager.java @@ -34,7 +34,6 @@ import java.util.*; name="RecentsManager", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/platform-impl/src/com/intellij/ui/SystemNotificationsImpl.java b/platform/platform-impl/src/com/intellij/ui/SystemNotificationsImpl.java index 07c087eebdd3..d2699fc14dfd 100644 --- a/platform/platform-impl/src/com/intellij/ui/SystemNotificationsImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/SystemNotificationsImpl.java @@ -32,7 +32,6 @@ import java.util.Set; name = "SystemNotifications", storages = { @Storage( - id="SystemNotifications", file="$APP_CONFIG$/other.xml" )} ) diff --git a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java index 0c6429ae9edc..a12d6090495d 100644 --- a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java @@ -63,7 +63,6 @@ import java.util.List; @State( name = "DockManager", storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class DockManagerImpl extends DockManager implements PersistentStateComponent{ diff --git a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsConfiguration.java b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsConfiguration.java index f82cb0c86e1b..9f8c186c4d9d 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsConfiguration.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsConfiguration.java @@ -25,7 +25,6 @@ import com.intellij.util.xmlb.annotations.Attribute; @State( name = "ExportTestResults", storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class ExportTestResultsConfiguration implements PersistentStateComponent { diff --git a/platform/usageView/src/com/intellij/usages/UsageViewSettings.java b/platform/usageView/src/com/intellij/usages/UsageViewSettings.java index a5de4380aa78..eaf4c5324d43 100644 --- a/platform/usageView/src/com/intellij/usages/UsageViewSettings.java +++ b/platform/usageView/src/com/intellij/usages/UsageViewSettings.java @@ -29,7 +29,6 @@ import java.io.File; name = "UsageViewSettings", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java b/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java index 547621b4f3f0..f0d711981dd6 100644 --- a/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java +++ b/platform/usageView/src/com/intellij/usages/impl/ImportFilteringUsageViewSetting.java @@ -16,9 +16,9 @@ package com.intellij.usages.impl; 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.components.ServiceManager; import com.intellij.util.xmlb.XmlSerializerUtil; /** @@ -28,7 +28,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "ImportFilteringUsageViewSetting", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java index fb12c0577164..179edbfe8397 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java @@ -40,10 +40,9 @@ import java.util.regex.Pattern; name = "IssueNavigationConfiguration", storages = { @Storage( - id ="other", file = "$PROJECT_FILE$" ) - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) + ,@Storage( file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class IssueNavigationConfiguration implements PersistentStateComponent { diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java index b8ecb87cb8bb..a52d33bb6e60 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java @@ -45,7 +45,6 @@ import java.util.List; name = "VcsManagerConfiguration", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" ) } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java index a70e6e7f6d72..d2fba93217b0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java @@ -63,7 +63,6 @@ import java.util.concurrent.TimeUnit; roamingType = RoamingType.DISABLED, storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsDirectoryMappingStorage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsDirectoryMappingStorage.java index 15ecb8ff85ad..b3a0965fe550 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsDirectoryMappingStorage.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsDirectoryMappingStorage.java @@ -30,10 +30,9 @@ import org.jetbrains.annotations.NotNull; name = "VcsDirectoryMappings", storages = { @Storage( - id ="other", file = "$PROJECT_FILE$" ) - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) + ,@Storage( file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class VcsDirectoryMappingStorage extends AbstractProjectComponent implements PersistentStateComponent { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java index 63d6f735f195..51dec9f5a9e5 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java @@ -61,7 +61,6 @@ import java.util.*; @State( name = XDebuggerManagerImpl.COMPONENT_NAME, storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectComponent, PersistentStateComponent { @NonNls public static final String COMPONENT_NAME = "XDebuggerManager"; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingsManager.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingsManager.java index 7b37e5f2071a..7f56cd545a19 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingsManager.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingsManager.java @@ -40,7 +40,6 @@ import java.util.*; name = XDebuggerSettingsManager.COMPONENT_NAME, storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" ) } diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java index f943313154df..06ff37a34517 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java @@ -73,7 +73,7 @@ public class Configuration implements PersistentStateComponent, Modific @State( name = Configuration.COMPONENT_NAME, - storages = {@Storage(id = "dir", file = "$APP_CONFIG$/IntelliLang.xml", scheme = StorageScheme.DIRECTORY_BASED)}) + storages = {@Storage( file = "$APP_CONFIG$/IntelliLang.xml", scheme = StorageScheme.DIRECTORY_BASED)}) public static class App extends Configuration { private final List myDefaultInjections; @@ -109,8 +109,8 @@ public class Configuration implements PersistentStateComponent, Modific } @State( name = Configuration.COMPONENT_NAME, - storages = {@Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/IntelliLang.xml", scheme = StorageScheme.DIRECTORY_BASED)}) + storages = {@Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/IntelliLang.xml", scheme = StorageScheme.DIRECTORY_BASED)}) public static class Prj extends Configuration { private final Configuration myParentConfiguration; diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerConfiguration.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerConfiguration.java index 9b5e12015fca..d48a4f5af457 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerConfiguration.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerConfiguration.java @@ -25,8 +25,8 @@ import com.intellij.util.xmlb.XmlSerializerUtil; @State( name = "AndroidDexCompilerConfiguration", storages = { - @Storage(id = "default", file = "$WORKSPACE_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/androidDexCompiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$WORKSPACE_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/androidDexCompiler.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class AndroidDexCompilerConfiguration implements PersistentStateComponent { diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatFiltersPreferences.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatFiltersPreferences.java index f9ef622854c4..9da5ce96726c 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatFiltersPreferences.java +++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatFiltersPreferences.java @@ -29,7 +29,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; @State( name = "AndroidLogFilters", storages = {@Storage( - id = "AndroidLogFilters", file = "$WORKSPACE_FILE$")}) public class AndroidLogcatFiltersPreferences implements PersistentStateComponent { public String TAB_CUSTOM_FILTER = ""; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index c0030b1d0c7d..fb8ef25f5bc8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -72,8 +72,8 @@ import java.util.*; @State( name = "AntConfiguration", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/ant.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/ant.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class AntConfigurationImpl extends AntConfigurationBase implements PersistentStateComponent, ModificationTracker { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java index e517ede34943..9c3f1b812bd0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java @@ -39,7 +39,6 @@ import java.util.concurrent.atomic.AtomicReference; name="antWorkspaceConfiguration", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/plugins/commander/src/com/intellij/ide/commander/Commander.java b/plugins/commander/src/com/intellij/ide/commander/Commander.java index 9baf183d9d5b..4c7639341b2d 100644 --- a/plugins/commander/src/com/intellij/ide/commander/Commander.java +++ b/plugins/commander/src/com/intellij/ide/commander/Commander.java @@ -66,7 +66,6 @@ import java.util.List; name="Commander", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java index 77b888bc69f8..00d903abf5fb 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java @@ -52,8 +52,7 @@ import java.util.*; @State( name = "CopyrightManager", storages = {@Storage( - id = "default", - file = "$PROJECT_FILE$"), @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/copyright/", scheme = StorageScheme.DIRECTORY_BASED, + file = "$PROJECT_FILE$"), @Storage( file = "$PROJECT_CONFIG_DIR$/copyright/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = CopyrightManager.CopyrightStateSplitter.class)}) public class CopyrightManager extends AbstractProjectComponent implements JDOMExternalizable, PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#" + CopyrightManager.class.getName()); diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java index 0a2039e45828..8a5db8a3886e 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java @@ -32,7 +32,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "UpdateCopyrightCheckinHandler", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java index 76bfeaf5a348..b6e8b97a06f9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java @@ -38,7 +38,6 @@ import java.util.List; name="Cvs2Configuration", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java index 858584f5a40e..6488c4a6b196 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java @@ -23,7 +23,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleServiceManager; import com.intellij.openapi.roots.impl.storage.ClasspathStorage; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.containers.HashMap; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -36,7 +35,6 @@ import java.util.Set; name = "EclipseModuleManager", storages = { @Storage( - id = "default", file = "$MODULE_FILE$" ) } diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringContext.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringContext.java index 464de280773a..4b283e3d823d 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringContext.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringContext.java @@ -28,7 +28,6 @@ import org.jetbrains.generate.tostring.config.Config; name = "ToStringSettings", storages = { @Storage( - id ="ToStringSettings", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java index 567d3ea2f74f..1cc2e591612d 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java @@ -31,7 +31,6 @@ import java.util.*; name = "ToStringTemplates", storages = { @Storage( - id ="toStringTemplates", file = "$APP_CONFIG$/toStringTemplates.xml" )} ) diff --git a/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java b/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java index d8b2f3fe3bbf..dcd31c2e26a8 100644 --- a/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java +++ b/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java @@ -57,7 +57,6 @@ import java.util.*; @State( name = "Git.Branch.Configurations", storages = {@Storage( - id = "ws", file = "$WORKSPACE_FILE$")}) public class GitBranchConfigurations implements PersistentStateComponent, Disposable { /** diff --git a/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java index 38af49516670..c1971a8448d9 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java @@ -29,9 +29,7 @@ import java.io.File; */ @State( name = "Git.Application.Settings", - storages = {@Storage( - id = "Git.Application.Settings", - file = "$APP_CONFIG$/vcs.xml")}) + storages = {@Storage(file = "$APP_CONFIG$/vcs.xml")}) public class GitVcsApplicationSettings implements PersistentStateComponent { /** * the default executable diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index 012d10e3d30f..3e954eb59761 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -34,7 +34,6 @@ import java.util.List; @State( name = "Git.Settings", storages = {@Storage( - id = "ws", file = "$WORKSPACE_FILE$")}) public class GitVcsSettings implements PersistentStateComponent { diff --git a/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java b/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java index 6dfb772c9772..20d241477122 100644 --- a/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java +++ b/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java @@ -32,7 +32,6 @@ import java.util.TreeMap; @State( name = "SSHConnectionSettings", storages = {@Storage( - id = "SSHConnectionSettings", file = "$APP_CONFIG$/security.xml")}) public class SSHConnectionSettings implements PersistentStateComponent { /** diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java index a7d355c1cd20..0fc2963c4c93 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java @@ -35,10 +35,9 @@ import java.util.Set; name = "GitLogSettings", storages = { @Storage( - id ="other", file = "$PROJECT_FILE$" ) - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) + ,@Storage( file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class GitLogSettings implements PersistentStateComponent { diff --git a/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java b/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java index cad02beb8c91..d1a6e49e814f 100644 --- a/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java +++ b/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java @@ -28,7 +28,7 @@ import java.util.List; */ @State( name = "GitRememberedInputs", - storages = @Storage(id = "GitRememberedInputs", file = "$APP_CONFIG$/vcs.xml") + storages = @Storage( file = "$APP_CONFIG$/vcs.xml") ) public class GitRememberedInputs implements PersistentStateComponent { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java b/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java index 1ee993a90ec4..16904e9b3643 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java @@ -37,7 +37,6 @@ import org.jetbrains.annotations.Nullable; name = "GithubSettings", storages = { @Storage( - id = "main", file = "$APP_CONFIG$/github_settings.xml" )} ) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java index 6161b52a8ed3..85a8779b272a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java @@ -26,11 +26,11 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.wm.ToolWindow; import com.intellij.psi.*; +import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.tree.TreeUtil; -import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.annotator.intentions.QuickfixUtil; @@ -48,8 +48,8 @@ import java.util.*; @State( name = "DynamicElementsStorage", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/dynamic.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/dynamic.xml", scheme = StorageScheme.DIRECTORY_BASED) }) public class DynamicManagerImpl extends DynamicManager { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java index 6690eb562468..41d715ec137a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java @@ -30,8 +30,8 @@ import org.jdom.Element; @State( name = "GroovyCompilerConfiguration", storages = { - @Storage(id = "default", file = "$WORKSPACE_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/groovyc.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$WORKSPACE_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/groovyc.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class GroovyCompilerConfiguration implements PersistentStateComponent, Disposable { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettings.java index 33044f2b5bb8..8bd1ac6adf7e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettings.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettings.java @@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull; name = "GroovyDebuggerSettings", storages = { @Storage( - id = "groovy_debugger", file = "$APP_CONFIG$/groovy_debug.xml" )} ) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java index 2af617fd06d5..ea00c185ceee 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java @@ -28,8 +28,8 @@ import org.jetbrains.plugins.groovy.util.SdkHomeSettings; @State( name = "GantSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/gant_config.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/gant_config.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class GantSettings extends SdkHomeSettings { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java index d897bf33dca4..b9e9e8baaa2b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java @@ -28,8 +28,8 @@ import org.jetbrains.plugins.groovy.util.SdkHomeSettings; @State( name = "GradleSettings", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$"), - @Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/gradle.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$"), + @Storage( file = "$PROJECT_CONFIG_DIR$/gradle.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class GradleSettings extends SdkHomeSettings { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetHistoryService.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetHistoryService.java index 40ffea970148..0c5587387886 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetHistoryService.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetHistoryService.java @@ -7,7 +7,6 @@ import com.intellij.openapi.components.Storage; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import java.util.Collections; import java.util.LinkedList; /** @@ -16,7 +15,6 @@ import java.util.LinkedList; @State( name = "mvcRunTargetHistory", storages = @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" ) ) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/settings/GroovyApplicationSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/settings/GroovyApplicationSettings.java index bcedd09255dc..f3f408c50d4d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/settings/GroovyApplicationSettings.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/settings/GroovyApplicationSettings.java @@ -30,7 +30,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "GroovyApplicationSettings", storages = { @Storage( - id = "groovy_config", file = "$APP_CONFIG$/groovy_config.xml" )} ) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java index 61f8cbf8b3b3..1756e1596736 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java @@ -20,11 +20,11 @@ import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.Map; @State( name = "HgGlobalSettings", - storages = @Storage(id = "HgGlobalSettings", file = "$APP_CONFIG$/vcs.xml") + storages = @Storage( file = "$APP_CONFIG$/vcs.xml") ) public class HgGlobalSettings implements PersistentStateComponent { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java index 760c49cb91e8..6193fbed5900 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java @@ -18,7 +18,7 @@ import com.intellij.openapi.components.Storage; @State( name = "hg4idea.settings", - storages = @Storage(id = "hg4idea.settings", file = "$WORKSPACE_FILE$") + storages = @Storage(file = "$WORKSPACE_FILE$") ) public class HgProjectSettings implements PersistentStateComponent { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunner.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunner.java index 20c9d86481ce..094318c880ff 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunner.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunner.java @@ -37,7 +37,7 @@ import org.jetbrains.idea.maven.utils.SimpleProjectComponent; import java.util.List; -@State(name = "MavenRunner", storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")}) +@State(name = "MavenRunner", storages = {@Storage( file = "$WORKSPACE_FILE$")}) public class MavenRunner extends SimpleProjectComponent implements PersistentStateComponent { private MavenRunnerSettings mySettings = new MavenRunnerSettings(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java index 83eaeae8941b..2bde21d55730 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java @@ -55,7 +55,7 @@ import java.net.URL; import java.util.Collections; import java.util.List; -@State(name = "MavenProjectNavigator", storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")}) +@State(name = "MavenProjectNavigator", storages = {@Storage( file = "$WORKSPACE_FILE$")}) public class MavenProjectsNavigator extends SimpleProjectComponent implements PersistentStateComponent { public static final String TOOL_WINDOW_ID = "Maven Projects"; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java index 24aa3d7550c7..1f4241d8f8b7 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java @@ -54,7 +54,7 @@ import java.io.IOException; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -@State(name = "MavenProjectsManager", storages = {@Storage(id = "default", file = "$PROJECT_FILE$")}) +@State(name = "MavenProjectsManager", storages = {@Storage( file = "$PROJECT_FILE$")}) public class MavenProjectsManager extends SimpleProjectComponent implements PersistentStateComponent, SettingsSavingComponent { private static final int IMPORT_DELAY = 1000; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java index 5dfa73cada3b..f580cd69bcc5 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java @@ -21,7 +21,7 @@ import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; import org.jetbrains.idea.maven.utils.SimpleProjectComponent; -@State(name = "MavenImportPreferences", storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")}) +@State(name = "MavenImportPreferences", storages = {@Storage( file = "$WORKSPACE_FILE$")}) public class MavenWorkspaceSettingsComponent extends SimpleProjectComponent implements PersistentStateComponent { private MavenWorkspaceSettings mySettings = new MavenWorkspaceSettings(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenRepositoryServicesManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenRepositoryServicesManager.java index 0b593e132550..790c9a2dce96 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenRepositoryServicesManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenRepositoryServicesManager.java @@ -40,7 +40,6 @@ import java.util.List; @State( name = "MavenServices", storages = {@Storage( - id = "other", file = "$APP_CONFIG$/mavenServices.xml")}) public class MavenRepositoryServicesManager implements PersistentStateComponent { private final List myUrls = new ArrayList(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenTasksManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenTasksManager.java index 03483361072b..da31f5e71212 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenTasksManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenTasksManager.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -@State(name = "MavenCompilerTasksManager", storages = {@Storage(id = "default", file = "$PROJECT_FILE$")}) +@State(name = "MavenCompilerTasksManager", storages = {@Storage( file = "$PROJECT_FILE$")}) public class MavenTasksManager extends SimpleProjectComponent implements PersistentStateComponent { private final AtomicBoolean isInitialized = new AtomicBoolean(); diff --git a/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java b/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java index 5d8f1cfe60a3..036c010e1b82 100644 --- a/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java +++ b/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java @@ -24,13 +24,13 @@ import com.intellij.openapi.components.Storage; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.openapi.vfs.VfsUtil; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; -import com.intellij.psi.statistics.StatisticsManager; import com.intellij.psi.statistics.StatisticsInfo; +import com.intellij.psi.statistics.StatisticsManager; import gnu.trove.THashMap; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -47,7 +47,6 @@ import java.util.Map; name = "LastSelectedPropertiesFileStore", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java b/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java index dca8a95a797f..99294e626b11 100644 --- a/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java +++ b/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesSeparatorManager.java @@ -52,7 +52,6 @@ import java.util.Map; name="PropertiesSeparatorManager", storages= { @Storage( - id="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/plugins/relaxng/src/org/intellij/plugins/relaxNG/config/NoNamespaceConfigImpl.java b/plugins/relaxng/src/org/intellij/plugins/relaxNG/config/NoNamespaceConfigImpl.java index a1d06fd297ec..3bd5029d5207 100644 --- a/plugins/relaxng/src/org/intellij/plugins/relaxNG/config/NoNamespaceConfigImpl.java +++ b/plugins/relaxng/src/org/intellij/plugins/relaxNG/config/NoNamespaceConfigImpl.java @@ -43,7 +43,6 @@ import java.util.Map; @State( name = "NoNamespaceConfig.Mappings", storages = { @Storage( - id = "other", file = "$WORKSPACE_FILE$") }) class NoNamespaceConfigImpl extends NoNamespaceConfig implements PersistentStateComponent { diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java index 6d7652559b0f..017770734529 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java @@ -28,7 +28,6 @@ import java.util.*; @State( name = "SpellCheckerSettings", storages = {@Storage( - id = "other", file = "$WORKSPACE_FILE$")}) public class SpellCheckerSettings implements PersistentStateComponent { // For xml serialization diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java b/plugins/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java index 461cf66ce2fe..29abd9ba75ac 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java @@ -23,7 +23,6 @@ import com.intellij.spellchecker.dictionary.EditableDictionary; @State( name = "CachedDictionaryState", storages = {@Storage( - id = "spellchecker", file = "$APP_CONFIG$/cachedDictionary.xml")}) public class CachedDictionaryState extends DictionaryState implements PersistentStateComponent { public static final String DEFAULT_NAME = "cached"; diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java b/plugins/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java index c760528e9cb4..46a63c03e57a 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java @@ -20,11 +20,8 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.components.StorageScheme; import com.intellij.openapi.project.Project; -import com.intellij.spellchecker.dictionary.Dictionary; import com.intellij.spellchecker.dictionary.EditableDictionary; import com.intellij.spellchecker.dictionary.ProjectDictionary; -import com.intellij.spellchecker.state.ProjectDictionarySplitter; -import com.intellij.util.containers.hash.HashSet; import com.intellij.util.xmlb.annotations.AbstractCollection; import com.intellij.util.xmlb.annotations.Property; import com.intellij.util.xmlb.annotations.Transient; @@ -36,12 +33,8 @@ import java.util.Set; @State( name = "ProjectDictionaryState", - storages = {@Storage( - id = "other", - file = "$PROJECT_FILE$"), - @Storage( - id = "dir", - file = "$PROJECT_CONFIG_DIR$/dictionaries/", + storages = {@Storage(file = "$PROJECT_FILE$"), + @Storage(file = "$PROJECT_CONFIG_DIR$/dictionaries/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectDictionarySplitter.class)}) public class ProjectDictionaryState implements PersistentStateComponent{ diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnApplicationSettings.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnApplicationSettings.java index 608bd9277b15..5b819bd60bbd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnApplicationSettings.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnApplicationSettings.java @@ -35,7 +35,6 @@ import java.util.List; name="SvnApplicationSettings", storages = { @Storage( - id="SvnApplicationSettings", file="$APP_CONFIG$/other.xml" )} ) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java index 443e58e95070..e2c088cd0307 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java @@ -53,7 +53,6 @@ import java.util.*; name = "SvnBranchConfigurationManager", storages = { @Storage( - id ="other", file = "$PROJECT_FILE$" )} ) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchMapperManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchMapperManager.java index 03d950cd3c6d..f099c99adaa4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchMapperManager.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchMapperManager.java @@ -32,7 +32,6 @@ import java.util.*; name = "SvnBranchMapperManager", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java index 105b1014fdbf..787a807ac7db 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java @@ -58,7 +58,6 @@ import java.util.*; name = "SvnFileUrlMappingImpl", storages = { @Storage( - id ="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/RecentTaskRepositories.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/RecentTaskRepositories.java index 86f2eb715678..e15fc634e167 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/RecentTaskRepositories.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/RecentTaskRepositories.java @@ -26,7 +26,6 @@ import java.util.Set; name = "RecentTaskRepositories", storages = { @Storage( - id ="other", file = "$APP_CONFIG$/other.xml" )} ) diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java index c4e32c45f2c6..b42f2673964b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java @@ -54,7 +54,7 @@ import java.util.concurrent.TimeoutException; @State( name = "TaskManager", storages = { - @Storage(id = "other", file = "$WORKSPACE_FILE$") + @Storage( file = "$WORKSPACE_FILE$") } ) public class TaskManagerImpl extends TaskManager implements ProjectComponent, PersistentStateComponent, diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskProjectConfiguration.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskProjectConfiguration.java index a04dc74981e2..079f8ef970f3 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskProjectConfiguration.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskProjectConfiguration.java @@ -21,7 +21,7 @@ import java.util.List; */ @State( name = "TaskProjectConfiguration", - storages = {@Storage(id = "default", file = "$PROJECT_FILE$")}) + storages = {@Storage( file = "$PROJECT_FILE$")}) public class TaskProjectConfiguration implements PersistentStateComponent { @Tag("server") diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java index c445e14e3779..15c480058d53 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java @@ -28,10 +28,9 @@ import com.intellij.util.xmlb.XmlSerializerUtil; name = "uidesigner-configuration", storages = { @Storage( - id ="other", file = "$PROJECT_FILE$" ) - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) + ,@Storage( file = "$PROJECT_CONFIG_DIR$/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public final class GuiDesignerConfiguration implements PersistentStateComponent { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java index 2223163b0f2e..c8a2b1645cd6 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java @@ -64,8 +64,8 @@ import java.util.Map; @State( name = "Palette2", storages = { - @Storage(id = "default", file = "$PROJECT_FILE$") - ,@Storage(id = "dir", file = "$PROJECT_CONFIG_DIR$/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage( file = "$PROJECT_FILE$") + ,@Storage( file = "$PROJECT_CONFIG_DIR$/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public final class Palette implements ProjectComponent, PersistentStateComponent { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java index f05906dfb8ed..20a78e27eaa4 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java @@ -105,7 +105,7 @@ public class FileAssociationsConfigurable implements SearchableConfigurable, Non } @State(name = "XSLT-Support.FileAssociations.UIState", - storages = @Storage(id = "default", file = "$WORKSPACE_FILE$") + storages = @Storage( file = "$WORKSPACE_FILE$") ) public static class UIState implements PersistentStateComponent { private TreeState state; diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathProjectComponent.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathProjectComponent.java index 205f1d1a9956..9f0f907243ec 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathProjectComponent.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathProjectComponent.java @@ -39,7 +39,6 @@ import java.util.List; name="XPathView.XPathProjectComponent", storages= { @Storage( - id="other", file = "$WORKSPACE_FILE$" )} ) diff --git a/xml/impl/src/com/intellij/application/options/XmlSettings.java b/xml/impl/src/com/intellij/application/options/XmlSettings.java index cf71cff0b210..2ac00f87dd25 100644 --- a/xml/impl/src/com/intellij/application/options/XmlSettings.java +++ b/xml/impl/src/com/intellij/application/options/XmlSettings.java @@ -31,7 +31,6 @@ import java.io.File; name="XmlSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/editor.codeinsight.xml" )} ) diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java index f080c55f0abe..f61496a34073 100644 --- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java +++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java @@ -33,7 +33,6 @@ import java.io.File; name="XmlEditorOptions", storages= { @Storage( - id="other", file = "$APP_CONFIG$/editor.xml" )} ) diff --git a/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java b/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java index 386d4eb37279..a3e1cc22bebc 100644 --- a/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java +++ b/xml/impl/src/com/intellij/application/options/editor/XmlFoldingSettings.java @@ -29,7 +29,6 @@ import java.io.File; name="XmlFoldingSettings", storages= { @Storage( - id="other", file = "$APP_CONFIG$/editor.codeinsight.xml" )} ) diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java index 23bf2baa2e29..b5e3436f1750 100644 --- a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java @@ -48,7 +48,7 @@ import java.util.Map; /** * @author spleaner */ -@State(name = "WebBrowsersConfiguration", storages = {@Storage(id = "other", file = "$APP_CONFIG$/browsers.xml")}) +@State(name = "WebBrowsersConfiguration", storages = {@Storage( file = "$APP_CONFIG$/browsers.xml")}) public class BrowsersConfiguration implements PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.browsers.BrowsersConfiguration"); diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java index 2eb908a0607a..918630c6548b 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java @@ -49,7 +49,7 @@ import java.util.*; * @author mike */ @State(name = "ExternalResourceManagerImpl", - storages = {@Storage(id = "other", file = "$APP_CONFIG$/other.xml")}) + storages = {@Storage( file = "$APP_CONFIG$/other.xml")}) public class ExternalResourceManagerImpl extends ExternalResourceManagerEx implements JDOMExternalizable { static final Logger LOG = Logger.getInstance("#com.intellij.j2ee.openapi.impl.ExternalResourceManagerImpl"); diff --git a/xml/impl/src/com/intellij/javaee/ProjectResources.java b/xml/impl/src/com/intellij/javaee/ProjectResources.java index 76c0abcfc28c..a871a75850b6 100644 --- a/xml/impl/src/com/intellij/javaee/ProjectResources.java +++ b/xml/impl/src/com/intellij/javaee/ProjectResources.java @@ -22,13 +22,13 @@ import com.intellij.openapi.components.Storage; import com.intellij.openapi.util.JDOMExternalizableAdapter; import org.jdom.Element; -import java.util.Map; import java.util.Collections; +import java.util.Map; /** * @author Dmitry Avdeev */ -@State(name = "ProjectResources", storages = {@Storage(id = "default", file = "$PROJECT_FILE$")}) +@State(name = "ProjectResources", storages = {@Storage( file = "$PROJECT_FILE$")}) public class ProjectResources extends ExternalResourceManagerImpl implements PersistentStateComponent { private final JDOMExternalizableAdapter myAdapter;