diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
commit | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (patch) | |
tree | fc0dcd722b6d445468dbe7dad13b4c11781b1cbe /platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-c3d3a90f6b4ead083d63e28e6b9fcea93d675678.tar.gz |
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
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<FileType, AbstractFileType> 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(); |