diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index cbf1b6867d25..99a78db5ccad 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -71,8 +71,8 @@ import java.util.*; @State( name = "CompilerConfiguration", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.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 0784a676700e..3a695410922e 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 @@ -25,9 +25,9 @@ import com.intellij.openapi.project.Project; @State( name = "CompilerAPISettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class CompilerAPIConfiguration extends JavacConfiguration { public CompilerAPIConfiguration(Project project) { 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 4efbdcdbf6f7..977b769e1e6b 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 @@ -24,9 +24,9 @@ import org.jetbrains.jps.model.java.compiler.EclipseCompilerOptions; @State( name = "EclipseCompilerSettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class EclipseCompilerConfiguration implements PersistentStateComponent { private final EclipseCompilerOptions mySettings = new EclipseCompilerOptions(); 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 1c36e571fc5c..cb1652369c39 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 @@ -23,9 +23,9 @@ import com.intellij.openapi.components.StorageScheme; @State( name = "EclipseEmbeddedCompilerSettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class EclipseEmbeddedCompilerConfiguration extends EclipseCompilerConfiguration { } \ No newline at end of file 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 6e1f497915b3..ed3c49761da3 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 @@ -24,9 +24,9 @@ import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions; @State( name = "JavacSettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class JavacConfiguration implements PersistentStateComponent { private final JpsJavaCompilerOptions mySettings = new JpsJavaCompilerOptions(); 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 f82e26fb8268..28992466b72b 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 @@ -24,9 +24,9 @@ import org.jetbrains.jps.model.java.compiler.JikesCompilerOptions; @State( name = "JikesSettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class JikesConfiguration implements PersistentStateComponent { private final JikesCompilerOptions mySettings = new JikesCompilerOptions(); 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 70b8b4253377..f24546f4ea3f 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 @@ -24,9 +24,9 @@ import org.jetbrains.jps.model.java.compiler.RmicCompilerOptions; @State( name = "RmicSettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/compiler.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class RmicConfiguration implements PersistentStateComponent { private final RmicCompilerOptions mySettings = new RmicCompilerOptions(); diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfiguration.java index 2b8a43eeb473..b6e545c2202a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfiguration.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfiguration.java @@ -31,8 +31,8 @@ import java.util.Map; @State( name = "ValidationConfiguration", storages = { - @Storage( file = StoragePathMacros.WORKSPACE_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/validation.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.WORKSPACE_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/validation.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class ValidationConfiguration implements PersistentStateComponent { @@ -81,8 +81,8 @@ public class ValidationConfiguration implements PersistentStateComponent { diff --git a/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java b/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java index 8e1baba0481c..190aaca594b1 100644 --- a/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java +++ b/platform/analysis-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java @@ -38,10 +38,9 @@ import java.util.*; @State( name="DependencyValidationManager", storages= { - @Storage( - file = StoragePathMacros.PROJECT_FILE - ), @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/scopes/", scheme = StorageScheme.DIRECTORY_BASED, - stateSplitter = DependencyValidationManagerImpl.ScopesStateSplitter.class)} + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/scopes/", scheme = StorageScheme.DIRECTORY_BASED, + stateSplitter = DependencyValidationManagerImpl.ScopesStateSplitter.class)} ) public class DependencyValidationManagerImpl extends DependencyValidationManager { private static final Logger LOG = Logger.getInstance("#com.intellij.packageDependencies.DependencyValidationManagerImpl"); diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java index 34fff8776f3e..eecc20742630 100644 --- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java +++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java @@ -49,11 +49,10 @@ import java.util.concurrent.ConcurrentHashMap; @State( name = "InspectionProjectProfileManager", storages = { - @Storage( - file = StoragePathMacros.PROJECT_FILE - ) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/inspectionProfiles/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = InspectionProjectProfileManagerImpl.ProfileStateSplitter.class) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/inspectionProfiles/", scheme = StorageScheme.DIRECTORY_BASED, + stateSplitter = InspectionProjectProfileManagerImpl.ProfileStateSplitter.class) + } ) public class InspectionProjectProfileManagerImpl extends InspectionProjectProfileManager implements SeverityProvider, ProjectComponent, PersistentStateComponent { private final Map myName2Profile = new ConcurrentHashMap(); diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java index ba0e766f8743..c6d4c738c1fd 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java @@ -26,9 +26,9 @@ import org.jdom.Element; @State( name = "CodeStyleSettingsManager", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/projectCodeStyle.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/projectCodeStyle.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class LegacyCodeStyleSettingsManager implements PersistentStateComponent { 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 4677d1287c4e..2ddf99225475 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java @@ -25,9 +25,9 @@ import com.intellij.openapi.components.StorageScheme; @State( name = "ProjectCodeStyleSettingsManager", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/codeStyleSettings.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/codeStyleSettings.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class ProjectCodeStyleSettingsManager extends CodeStyleSettingsManager{ } 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 a1334f95deb1..298749b37428 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java @@ -44,9 +44,10 @@ import java.util.Set; @State( name = "ProjectRunConfigurationManager", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/runConfigurations/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectRunConfigurationManager.RunConfigurationStateSplitter.class) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/runConfigurations/", scheme = StorageScheme.DIRECTORY_BASED, + stateSplitter = ProjectRunConfigurationManager.RunConfigurationStateSplitter.class) + } ) public class ProjectRunConfigurationManager implements ProjectComponent, PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.ProjectRunConfigurationManager"); diff --git a/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfiguration.java b/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfiguration.java index 2566c8a0f9b3..0cd1abcf06a3 100644 --- a/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfiguration.java +++ b/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfiguration.java @@ -24,8 +24,8 @@ import com.intellij.openapi.project.Project; @State( name = "CustomFolding", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/customFolding.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/customFolding.xml", scheme = StorageScheme.DIRECTORY_BASED) }) public class CustomFoldingConfiguration implements PersistentStateComponent { diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerComponent.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerComponent.java index 15fc27deca14..0d12404f746e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerComponent.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerComponent.java @@ -48,9 +48,9 @@ import java.util.List; @State( name = ModuleManagerImpl.COMPONENT_NAME, storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/modules.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/modules.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class ModuleManagerComponent extends ModuleManagerImpl { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModuleManagerComponent"); 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 fba9dabd537e..201fb23ddf97 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageMappings.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageMappings.java @@ -34,8 +34,8 @@ import java.util.List; @State( name = "TemplateDataLanguageMappings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/templateLanguages.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/templateLanguages.xml", scheme = StorageScheme.DIRECTORY_BASED) }) public class TemplateDataLanguageMappings extends LanguagePerFileMappings { 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 aff31c6696c6..67fe648ff0f5 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java @@ -28,8 +28,8 @@ import org.jetbrains.annotations.NotNull; @State( name="SharedFileColors", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/fileColors.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/fileColors.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class FileColorSharedConfigurationManager implements PersistentStateComponent { 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 70f088b5f66b..5c1e93ccac36 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 @@ -62,9 +62,9 @@ import java.util.*; @State( name = "Encoding", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/encodings.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/encodings.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class EncodingProjectManagerImpl extends EncodingProjectManager { private final Project myProject; diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java index 8c8256a5b60c..9510390bdca7 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/ProjectLibraryTable.java @@ -37,9 +37,9 @@ import java.util.List; @State( name = "libraryTable", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/libraries/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectLibraryTable.LibraryStateSplitter.class) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/libraries/", scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectLibraryTable.LibraryStateSplitter.class) + } ) public class ProjectLibraryTable extends LibraryTableBase { private static final LibraryTablePresentation PROJECT_LIBRARY_TABLE_PRESENTATION = new LibraryTablePresentation() { 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 8c1ee2ed88ba..e1c74749d2c3 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java @@ -36,11 +36,9 @@ import java.util.regex.Pattern; @State( name = "IssueNavigationConfiguration", storages = { - @Storage( - file = StoragePathMacros.PROJECT_FILE - ) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class IssueNavigationConfiguration implements PersistentStateComponent { @NonNls private static final Pattern ourHtmlPattern = 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 fc776f1777a8..e7fb9ae69e7f 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 @@ -29,11 +29,9 @@ import org.jetbrains.annotations.NotNull; @State( name = "VcsDirectoryMappings", storages = { - @Storage( - file = StoragePathMacros.PROJECT_FILE - ) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public class VcsDirectoryMappingStorage extends AbstractProjectComponent implements PersistentStateComponent { private final ProjectLevelVcsManager myVcsManager; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java index 292834ba4078..6cb44e0d2369 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java @@ -104,8 +104,10 @@ public class Configuration implements PersistentStateComponent, Modific } @State( name = Configuration.COMPONENT_NAME, - storages = {@Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/IntelliLang.xml", scheme = StorageScheme.DIRECTORY_BASED)}) + storages = { + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/IntelliLang.xml", scheme = StorageScheme.DIRECTORY_BASED) + }) public static class Prj extends Configuration { private final Configuration myParentConfiguration; 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 7841c39e4cf5..8e7ae3a0cff0 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 @@ -69,8 +69,8 @@ import java.util.*; @State( name = "AntConfiguration", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/ant.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/ant.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class AntConfigurationImpl extends AntConfigurationBase implements PersistentStateComponent, ModificationTracker { 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 00eb93f52c5c..c6896f134a51 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 @@ -50,8 +50,8 @@ import java.util.List; @State( name = "DynamicElementsStorage", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/dynamic.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.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 dc1c4b977b82..a2854f7769c7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java @@ -29,8 +29,8 @@ import org.jetbrains.jps.incremental.groovy.JpsGroovySettings; @State( name = "GroovyCompilerProjectConfiguration", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/groovyc.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.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/gant/GantSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java index 6a677cb27a90..d0c6d4cf5377 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java @@ -25,8 +25,8 @@ import org.jetbrains.plugins.groovy.util.SdkHomeSettings; @State( name = "GantSettings", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE), - @Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/gant_config.xml", scheme = StorageScheme.DIRECTORY_BASED) + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/gant_config.xml", scheme = StorageScheme.DIRECTORY_BASED) } ) public class GantSettings extends SdkHomeSettings { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java index 345a150fe7d0..46480a335830 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfiguration.java @@ -27,11 +27,9 @@ import com.intellij.util.xmlb.XmlSerializerUtil; @State( name = "uidesigner-configuration", storages = { - @Storage( - file = StoragePathMacros.PROJECT_FILE - ) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public final class GuiDesignerConfiguration implements PersistentStateComponent { public static GuiDesignerConfiguration getInstance(final Project project){ 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 8a2eaf255a03..df0161db9078 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java @@ -65,9 +65,9 @@ import java.util.Map; @State( name = "Palette2", storages = { - @Storage( file = StoragePathMacros.PROJECT_FILE) - ,@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + @Storage(file = StoragePathMacros.PROJECT_FILE), + @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/uiDesigner.xml", scheme = StorageScheme.DIRECTORY_BASED) + } ) public final class Palette implements ProjectComponent, PersistentStateComponent { private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.palette.Palette"); diff --git a/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java b/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java index 6317fbdb08af..717af47285cd 100644 --- a/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java +++ b/spellchecker/src/com/intellij/spellchecker/state/ProjectDictionaryState.java @@ -30,10 +30,12 @@ import java.util.Set; @State( name = "ProjectDictionaryState", - storages = {@Storage(file = StoragePathMacros.PROJECT_FILE), + storages = { + @Storage(file = StoragePathMacros.PROJECT_FILE), @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/dictionaries/", - scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectDictionarySplitter.class)}) - + scheme = StorageScheme.DIRECTORY_BASED, stateSplitter = ProjectDictionarySplitter.class) + } +) public class ProjectDictionaryState implements PersistentStateComponent{ @Property(surroundWithTag = false) @AbstractCollection(surroundWithTag = false, elementTypes = DictionaryState.class)