From ac33ccc0fecfa86d2ff2e551bb333a35996b0d59 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 25 Sep 2013 20:52:23 +0400
Subject: [PATCH] refactoring: moved method

---
 .../lang/resolve/calls/CandidateResolver.java |  4 ++--
 .../calls/inference/ConstraintsUtil.java      | 23 -------------------
 .../jetbrains/jet/lang/types/TypeUtils.java   | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
index 17b6d08f46c..ef4196b3802 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
@@ -568,8 +568,8 @@ public class CandidateResolver {
         }
         constraintSystem.registerTypeVariables(typeVariables);
 
-        TypeSubstitutor substituteDontCare = ConstraintsUtil
-                .makeConstantSubstitutor(candidateWithFreshVariables.getTypeParameters(), DONT_CARE);
+        TypeSubstitutor substituteDontCare =
+                makeConstantSubstitutor(candidateWithFreshVariables.getTypeParameters(), DONT_CARE);
 
         // Value parameters
         for (Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> entry : candidateCall.getValueArguments().entrySet()) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java
index 88cb8a09fb6..70f2850af8f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java
@@ -111,27 +111,4 @@ public class ConstraintsUtil {
         }
         return true;
     }
-
-    public static TypeSubstitutor makeConstantSubstitutor(Collection<TypeParameterDescriptor> typeParameterDescriptors, JetType type) {
-        final Set<TypeConstructor> constructors = Sets.newHashSet();
-        for (TypeParameterDescriptor typeParameterDescriptor : typeParameterDescriptors) {
-            constructors.add(typeParameterDescriptor.getTypeConstructor());
-        }
-        final TypeProjection projection = new TypeProjection(type);
-
-        return TypeSubstitutor.create(new TypeSubstitution() {
-            @Override
-            public TypeProjection get(TypeConstructor key) {
-                if (constructors.contains(key)) {
-                    return projection;
-                }
-                return null;
-            }
-
-            @Override
-            public boolean isEmpty() {
-                return false;
-            }
-        });
-    }
 }
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
index 3b38a4cbe2d..d239cd2fc56 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
@@ -707,4 +707,27 @@ public class TypeUtils {
                 }
         );
     }
+
+    public static TypeSubstitutor makeConstantSubstitutor(Collection<TypeParameterDescriptor> typeParameterDescriptors, JetType type) {
+        final Set<TypeConstructor> constructors = Sets.newHashSet();
+        for (TypeParameterDescriptor typeParameterDescriptor : typeParameterDescriptors) {
+            constructors.add(typeParameterDescriptor.getTypeConstructor());
+        }
+        final TypeProjection projection = new TypeProjection(type);
+
+        return TypeSubstitutor.create(new TypeSubstitution() {
+            @Override
+            public TypeProjection get(TypeConstructor key) {
+                if (constructors.contains(key)) {
+                    return projection;
+                }
+                return null;
+            }
+
+            @Override
+            public boolean isEmpty() {
+                return false;
+            }
+        });
+    }
 }