From 0c74f1679b6be7f7a2b82e936aebbde725eadcc2 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 14 Jan 2015 21:18:13 +0300
Subject: [PATCH] Variable renames

---
 .../jetbrains/kotlin/resolve/ImportsResolver.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java
index 777cb6ba178..e3d1dffeb65 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java
@@ -170,12 +170,12 @@ public class ImportsResolver {
     public static void reportUselessImport(
         @NotNull JetImportDirective importDirective,
         @NotNull JetScope fileScope,
-        @Nullable Collection<? extends DeclarationDescriptor> resolvedDirectives,
+        @Nullable Collection<? extends DeclarationDescriptor> resolvedTo,
         @NotNull BindingTrace trace
     ) {
 
         JetExpression importedReference = importDirective.getImportedReference();
-        if (importedReference == null || resolvedDirectives == null) {
+        if (importedReference == null || resolvedTo == null) {
             return;
         }
         Name aliasName = JetPsiUtil.getAliasName(importDirective);
@@ -184,18 +184,18 @@ public class ImportsResolver {
         }
 
         boolean uselessHiddenImport = true;
-        for (DeclarationDescriptor wasResolved : resolvedDirectives) {
+        for (DeclarationDescriptor target : resolvedTo) {
             DeclarationDescriptor isResolved = null;
-            if (wasResolved instanceof ClassDescriptor) {
+            if (target instanceof ClassDescriptor) {
                 isResolved = fileScope.getClassifier(aliasName);
             }
-            else if (wasResolved instanceof VariableDescriptor) {
+            else if (target instanceof VariableDescriptor) {
                 isResolved = fileScope.getLocalVariable(aliasName);
             }
-            else if (wasResolved instanceof PackageViewDescriptor) {
+            else if (target instanceof PackageViewDescriptor) {
                 isResolved = fileScope.getPackage(aliasName);
             }
-            if (isResolved == null || isResolved.equals(wasResolved)) {
+            if (isResolved == null || isResolved.equals(target)) {
                 uselessHiddenImport = false;
             }
         }