From f5e9230a04c1731dee8f851425f25b23e3f42058 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 15 Oct 2014 17:24:42 +0400
Subject: [PATCH] Renamed ReferenceSearcherImpl to IdeaReferenceSearcher

---
 .../jetbrains/jet/plugin/actions/JavaToKotlinAction.java  | 4 ++--
 .../conversion/copy/ConvertJavaCopyPastePostProcessor.kt  | 2 +-
 j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt        | 2 +-
 .../jet/j2k/test/AbstractJavaToKotlinConverterTest.kt     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java
index 75099cd533c..201d4eacac7 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.j2k.Converter;
 import org.jetbrains.jet.j2k.ConverterSettings;
 import org.jetbrains.jet.j2k.FilesConversionScope;
-import org.jetbrains.jet.j2k.ReferenceSearcherImpl;
+import org.jetbrains.jet.j2k.IdeaReferenceSearcher;
 import org.jetbrains.jet.plugin.j2k.J2kPostProcessor;
 
 import java.util.List;
@@ -50,7 +50,7 @@ public class JavaToKotlinAction extends AnAction {
         final Converter converter = Converter.OBJECT$.create(project,
                                                              ConverterSettings.defaultSettings,
                                                              new FilesConversionScope(selectedJavaFiles),
-                                                             ReferenceSearcherImpl.INSTANCE$,
+                                                             IdeaReferenceSearcher.INSTANCE$,
                                                              //TODO: (module refactoring) resulting files should be analyzed in context of respective java files
                                                              new J2kPostProcessor(selectedJavaFiles.iterator().next()));
         CommandProcessor.getInstance().executeCommand(
diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
index 3e272995a7f..31b23c15c5a 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
@@ -89,7 +89,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
         val converter = Converter.create(fileCopiedFrom.getProject(),
                                          ConverterSettings.defaultSettings,
                                          FilesConversionScope(listOf(fileCopiedFrom)),
-                                         ReferenceSearcherImpl,
+                                         IdeaReferenceSearcher,
                                          J2kPostProcessor(fileCopiedTo))
         val startOffsets = code.startOffsets
         val endOffsets = code.endOffsets
diff --git a/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt b/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt
index e9377341879..5f3f970ae04 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt
@@ -35,7 +35,7 @@ public object EmptyReferenceSearcher: ReferenceSearcher {
     override fun findMethodCalls(method: PsiMethod, scope: PsiElement) = Collections.emptyList<PsiMethodCallExpression>()
 }
 
-public object ReferenceSearcherImpl: ReferenceSearcher {
+public object IdeaReferenceSearcher : ReferenceSearcher {
     override fun findVariableUsages(variable: PsiVariable, scope: PsiElement): Collection<PsiReferenceExpression> {
         return ReferencesSearch.search(variable, LocalSearchScope(scope)).findAll().filterIsInstance(javaClass<PsiReferenceExpression>())
     }
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
index bb162f0c42c..f802419267e 100644
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
@@ -34,12 +34,12 @@ import org.jetbrains.jet.plugin.j2k.J2kPostProcessor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
 import com.intellij.psi.PsiJavaFile
-import org.jetbrains.jet.j2k.ReferenceSearcherImpl
+import org.jetbrains.jet.j2k.IdeaReferenceSearcher
 import junit.framework.TestCase
-import com.intellij.openapi.util.Disposer
 import org.jetbrains.jet.j2k.translateToKotlin
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
 import org.jetbrains.jet.JetTestCaseBuilder
+import com.intellij.openapi.util.Disposer
 
 public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixtureTestCase() {
     val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")
@@ -136,14 +136,14 @@ public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixt
 
     private fun elementToKotlin(text: String, settings: ConverterSettings, project: Project): String {
         val fileWithText = createJavaFile(text)
-        val converter = Converter.create(project, settings, FilesConversionScope(listOf(fileWithText)), ReferenceSearcherImpl, J2kPostProcessor(fileWithText))
+        val converter = Converter.create(project, settings, FilesConversionScope(listOf(fileWithText)), IdeaReferenceSearcher, J2kPostProcessor(fileWithText))
         val element = fileWithText.getFirstChild()!!
         return converter.elementToKotlin(element)
     }
 
     private fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String {
         val file = createJavaFile(text)
-        val converter = Converter.create(project, settings, FilesConversionScope(listOf(file)), ReferenceSearcherImpl, J2kPostProcessor(file))
+        val converter = Converter.create(project, settings, FilesConversionScope(listOf(file)), IdeaReferenceSearcher, J2kPostProcessor(file))
         return converter.elementToKotlin(file)
     }