From e0f13da108aabb22d3b34588650338de620bb306 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Thu, 26 Dec 2013 20:55:14 +0400
Subject: [PATCH] Refactoring: rename method

---
 .../jet/plugin/caches/resolve/KotlinLightClassContextCache.kt   | 2 +-
 .../jetbrains/jet/plugin/project/CancelableResolveSession.java  | 2 +-
 .../org/jetbrains/jet/plugin/project/ResolveElementCache.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt
index 43b7a4dbb49..74a1d81a78f 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt
+++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassContextCache.kt
@@ -74,7 +74,7 @@ class KotlinLightClassContextCache(val project: Project) {
         }
 
         val resolveElementCache = CachedValuesManager.getManager(project).getCachedValue(project, cacheKey, provider, false)
-        return resolveElementCache?.resolveElement(classOrObject) ?: BindingContext.EMPTY
+        return resolveElementCache?.resolveToElement(classOrObject) ?: BindingContext.EMPTY
     }
 
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java b/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java
index 78babba620e..7db780d52f4 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java
@@ -59,7 +59,7 @@ public class CancelableResolveSession implements KotlinCodeAnalyzer, Modificatio
         return computableWithProcessingCancel(new Computable<BindingContext>() {
             @Override
             public BindingContext compute() {
-                return resolveElementCache.resolveElement(element);
+                return resolveElementCache.resolveToElement(element);
             }
         });
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
index ace2ce42bbb..5d47438145a 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
@@ -82,7 +82,7 @@ public class ResolveElementCache {
     }
 
     @NotNull
-    public BindingContext resolveElement(@NotNull JetElement jetElement) {
+    public BindingContext resolveToElement(@NotNull JetElement jetElement) {
         @SuppressWarnings("unchecked") JetElement elementOfAdditionalResolve = (JetElement) JetPsiUtil.getTopmostParentOfTypes(
                 jetElement,
                 JetNamedFunction.class,