1 files changed, 7 insertions, 12 deletions
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java
index 5e74a8b5dbb3..9e656b98a7fb 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java
@@ -33,7 +33,7 @@ import static com.intellij.codeInspection.bytecodeAnalysis.ProjectBytecodeAnalys
 /**
  * @author lambdamix
  */
-public class ClassDataIndexer implements DataIndexer<Integer, Collection<IntIdEquation>, FileContent> {
+public class ClassDataIndexer implements DataIndexer<Long, IdEquation, FileContent> {
   final BytecodeAnalysisConverter myConverter;
 
   public ClassDataIndexer(BytecodeAnalysisConverter converter) {
@@ -42,25 +42,20 @@ public class ClassDataIndexer implements DataIndexer<Integer, Collection<IntIdEq
 
   @NotNull
   @Override
-  public Map<Integer, Collection<IntIdEquation>> map(@NotNull FileContent inputData) {
-    HashMap<Integer, Collection<IntIdEquation>> map = new HashMap<Integer, Collection<IntIdEquation>>(2);
+  public Map<Long, IdEquation> map(@NotNull FileContent inputData) {
+    HashMap<Long, IdEquation> map = new HashMap<Long, IdEquation>();
     try {
       ClassEquations rawEquations = processClass(new ClassReader(inputData.getContent()));
       List<Equation<Key, Value>> rawParameterEquations = rawEquations.parameterEquations;
       List<Equation<Key, Value>> rawContractEquations = rawEquations.contractEquations;
 
-      Collection<IntIdEquation> idParameterEquations = new ArrayList<IntIdEquation>(rawParameterEquations.size());
-      Collection<IntIdEquation> idContractEquations = new ArrayList<IntIdEquation>(rawContractEquations.size());
-
-      map.put(BytecodeAnalysisIndex.indexKey(inputData.getFile(), true), idParameterEquations);
-      map.put(BytecodeAnalysisIndex.indexKey(inputData.getFile(), false), idContractEquations);
-
-
       for (Equation<Key, Value> rawParameterEquation: rawParameterEquations) {
-        idParameterEquations.add(myConverter.convert(rawParameterEquation));
+        IdEquation equation = myConverter.convert(rawParameterEquation);
+        map.put(equation.id, equation);
       }
       for (Equation<Key, Value> rawContractEquation: rawContractEquations) {
-        idContractEquations.add(myConverter.convert(rawContractEquation));
+        IdEquation equation = myConverter.convert(rawContractEquation);
+        map.put(equation.id, equation);
       }
     }
     catch (ProcessCanceledException e) {