From 2d1891c63fa6991d82cb9ba066e25744211f6f1c Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 26 Dec 2014 20:44:19 +0300
Subject: [PATCH] Minor: moved checkTraitRequirements

---
 .../org/jetbrains/jet/lang/resolve/DeclarationResolver.java   | 4 ++--
 .../org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java   | 4 ++--
 .../jet/lang/resolve/{calls => }/checkTraitRequirements.kt    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename compiler/frontend/src/org/jetbrains/jet/lang/resolve/{calls => }/checkTraitRequirements.kt (98%)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
index d9b972aa15d..5ee7761e07e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
@@ -32,12 +32,12 @@ import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder;
 import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.calls.CallsPackage;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
 import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider;
 import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.jet.lang.resolve.resolveUtil.ResolveUtilPackage;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -91,7 +91,7 @@ public class DeclarationResolver {
 
         createFunctionsForDataClasses(c);
         importsResolver.processMembersImports(c);
-        CallsPackage.checkTraitRequirements(c.getDeclaredClasses(), trace);
+        ResolveUtilPackage.checkTraitRequirements(c.getDeclaredClasses(), trace);
         checkRedeclarationsInPackages(c);
         checkRedeclarationsInInnerClassNames(c);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java
index 5802c4baac3..d850567babf 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java
@@ -27,11 +27,11 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider;
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.calls.CallsPackage;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
 import org.jetbrains.jet.lang.resolve.lazy.LazyImportScope;
 import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.resolveUtil.ResolveUtilPackage;
 import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker;
 
 import javax.inject.Inject;
@@ -297,7 +297,7 @@ public class LazyTopDownAnalyzer {
         declarationResolver.checkRedeclarationsInPackages(resolveSession, topLevelFqNames);
         declarationResolver.checkRedeclarationsInInnerClassNames(c);
 
-        CallsPackage.checkTraitRequirements(c.getDeclaredClasses(), trace);
+        ResolveUtilPackage.checkTraitRequirements(c.getDeclaredClasses(), trace);
 
         overrideResolver.check(c);
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/checkTraitRequirements.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/checkTraitRequirements.kt
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt
index d0c4ca592d5..b5adf1edcd5 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/checkTraitRequirements.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.calls
+package org.jetbrains.jet.lang.resolve.resolveUtil
 
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils