use EnumeratorStringDescriptor.INSTANCE instead of new instance

java/compiler/impl/src/com/intellij/compiler/impl/StateCache.java

@@ -92,7 +92,7 @@ public abstract class StateCache<T> {
 
 
   private PersistentHashMap<String, T> createMap(final File file) throws IOException {
-    return new PersistentHashMap<String,T>(file, new EnumeratorStringDescriptor(), new DataExternalizer<T>() {
+    return new PersistentHashMap<String,T>(file, EnumeratorStringDescriptor.INSTANCE, new DataExternalizer<T>() {
       public void save(@NotNull final DataOutput out, final T value) throws IOException {
         StateCache.this.write(value, out);
       }

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<Key, SourceState, OutputState> implements Compiler {
-  protected static final KeyDescriptor<String> STRING_KEY_DESCRIPTOR = new EnumeratorStringDescriptor();
+  protected static final KeyDescriptor<String> STRING_KEY_DESCRIPTOR = EnumeratorStringDescriptor.INSTANCE;
   private final String myId;
   private final int myVersion;
   private final CompileOrderPlace myOrderPlace;

platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java

@@ -31,7 +31,7 @@ public abstract class StringStubIndexExtension<Psi extends PsiElement> extends A
 
   @NotNull
   public KeyDescriptor<String> getKeyDescriptor() {
-    return new EnumeratorStringDescriptor();
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   public boolean traceKeyHashToVirtualFileMapping() {

platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java

@@ -37,7 +37,6 @@ import java.util.Map;
  */
 public class FileTypeIndex extends ScalarIndexExtension<FileType>
   implements FileBasedIndex.InputFilter, KeyDescriptor<FileType>, DataIndexer<FileType, Void, FileContent> {
-  private static final EnumeratorStringDescriptor ENUMERATOR_STRING_DESCRIPTOR = new EnumeratorStringDescriptor();
 
   @NotNull
   public static Collection<VirtualFile> getFiles(@NotNull FileType fileType, @NotNull GlobalSearchScope scope) {
@@ -103,12 +102,12 @@ public class FileTypeIndex extends ScalarIndexExtension<FileType>
 
   @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);
   }
 

platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java

@@ -43,7 +43,6 @@ public class FilenameIndex extends ScalarIndexExtension<String> {
   @NonNls public static final ID<String, Void> 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<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

platform/lang-impl/src/com/intellij/execution/TestStateStorage.java

@@ -102,7 +102,7 @@ public class TestStateStorage implements Disposable {
     return new ThrowableComputable<PersistentHashMap<String, Record>, IOException>() {
       @Override
       public PersistentHashMap<String, Record> compute() throws IOException {
-        return new PersistentHashMap<String, Record>(file, new EnumeratorStringDescriptor(), new DataExternalizer<Record>() {
+        return new PersistentHashMap<String, Record>(file, EnumeratorStringDescriptor.INSTANCE, new DataExternalizer<Record>() {
           @Override
           public void save(@NotNull DataOutput out, Record value) throws IOException {
             out.writeInt(value.magnitude);

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<String, CacheLibraryInfo>(
-            snapshotInfoFile, new EnumeratorStringDescriptor(), new DataExternalizer<CacheLibraryInfo>() {
+            snapshotInfoFile, EnumeratorStringDescriptor.INSTANCE, new DataExternalizer<CacheLibraryInfo>() {
 
             @Override
             public void save(@NotNull DataOutput out, CacheLibraryInfo value) throws IOException {

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java

@@ -88,7 +88,6 @@ public class GroovyDslFileIndex extends ScalarIndexExtension<String> {
   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<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxControllerClassIndex.java

@@ -42,7 +42,6 @@ import java.util.*;
 
 public class JavaFxControllerClassIndex extends ScalarIndexExtension<String> {
   @NonNls public static final ID<String, Void> 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<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxCustomComponentsIndex.java

@@ -38,7 +38,6 @@ public class JavaFxCustomComponentsIndex extends FileBasedIndexExtension<String,
 
   @NonNls public static final ID<String, Set<String>> KEY = ID.create("javafx.custom.component");
 
-  private final KeyDescriptor<String> 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<String,
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @Override

plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxIdsIndex.java

@@ -31,7 +31,6 @@ public class JavaFxIdsIndex extends FileBasedIndexExtension<String, Set<String>>
 
   @NonNls public static final ID<String, Set<String>> KEY = ID.create("javafx.id.name");
 
-  private final KeyDescriptor<String> 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<String, Set<String>>
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @Override

plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java

@@ -669,7 +669,7 @@ public class MavenIndex {
     }
 
     private PersistentHashMap<String, Set<String>> createPersistentMap(final File f) throws IOException {
-      return new PersistentHashMap<String, Set<String>>(f, new EnumeratorStringDescriptor(), new SetDescriptor());
+      return new PersistentHashMap<String, Set<String>>(f, EnumeratorStringDescriptor.INSTANCE, new SetDescriptor());
     }
 
     public void close(boolean releaseIndexContext) throws MavenIndexException {

plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java

@@ -52,7 +52,6 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension<XmlPropertiesInd
   public final static Key MARKER_KEY = new Key();
   public static final ID<Key,String> 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<XmlPropertiesInd
   @NotNull
   @Override
   public DataExternalizer<String> getValueExternalizer() {
-    return ENUMERATOR_STRING_DESCRIPTOR;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

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<String, Map<String, Collection<SvnBranchItem>>>(myFile, new EnumeratorStringDescriptor(), createExternalizer());
+      myState = new SmallMapSerializer<String, Map<String, Collection<SvnBranchItem>>>(myFile, EnumeratorStringDescriptor.INSTANCE, createExternalizer());
     }
   }
 

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<String, TreeMap<String, BranchCopyData>>(
-        file, new EnumeratorStringDescriptor(), new BranchDataExternalizer());
+        file, EnumeratorStringDescriptor.INSTANCE, new BranchDataExternalizer());
       // list for values by default
       myForSearchMap = new MultiMap<String, String>();
       for (String s : myPersistentMap.keySet()) {

plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassIndex.java

@@ -40,7 +40,6 @@ import java.util.*;
  */
 public class FormClassIndex extends ScalarIndexExtension<String> {
   @NonNls public static final ID<String, Void> 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<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

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<String, XsltSymbolI
     @NotNull
     @Override
     public KeyDescriptor<String> getKeyDescriptor() {
-        return new EnumeratorStringDescriptor();
+        return EnumeratorStringDescriptor.INSTANCE;
     }
 
     @NotNull

python/src/com/jetbrains/python/psi/stubs/PyModuleNameIndex.java

@@ -39,7 +39,6 @@ import java.util.*;
 public class PyModuleNameIndex extends ScalarIndexExtension<String> {
   public static final ID<String, Void> NAME = ID.create("Py.module.name");
 
-  private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor();
   private final DataIndexer<String, Void, FileContent> myDataIndexer = new DataIndexer<String, Void, FileContent>() {
     @NotNull
     @Override
@@ -74,7 +73,7 @@ public class PyModuleNameIndex extends ScalarIndexExtension<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

python/src/com/jetbrains/python/psi/stubs/PySetuptoolsNamespaceIndex.java

@@ -39,8 +39,6 @@ public class PySetuptoolsNamespaceIndex extends ScalarIndexExtension<String> {
   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<String, Void, FileContent> myDataIndexer = new DataIndexer<String, Void, FileContent>() {
     @NotNull
     @Override
@@ -78,7 +76,7 @@ public class PySetuptoolsNamespaceIndex extends ScalarIndexExtension<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return myKeyDescriptor;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java

@@ -87,7 +87,7 @@ public class DomFileIndex extends ScalarIndexExtension<String>{
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return new EnumeratorStringDescriptor();
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java

@@ -89,7 +89,7 @@ public class Html5CustomAttributesIndex extends ScalarIndexExtension<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return new EnumeratorStringDescriptor();
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java

@@ -169,7 +169,7 @@ public class RelaxSymbolIndex extends ScalarIndexExtension<String> {
   @NotNull
   @Override
   public KeyDescriptor<String> getKeyDescriptor() {
-    return new EnumeratorStringDescriptor();
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @NotNull

xml/xml-psi-impl/src/com/intellij/xml/index/XmlIndex.java

@@ -40,8 +40,6 @@ import java.util.List;
  */
 public abstract class XmlIndex<V> extends FileBasedIndexExtension<String, V> {
 
-  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<V> extends FileBasedIndexExtension<String, V> {
   @Override
   @NotNull
   public KeyDescriptor<String> getKeyDescriptor() {
-    return KEY_DESCRIPTOR;
+    return EnumeratorStringDescriptor.INSTANCE;
   }
 
   @Override