diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java index a00533d3244b..bf03cb11f1d6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java @@ -36,7 +36,6 @@ class ApplicationStoreImpl extends ComponentStoreImpl implements IApplicationSto private static final String XML_EXTENSION = ".xml"; private static final String DEFAULT_STORAGE_SPEC = StoragePathMacros.APP_CONFIG + "/" + PathManager.DEFAULT_OPTIONS_FILE_NAME + XML_EXTENSION; - private static final String OPTIONS_MACRO = "OPTIONS"; private static final String ROOT_ELEMENT_NAME = "application"; private final ApplicationImpl myApplication; @@ -93,14 +92,13 @@ class ApplicationStoreImpl extends ComponentStoreImpl implements IApplicationSto } @Override - public void setOptionsPath(final String path) { - myStateStorageManager.addMacro(StoragePathMacros.getMacroName(StoragePathMacros.APP_CONFIG), path); - myStateStorageManager.addMacro(OPTIONS_MACRO, path); + public void setOptionsPath(@NotNull String path) { + myStateStorageManager.addMacro(StoragePathMacros.APP_CONFIG, path); } @Override public void setConfigPath(@NotNull final String configPath) { - myStateStorageManager.addMacro(StoragePathMacros.getMacroName(StoragePathMacros.ROOT_CONFIG), configPath); + myStateStorageManager.addMacro(StoragePathMacros.ROOT_CONFIG, configPath); myConfigPath = configPath; } |