From c2f2356855a96a46280136644f9c2d9929f8c4c0 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 23 Nov 2012 19:06:58 +0400
Subject: [PATCH] Clarifying rename

---
 .../jet/lang/resolve/DescriptorResolver.java          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index 4a8e459e27b..419df0f51d8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -262,7 +262,7 @@ public class DescriptorResolver {
         innerScope.addLabeledDeclaration(functionDescriptor);
 
         List<TypeParameterDescriptorImpl> typeParameterDescriptors =
-                resolveTypeParameters(functionDescriptor, innerScope, function.getTypeParameters(), trace);
+                resolveTypeParametersForCallableDescriptor(functionDescriptor, innerScope, function.getTypeParameters(), trace);
         innerScope.changeLockLevel(WritableScope.LockLevel.BOTH);
         resolveGenericBounds(function, innerScope, typeParameterDescriptors, trace);
 
@@ -501,7 +501,7 @@ public class DescriptorResolver {
         }
     }
 
-    public List<TypeParameterDescriptorImpl> resolveTypeParameters(
+    public List<TypeParameterDescriptorImpl> resolveTypeParametersForCallableDescriptor(
             DeclarationDescriptor containingDescriptor,
             WritableScope extensibleScope,
             List<JetTypeParameter> typeParameters,
@@ -510,12 +510,12 @@ public class DescriptorResolver {
         List<TypeParameterDescriptorImpl> result = new ArrayList<TypeParameterDescriptorImpl>();
         for (int i = 0, typeParametersSize = typeParameters.size(); i < typeParametersSize; i++) {
             JetTypeParameter typeParameter = typeParameters.get(i);
-            result.add(resolveTypeParameter(containingDescriptor, extensibleScope, typeParameter, i, trace));
+            result.add(resolveTypeParameterForCallableDescriptor(containingDescriptor, extensibleScope, typeParameter, i, trace));
         }
         return result;
     }
 
-    private TypeParameterDescriptorImpl resolveTypeParameter(
+    private TypeParameterDescriptorImpl resolveTypeParameterForCallableDescriptor(
             DeclarationDescriptor containingDescriptor,
             WritableScope extensibleScope,
             JetTypeParameter typeParameter,
@@ -940,7 +940,8 @@ public class DescriptorResolver {
                 WritableScope writableScope = new WritableScopeImpl(
                         scope, containingDeclaration, new TraceBasedRedeclarationHandler(trace),
                         "Scope with type parameters of a property");
-                typeParameterDescriptors = resolveTypeParameters(containingDeclaration, writableScope, typeParameters, trace);
+                typeParameterDescriptors = resolveTypeParametersForCallableDescriptor(containingDeclaration, writableScope, typeParameters,
+                                                                                      trace);
                 writableScope.changeLockLevel(WritableScope.LockLevel.READING);
                 resolveGenericBounds(property, writableScope, typeParameterDescriptors, trace);
                 scopeWithTypeParameters = writableScope;