do not insert id for Storage when only one can be used - provide default value

2026-09-27 10:03:11 +07:00 · 2011-07-27 08:25:30 +04:00
parent 0a591e1db6
commit 8a37791ae1
170 changed files with 139 additions and 267 deletions
@@ -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<Element>, RoamingTypeDisabled {
@@ -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<Element>, ProjectComponent {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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<JavacSettings> {
@@ -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<JikesSettings> {
@@ -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 {
@@ -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<RmicSettings> {
@@ -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 {
@@ -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<ArtifactManagerState> {
@@ -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<ArtifactsWorkspaceSettings.ArtifactsWorkspaceSettingsState> {
  private ArtifactsWorkspaceSettingsState myState = new ArtifactsWorkspaceSettingsState();
@@ -30,7 +30,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
  name = "CompilerWorkspaceConfiguration",
  storages = {
    @Storage(
-      id ="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -55,7 +55,6 @@ import java.util.List;
  name="NodeRendererSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/debugger.renderers.xml"
    )}
 )
@@ -25,7 +25,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
  name="ThreadsViewSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/debugger.threadsview.xml"
    )}
 )
@@ -28,7 +28,6 @@ import org.jdom.Element;
  name="ViewsSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/debugger.frameview.xml"
    )}
 )
@@ -56,7 +56,6 @@ import java.util.*;
  name = FacetAutodetectingManagerImpl.COMPONENT_NAME,
  storages = {
    @Storage(
-      id="other",
      file = "$PROJECT_FILE$"
    )
  }
@@ -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$"
        )
    }
