diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStateStorageManager.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStateStorageManager.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStateStorageManager.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStateStorageManager.java index 0eed50a65131..c7b93afbe8d8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStateStorageManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStateStorageManager.java @@ -56,17 +56,12 @@ class ProjectStateStorageManager extends StateStorageManagerImpl { assert config != null : "Couldn't find old storage for " + component.getClass().getName(); final boolean workspace = isWorkspace(config.options); - String macro = StoragePathMacros.getMacroName(workspace ? StoragePathMacros.WORKSPACE_FILE : StoragePathMacros.PROJECT_FILE); - - String name = "$" + macro + "$"; - - StateStorage storage = getFileStateStorage(name); - + String fileSpec = workspace ? StoragePathMacros.WORKSPACE_FILE : StoragePathMacros.PROJECT_FILE; + StateStorage storage = getStateStorage(fileSpec, workspace ? RoamingType.DISABLED : RoamingType.PER_USER); if (operation == StateStorageOperation.READ && storage != null && workspace && !storage.hasState(component, componentName, Element.class, false)) { - name = StoragePathMacros.PROJECT_FILE; + fileSpec = StoragePathMacros.PROJECT_FILE; } - - return name; + return fileSpec; } @Override |