diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java b/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java index 631988e17577..51888934c205 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java @@ -92,7 +92,7 @@ public abstract class StateCache { private PersistentHashMap createMap(final File file) throws IOException { - return new PersistentHashMap(file, new EnumeratorStringDescriptor(), new DataExternalizer() { + return new PersistentHashMap(file, EnumeratorStringDescriptor.INSTANCE, new DataExternalizer() { public void save(@NotNull final DataOutput out, final T value) throws IOException { StateCache.this.write(value, out); } diff --git a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java index 05250e619ed0..93b1604d8757 100644 --- a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java +++ b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public abstract class GenericCompiler implements Compiler { - protected static final KeyDescriptor STRING_KEY_DESCRIPTOR = new EnumeratorStringDescriptor(); + protected static final KeyDescriptor STRING_KEY_DESCRIPTOR = EnumeratorStringDescriptor.INSTANCE; private final String myId; private final int myVersion; private final CompileOrderPlace myOrderPlace; diff --git a/platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java b/platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java index 0e4cd6b8fff4..e45045696e77 100644 --- a/platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java +++ b/platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java @@ -31,7 +31,7 @@ public abstract class StringStubIndexExtension extends A @NotNull public KeyDescriptor getKeyDescriptor() { - return new EnumeratorStringDescriptor(); + return EnumeratorStringDescriptor.INSTANCE; } public boolean traceKeyHashToVirtualFileMapping() { diff --git a/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java b/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java index e700a5ddaa7f..2fffcc2f2cfe 100644 --- a/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java +++ b/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java @@ -37,7 +37,6 @@ import java.util.Map; */ public class FileTypeIndex extends ScalarIndexExtension implements FileBasedIndex.InputFilter, KeyDescriptor, DataIndexer { - private static final EnumeratorStringDescriptor ENUMERATOR_STRING_DESCRIPTOR = new EnumeratorStringDescriptor(); @NotNull public static Collection getFiles(@NotNull FileType fileType, @NotNull GlobalSearchScope scope) { @@ -103,12 +102,12 @@ public class FileTypeIndex extends ScalarIndexExtension @Override public void save(@NotNull DataOutput out, FileType value) throws IOException { - ENUMERATOR_STRING_DESCRIPTOR.save(out, value.getName()); + EnumeratorStringDescriptor.INSTANCE.save(out, value.getName()); } @Override public FileType read(@NotNull DataInput in) throws IOException { - String read = ENUMERATOR_STRING_DESCRIPTOR.read(in); + String read = EnumeratorStringDescriptor.INSTANCE.read(in); return myFileTypeManager.findFileTypeByName(read); } diff --git a/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java index 1f1a94fc0cf9..68fbe3723fb3 100644 --- a/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java +++ b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java @@ -43,7 +43,6 @@ public class FilenameIndex extends ScalarIndexExtension { @NonNls public static final ID NAME = ID.create("FilenameIndex"); private final MyDataIndexer myDataIndexer = new MyDataIndexer(); private final MyInputFilter myInputFilter = new MyInputFilter(); - private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); @NotNull @Override @@ -60,7 +59,7 @@ public class FilenameIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java b/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java index 76edc645f6fb..8c6fd2b08af1 100644 --- a/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java +++ b/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java @@ -102,7 +102,7 @@ public class TestStateStorage implements Disposable { return new ThrowableComputable, IOException>() { @Override public PersistentHashMap compute() throws IOException { - return new PersistentHashMap(file, new EnumeratorStringDescriptor(), new DataExternalizer() { + return new PersistentHashMap(file, EnumeratorStringDescriptor.INSTANCE, new DataExternalizer() { @Override public void save(@NotNull DataOutput out, Record value) throws IOException { out.writeInt(value.magnitude); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java index fd0672a93058..4a2fed3d442c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java @@ -277,7 +277,7 @@ public class JarHandler extends ZipHandler { for (int i = 0; i < 2; ++i) { try { info = new PersistentHashMap( - snapshotInfoFile, new EnumeratorStringDescriptor(), new DataExternalizer() { + snapshotInfoFile, EnumeratorStringDescriptor.INSTANCE, new DataExternalizer() { @Override public void save(@NotNull DataOutput out, CacheLibraryInfo value) throws IOException { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java index 4e4bb116db7f..0b59d2ec9f22 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java @@ -88,7 +88,6 @@ public class GroovyDslFileIndex extends ScalarIndexExtension { private static final ExecutorService ourPool = AppExecutorUtil.createBoundedApplicationPoolExecutor(4); private final MyDataIndexer myDataIndexer = new MyDataIndexer(); - private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); public GroovyDslFileIndex() { VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileAdapter() { @@ -116,7 +115,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxControllerClassIndex.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxControllerClassIndex.java index 3cc2d88bb5aa..fec2823b3f90 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxControllerClassIndex.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxControllerClassIndex.java @@ -42,7 +42,6 @@ import java.util.*; public class JavaFxControllerClassIndex extends ScalarIndexExtension { @NonNls public static final ID NAME = ID.create("JavaFxControllerClassIndex"); - private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); private final MyInputFilter myInputFilter = new MyInputFilter(); private final MyDataIndexer myDataIndexer = new MyDataIndexer(); @@ -61,7 +60,7 @@ public class JavaFxControllerClassIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java index 721f35f5d8f6..155d99bbfbb9 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java @@ -38,7 +38,6 @@ public class JavaFxCustomComponentsIndex extends FileBasedIndexExtension> KEY = ID.create("javafx.custom.component"); - private final KeyDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); private final FileBasedIndex.InputFilter myInputFilter = new JavaFxControllerClassIndex.MyInputFilter(); private final FxmlDataIndexer myDataIndexer = new FxmlDataIndexer() { @Override @@ -102,7 +101,7 @@ public class JavaFxCustomComponentsIndex extends FileBasedIndexExtension getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @Override diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java index 5a828c7c9b6c..1de41873363d 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java @@ -31,7 +31,6 @@ public class JavaFxIdsIndex extends FileBasedIndexExtension> @NonNls public static final ID> KEY = ID.create("javafx.id.name"); - private final KeyDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); private final FileBasedIndex.InputFilter myInputFilter = new JavaFxControllerClassIndex.MyInputFilter(); private final FxmlDataIndexer myDataIndexer = new FxmlDataIndexer(); private final FxmlDataExternalizer myDataExternalizer = new FxmlDataExternalizer(); @@ -63,7 +62,7 @@ public class JavaFxIdsIndex extends FileBasedIndexExtension> @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java index f4e3b10f1dd4..b712f72ec722 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java @@ -669,7 +669,7 @@ public class MavenIndex { } private PersistentHashMap> createPersistentMap(final File f) throws IOException { - return new PersistentHashMap>(f, new EnumeratorStringDescriptor(), new SetDescriptor()); + return new PersistentHashMap>(f, EnumeratorStringDescriptor.INSTANCE, new SetDescriptor()); } public void close(boolean releaseIndexContext) throws MavenIndexException { diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java index 65eb87b27dd7..aba972ffc15d 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java @@ -52,7 +52,6 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension NAME = ID.create("xmlProperties"); - private static final EnumeratorStringDescriptor ENUMERATOR_STRING_DESCRIPTOR = new EnumeratorStringDescriptor(); private static final String HTTP_JAVA_SUN_COM_DTD_PROPERTIES_DTD = "http://java.sun.com/dtd/properties.dtd"; @NotNull @@ -76,7 +75,7 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension getValueExternalizer() { - return ENUMERATOR_STRING_DESCRIPTOR; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java index 041e33cc5ac7..f51b7e280eb4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java @@ -63,7 +63,7 @@ public class SvnLoadedBranchesStorage { public void activate() { synchronized (myLock) { - myState = new SmallMapSerializer>>(myFile, new EnumeratorStringDescriptor(), createExternalizer()); + myState = new SmallMapSerializer>>(myFile, EnumeratorStringDescriptor.INSTANCE, createExternalizer()); } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java index 50acfe40b9ee..626308e5a69b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java @@ -160,7 +160,7 @@ public class SvnBranchPointsCalculator { PersistentHolder(final File file) { myLock = new Object(); myPersistentMap = new SmallMapSerializer>( - file, new EnumeratorStringDescriptor(), new BranchDataExternalizer()); + file, EnumeratorStringDescriptor.INSTANCE, new BranchDataExternalizer()); // list for values by default myForSearchMap = new MultiMap(); for (String s : myPersistentMap.keySet()) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassIndex.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassIndex.java index 000b63716ef4..dcc11a75c1a9 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassIndex.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassIndex.java @@ -40,7 +40,6 @@ import java.util.*; */ public class FormClassIndex extends ScalarIndexExtension { @NonNls public static final ID NAME = ID.create("FormClassIndex"); - private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); private final MyDataIndexer myDataIndexer = new MyDataIndexer(); @Override @@ -58,7 +57,7 @@ public class FormClassIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java index f3a41b856cdd..2eee57d9600c 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java @@ -29,7 +29,10 @@ import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.ArrayUtil; import com.intellij.util.indexing.*; -import com.intellij.util.io.*; +import com.intellij.util.io.DataExternalizer; +import com.intellij.util.io.EnumDataDescriptor; +import com.intellij.util.io.EnumeratorStringDescriptor; +import com.intellij.util.io.KeyDescriptor; import com.intellij.util.text.CharArrayUtil; import com.intellij.util.xml.NanoXmlUtil; import org.intellij.lang.xpath.xslt.XsltSupport; @@ -125,7 +128,7 @@ public class XsltSymbolIndex extends FileBasedIndexExtension getKeyDescriptor() { - return new EnumeratorStringDescriptor(); + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/python/src/com/jetbrains/python/psi/stubs/PyModuleNameIndex.java b/python/src/com/jetbrains/python/psi/stubs/PyModuleNameIndex.java index 12675aeae738..b2ee00a9a7e5 100644 --- a/python/src/com/jetbrains/python/psi/stubs/PyModuleNameIndex.java +++ b/python/src/com/jetbrains/python/psi/stubs/PyModuleNameIndex.java @@ -39,7 +39,6 @@ import java.util.*; public class PyModuleNameIndex extends ScalarIndexExtension { public static final ID NAME = ID.create("Py.module.name"); - private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); private final DataIndexer myDataIndexer = new DataIndexer() { @NotNull @Override @@ -74,7 +73,7 @@ public class PyModuleNameIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/python/src/com/jetbrains/python/psi/stubs/PySetuptoolsNamespaceIndex.java b/python/src/com/jetbrains/python/psi/stubs/PySetuptoolsNamespaceIndex.java index a0bf1cceb943..c9de7d316e84 100644 --- a/python/src/com/jetbrains/python/psi/stubs/PySetuptoolsNamespaceIndex.java +++ b/python/src/com/jetbrains/python/psi/stubs/PySetuptoolsNamespaceIndex.java @@ -39,8 +39,6 @@ public class PySetuptoolsNamespaceIndex extends ScalarIndexExtension { private static final Pattern RE_NAMESPACE = Pattern.compile("sys\\.modules\\.setdefault\\('([^']*)'"); private static final String NAMESPACE_FILE_SUFFIX = "-nspkg.pth"; - private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor(); - private final DataIndexer myDataIndexer = new DataIndexer() { @NotNull @Override @@ -78,7 +76,7 @@ public class PySetuptoolsNamespaceIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return myKeyDescriptor; + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java b/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java index 75c67ff21c72..f0464ec406a0 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java +++ b/xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java @@ -87,7 +87,7 @@ public class DomFileIndex extends ScalarIndexExtension{ @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return new EnumeratorStringDescriptor(); + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java b/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java index 5dfa9b4259cf..ce3560b06134 100644 --- a/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java +++ b/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java @@ -89,7 +89,7 @@ public class Html5CustomAttributesIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return new EnumeratorStringDescriptor(); + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java index 3150092190a8..d99028d12878 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java @@ -169,7 +169,7 @@ public class RelaxSymbolIndex extends ScalarIndexExtension { @NotNull @Override public KeyDescriptor getKeyDescriptor() { - return new EnumeratorStringDescriptor(); + return EnumeratorStringDescriptor.INSTANCE; } @NotNull diff --git a/xml/xml-psi-impl/src/com/intellij/xml/index/XmlIndex.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XmlIndex.java index 28a43ab9bf52..109032467860 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/index/XmlIndex.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/XmlIndex.java @@ -40,8 +40,6 @@ import java.util.List; */ public abstract class XmlIndex extends FileBasedIndexExtension { - protected static final EnumeratorStringDescriptor KEY_DESCRIPTOR = new EnumeratorStringDescriptor(); - protected static GlobalSearchScope createFilter(final Project project) { final GlobalSearchScope projectScope = GlobalSearchScope.allScope(project); return new GlobalSearchScope(project) { @@ -101,7 +99,7 @@ public abstract class XmlIndex extends FileBasedIndexExtension { @Override @NotNull public KeyDescriptor getKeyDescriptor() { - return KEY_DESCRIPTOR; + return EnumeratorStringDescriptor.INSTANCE; } @Override