From b1bfd41de68730a3f2dd30e754dc1f8b8428b534 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 4 Apr 2017 14:57:30 +0300
Subject: [PATCH] javac ast indices: cleanup, clarify names

---
 .../jps/backwardRefs/BackwardReferenceRegistrar.java       | 1 -
 .../jps/backwardRefs/CompilerBackwardReferenceIndex.java   | 7 ++++---
 .../src/org/jetbrains/jps/backwardRefs/SignatureData.java  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceRegistrar.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceRegistrar.java
index 42c6a81f1298..82163edd81f7 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceRegistrar.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceRegistrar.java
@@ -20,7 +20,6 @@ import org.jetbrains.jps.javac.ast.api.JavacDef;
 import org.jetbrains.jps.javac.ast.api.JavacFileReferencesRegistrar;
 import org.jetbrains.jps.javac.ast.api.JavacRef;
 
-import java.util.Collection;
 import java.util.List;
 
 public class BackwardReferenceRegistrar implements JavacFileReferencesRegistrar {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java
index 376f50ff8ba7..98de9c55c431 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/CompilerBackwardReferenceIndex.java
@@ -21,11 +21,12 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.CommonProcessors;
 import com.intellij.util.Processor;
-import com.intellij.util.indexing.*;
+import com.intellij.util.indexing.ID;
+import com.intellij.util.indexing.IndexExtension;
+import com.intellij.util.indexing.InvertedIndex;
 import com.intellij.util.indexing.impl.*;
 import com.intellij.util.io.*;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.backwardRefs.index.CompiledFileData;
 import org.jetbrains.jps.backwardRefs.index.CompilerIndices;
 import org.jetbrains.jps.builders.storage.BuildDataCorruptedException;
@@ -78,7 +79,7 @@ public class CompilerBackwardReferenceIndex {
 
       myFilePathEnumerator = new PersistentStringEnumerator(new File(myIndicesDir, FILE_ENUM_TAB)) {
         @Override
-        public int enumerate(@Nullable String value) throws IOException {
+        public int enumerate(String value) throws IOException {
           return super.enumerate(SystemInfo.isFileSystemCaseSensitive ? value : value.toLowerCase(Locale.ROOT));
         }
       };
diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/SignatureData.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/SignatureData.java
index cf530dbfd999..3374eec3b259 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/SignatureData.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/SignatureData.java
@@ -19,9 +19,9 @@ public class SignatureData {
   private final int myRawReturnType;
   private final boolean myStatic;
 
-  public SignatureData(int type, boolean aStatic) {
-    myRawReturnType = type;
-    myStatic = aStatic;
+  public SignatureData(int rawReturnType, boolean isStatic) {
+    myRawReturnType = rawReturnType;
+    myStatic = isStatic;
   }
 
   public int getRawReturnType() {