@@ -30,7 +30,6 @@ import java.io.File;
  roamingType = RoamingType.DISABLED,
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -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<AnalyzeDependenciesSettings.State> {
  /**
@@ -32,7 +32,6 @@ import java.io.File;
  name="JavaCodeFoldingSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/editor.codeinsight.xml"
    )}
 )
@@ -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<Element>, EntryPointsManager {
  @NonNls private static final String[] STANDARD_ANNOS = {
@@ -37,7 +37,6 @@ import org.jetbrains.annotations.NotNull;
@State(name = "JavadocGenerationManager",
       storages = {
         @Storage(
-           id="other",
           file = "$PROJECT_FILE$"
         )
       }
@@ -37,7 +37,6 @@ import org.jdom.Element;
  roamingType = RoamingType.DISABLED,
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/jdk.table.xml"
    )}
 )
@@ -25,7 +25,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
  name = "RefactoringSettings",
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -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<SliceManager.StoredSettingsBean> {
  private final Project myProject;
@@ -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<SliceToolwindowSettings> {
  private boolean isPreview;
@@ -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<Element> {
  private static final Logger LOG = Logger.getInstance("#" + NullableNotNullManager.class.getName());
@@ -31,7 +31,6 @@ import java.io.File;
  name="CodeFoldingSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/editor.codeinsight.xml"
    )}
 )
@@ -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 {
@@ -24,7 +24,6 @@ import com.intellij.openapi.components.Storage;
  name = "CodeStyleSettingsManager",
    storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -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{
@@ -28,7 +28,6 @@ import javax.swing.*;
  name="NamedScopeManager",
  storages= {
    @Storage(
-      id="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -39,7 +39,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
  name = "AnalysisUIOptions",
  storages = {
    @Storage(
-      id ="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NonNls;
  name = "ExportToHTMLSettings",
  storages = {
    @Storage(
-      id ="other",
      file = "$PROJECT_FILE$"
    )}
 )
@@ -31,7 +31,6 @@ import java.io.File;
  name="PrintSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/print.xml"
    )}
 )
@@ -38,7 +38,6 @@ import java.util.List;
  name = "CodeInsightSettings",
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/editor.codeinsight.xml"
    )}
 )
@@ -34,7 +34,6 @@ import java.io.File;
  name="DaemonCodeAnalyzerSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/editor.codeinsight.xml"
    )}
 )
@@ -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<Element> {
  @NonNls private static final String SETTING_TAG = "setting";
  @NonNls private static final String ROOT_ATT_PREFIX = "root";
@@ -47,7 +47,6 @@ import java.util.regex.Pattern;
  name = "IntentionManagerSettings",
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/intentionSettings.xml"
    )}
 )
@@ -48,7 +48,6 @@ import java.util.*;
  name="TemplateSettings",
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -26,7 +26,6 @@ import com.intellij.openapi.components.Storage;
  name = "AppInspectionProfilesVisibleTreeState",
  storages = {
    @Storage(
-        id="other",
        file = "$OPTIONS$/other.xml"
    )}
 )
@@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project;
  name = "ProjectInspectionProfilesVisibleTreeState",
  storages = {
    @Storage(
-        id="other",
        file = "$WORKSPACE_FILE$"
    )}
 )
@@ -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<ConsoleFoldingSettings.MyBean> {
  private final List<String> myPositivePatterns = new ArrayList<String>();
  private final List<String> myNegativePatterns = new ArrayList<String>();
@@ -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<Element> {
@@ -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<Element> {
  public static RunnerLayoutSettings getInstance() {
@@ -48,7 +48,6 @@ import java.util.*;
    name = FacetManagerImpl.COMPONENT_NAME,
    storages = {
      @Storage(
-        id = "default",
        file = "$MODULE_FILE$"
      )
    }
@@ -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$"
        )
    }
@@ -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$"
        )
    }
@@ -79,7 +79,6 @@ import java.util.regex.PatternSyntaxException;
  name = "FindManager",
  storages = {
    @Storage(
-      id ="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -38,7 +38,6 @@ import java.util.List;
  name = "FindSettings",
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -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<Element> {
@@ -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$"
    )}
 )
@@ -35,7 +35,6 @@ import org.jetbrains.annotations.NotNull;
  name = ProjectFileVersionImpl.COMPONENT_NAME,
  storages = {
    @Storage(
-      id="other",
      file = "$PROJECT_FILE$"
    )
  }
@@ -114,7 +114,6 @@ import java.util.List;
  name="ProjectView",
  storages= {
    @Storage(
-      id="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -49,7 +49,6 @@ import java.util.HashSet;
  name="StructureViewFactory",
  storages= {
    @Storage(
-      id="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -57,7 +57,6 @@ import java.util.List;
  name="TodoView",
  storages= {
    @Storage(
-      id="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -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<Language> {
  public static GotoClassSymbolConfiguration getInstance(Project project) {
@@ -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<FileType> {
  /**
@@ -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<PsiViewerSettings> {
  public boolean showWhiteSpaces = true;
  public boolean showTreeNodes = true;
@@ -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<DependenciesAnalyzeManager.State> {
  private final Project myProject;
@@ -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) {
@@ -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 {

  
@@ -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<Element>, ModificationTracker {
@@ -49,7 +49,6 @@ import java.util.Map;
  roamingType = RoamingType.DISABLED,
  storages= {
    @Storage(
-      id="other",
      file = "$APP_CONFIG$/jdk.table.xml"
    )}
 )
@@ -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 {
@@ -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 {
@@ -28,7 +28,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
  name = "DependencyUISettings",
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -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 {
@@ -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<Element> {
@@ -61,7 +61,6 @@ import java.util.concurrent.locks.Lock;
  roamingType = RoamingType.DISABLED,
  storages = {
  @Storage(
-    id = "stubIndex",
    file = "$APP_CONFIG$/stubIndex.xml")
    }
 )
@@ -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<Language> {

@@ -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<Element> {
  private FileTypeAssocTable<Language> myAssocTable = new FileTypeAssocTable<Language>();
  @NonNls private static final String SEPARATOR = ";";
@@ -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"
    )}
 )
@@ -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<Element> {
@@ -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<Element> {
  public static final String FC_ENABLED = "FileColorsEnabled";
  public static final String FC_TABS_ENABLED = "FileColorsForTabsEnabled";
@@ -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<Element> {
@@ -43,7 +43,6 @@ import java.util.Map;
  name = "UISettings",
  storages = {
    @Storage(
-      id ="uilnf",
      file = "$APP_CONFIG$/ui.lnf.xml"
    )}
 )
@@ -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;
@@ -41,7 +41,6 @@ import java.util.*;
  name="masterDetails",
  storages= {
    @Storage(
-      id="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -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<Element>, ApplicationComponent {
  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.DimensionService");
@@ -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<Element> {
@@ -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<HttpConfigurable>, JDOMExternalizable {
@@ -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<Element> {
  private static final int HOUR = 1000 * 60 * 60;
@@ -36,7 +36,6 @@ import org.jetbrains.annotations.Nullable;
  roamingType = RoamingType.DISABLED,
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -27,7 +27,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
  name = "ErrorTreeViewConfiguration",
  storages = {
    @Storage(
-      id ="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -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<PasswordSafeSettings.State> {
  /**
@@ -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<PasswordDatabase.State> {
  /**
@@ -37,7 +37,6 @@ import javax.swing.*;
  name = "PluginManagerConfigurable",
  storages = {
  @Storage(
-    id = "other",
    file = "$APP_CONFIG$/other.xml")
    }
 )
@@ -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<Element> {
  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ui.LafManager");
@@ -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() {
@@ -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() {
@@ -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"
    )}
 )
@@ -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"
    )}
 )
@@ -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<Element> {
  private static final Logger LOG = Logger.getInstance("#com.intellij.notification.impl.NotificationsConfiguration");

@@ -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<IdeDocumentHistoryImpl.RecentlyChangedFilesState> {
  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl");
@@ -44,7 +44,6 @@ import java.util.*;
  roamingType = RoamingType.PER_PLATFORM,
  storages = {
    @Storage(
-        id="keymap",
        file = "$APP_CONFIG$/keymap.xml"
    )}
 )
@@ -38,7 +38,6 @@ import java.util.List;
  name = "UpdatesConfigurable",
  storages = {
    @Storage(
-      id ="other",
      file = "$APP_CONFIG$/other.xml"
    )}
 )
@@ -37,7 +37,6 @@ import java.util.*;
  name="ReadonlyStatusHandler",
  storages= {
    @Storage(
-      id="other",
      file = "$WORKSPACE_FILE$"
    )}
 )
@@ -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<Element>, Disposable {
--- a/Show More
+++ b/Show More