From 45b3a13b01534a7123d1c22e2e19059cc5ce32b8 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sun, 31 Aug 2014 10:48:07 +0200 Subject: [PATCH] extract StoragePathMacros.ROOT_CONFIG --- .../profile/codeInspection/InspectionProfileManager.java | 3 ++- .../intellij/codeInsight/template/impl/TemplateSettings.java | 2 +- .../psi/impl/source/codeStyle/CodeStyleSchemesImpl.java | 3 ++- platform/lang-impl/src/com/intellij/tools/ToolManager.java | 3 ++- .../intellij/openapi/actionSystem/ex/QuickListsManager.java | 3 ++- .../openapi/components/impl/stores/ApplicationStoreImpl.java | 3 +-- .../openapi/editor/colors/impl/EditorColorsManagerImpl.java | 3 ++- .../intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java | 3 ++- .../com/intellij/openapi/keymap/impl/KeymapManagerImpl.java | 2 +- .../com/intellij/openapi/components/StoragePathMacros.java | 2 ++ .../vcs/changes/shelf/CompoundShelfFileProcessor.java | 5 +++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java index 7d0f203e94df..41f3c9b8e6b9 100644 --- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java +++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java @@ -19,6 +19,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.components.NamedComponent; import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.diagnostic.Logger; import com.intellij.profile.ApplicationProfileManager; import com.intellij.profile.Profile; @@ -41,7 +42,7 @@ import java.util.List; */ public abstract class InspectionProfileManager extends ApplicationProfileManager implements SeverityProvider, NamedComponent { @NonNls protected static final String INSPECTION_DIR = "inspection"; - @NonNls protected static final String FILE_SPEC = "$ROOT_CONFIG$/" + INSPECTION_DIR; + @NonNls protected static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + '/' + INSPECTION_DIR; private final List myProfileChangeAdapters = ContainerUtil.createLockFreeCopyOnWriteList(); 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 e5f2fd4ae23d..abf28256aaef 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 @@ -105,7 +105,7 @@ public class TemplateSettings implements PersistentStateComponent, Expo private int myMaxKeyLength = 0; private char myDefaultShortcutChar = TAB_CHAR; private final SchemesManager mySchemesManager; - private static final String FILE_SPEC = "$ROOT_CONFIG$/templates"; + private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/templates"; public static class TemplateKey { private String groupName; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java index 862084a5615d..b12dee17e9fd 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java @@ -17,6 +17,7 @@ package com.intellij.psi.impl.source.codeStyle; import com.intellij.openapi.components.ExportableComponent; import com.intellij.openapi.components.RoamingType; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.options.BaseSchemeProcessor; import com.intellij.openapi.options.SchemeProcessor; import com.intellij.openapi.options.SchemesManager; @@ -46,7 +47,7 @@ public abstract class CodeStyleSchemesImpl extends CodeStyleSchemes implements E @NonNls static final String CODE_STYLES_DIRECTORY = "codestyles"; private final SchemesManager mySchemesManager; - @NonNls private static final String FILE_SPEC = "$ROOT_CONFIG$/" + CODE_STYLES_DIRECTORY; + @NonNls private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/" + CODE_STYLES_DIRECTORY; public CodeStyleSchemesImpl(SchemesManagerFactory schemesManagerFactory) { SchemeProcessor processor = new BaseSchemeProcessor() { diff --git a/platform/lang-impl/src/com/intellij/tools/ToolManager.java b/platform/lang-impl/src/com/intellij/tools/ToolManager.java index 59a17bea67ed..0722090527bb 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolManager.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolManager.java @@ -17,6 +17,7 @@ package com.intellij.tools; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.options.SchemeProcessor; import com.intellij.openapi.options.SchemesManagerFactory; import org.jetbrains.annotations.NotNull; @@ -32,7 +33,7 @@ public class ToolManager extends BaseToolManager { @Override protected String getSchemesPath() { - return "$ROOT_CONFIG$/tools"; + return StoragePathMacros.ROOT_CONFIG + "/tools"; } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java index a17370e73266..bf7c79695c94 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java @@ -24,6 +24,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.ex.DecodeDefaultsUtil; import com.intellij.openapi.components.ExportableApplicationComponent; import com.intellij.openapi.components.RoamingType; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.BaseSchemeProcessor; import com.intellij.openapi.options.SchemesManager; @@ -63,7 +64,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ public QuickListsManager(ActionManagerEx actionManagerEx, SchemesManagerFactory schemesManagerFactory) { myActionManager = actionManagerEx; mySchemesManager = schemesManagerFactory.createSchemesManager( - "$ROOT_CONFIG$/quicklists", + StoragePathMacros.ROOT_CONFIG + "/quicklists", new BaseSchemeProcessor(){ public QuickList readScheme(@NotNull final Document schemeContent) throws InvalidDataException, IOException, JDOMException { return loadListFromDocument(schemeContent); 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 aef6d761fce4..92a0fcf83283 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 CONFIG_MACRO = "ROOT_CONFIG"; private static final String ROOT_ELEMENT_NAME = "application"; private final ApplicationImpl myApplication; @@ -99,7 +98,7 @@ class ApplicationStoreImpl extends ComponentStoreImpl implements IApplicationSto @Override public void setConfigPath(@NotNull final String configPath) { - myStateStorageManager.addMacro(CONFIG_MACRO, configPath); + myStateStorageManager.addMacro(StoragePathMacros.getMacroName(StoragePathMacros.ROOT_CONFIG), configPath); myConfigPath = configPath; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java index 452d7e144356..cf3c196a9d78 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java @@ -26,6 +26,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.components.ExportableComponent; import com.intellij.openapi.components.NamedComponent; import com.intellij.openapi.components.RoamingType; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.colors.EditorColorsListener; @@ -67,7 +68,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name private final DefaultColorSchemesManager myDefaultColorSchemesManager; private final SchemesManager mySchemesManager; @NonNls private static final String NAME_ATTR = "name"; - private static final String FILE_SPEC = "$ROOT_CONFIG$/colors"; + private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/colors"; private static final String FILE_EXT = ".icls"; public EditorColorsManagerImpl(DefaultColorSchemesManager defaultColorSchemesManager, SchemesManagerFactory schemesManagerFactory) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index 198ed907a8d9..837626b53246 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -24,6 +24,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.impl.TransferToPooledThreadQueue; import com.intellij.openapi.components.ExportableApplicationComponent; import com.intellij.openapi.components.RoamingType; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.fileEditor.impl.LoadTextUtil; @@ -120,7 +121,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME private static final String[] FILE_TYPES_WITH_PREDEFINED_EXTENSIONS = {"JSP", "JSPX", "DTD", "HTML", "Properties", "XHTML"}; private final SchemesManager mySchemesManager; @NonNls - private static final String FILE_SPEC = "$ROOT_CONFIG$/filetypes"; + private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/filetypes"; private final ConcurrentBitSet autoDetectWasRun = new ConcurrentBitSet(); private final ConcurrentBitSet autoDetectedAsText = new ConcurrentBitSet(); private final ConcurrentBitSet autoDetectedAsBinary = new ConcurrentBitSet(); 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 7c65a805ee6c..7c30e4faedec 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 @@ -67,7 +67,7 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat KeymapManagerImpl(DefaultKeymap defaultKeymap, SchemesManagerFactory factory) { mySchemesManager = factory.createSchemesManager( - "$ROOT_CONFIG$/keymaps", + StoragePathMacros.ROOT_CONFIG + "/keymaps", new BaseSchemeProcessor() { @Override public KeymapImpl readScheme(@NotNull final Document schemeContent) throws InvalidDataException, IOException, JDOMException { diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java b/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java index 765f350309bd..374423225694 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java +++ b/platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java @@ -31,6 +31,8 @@ import org.jetbrains.annotations.NotNull; * @since 5/2/12 12:57 PM */ public class StoragePathMacros { + @NonNls @NotNull public static final String ROOT_CONFIG = "$ROOT_CONFIG$"; + /** Points to the application-level settings root directory. */ @NonNls @NotNull public static final String APP_CONFIG = "$APP_CONFIG$"; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java index d6bcffde3bbd..911d3628231e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java @@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.impl.ApplicationImpl; import com.intellij.openapi.components.RoamingType; +import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.components.impl.stores.StorageUtil; import com.intellij.openapi.components.impl.stores.StreamProvider; import com.intellij.openapi.diagnostic.Logger; @@ -47,7 +48,7 @@ public class CompoundShelfFileProcessor { mySubdirName = subdirName; myServerStreamProvider = ((ApplicationImpl)ApplicationManager.getApplication()).getStateStore().getStateStorageManager().getStreamProvider(); - FILE_SPEC = "$ROOT_CONFIG$/" + subdirName + "/"; + FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/" + subdirName + "/"; myShelfPath = PathManager.getConfigPath() + File.separator + mySubdirName; } @@ -55,7 +56,7 @@ public class CompoundShelfFileProcessor { myServerStreamProvider = serverStreamProvider; myShelfPath = shelfPath; mySubdirName = new File(myShelfPath).getName(); - FILE_SPEC = "$ROOT_CONFIG$/" + mySubdirName + "/"; + FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/" + mySubdirName + "/"; } /*