From c437b8c4dc0943cdd8d12b738a2fcce09747020e Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 30 Oct 2013 18:51:09 +0400
Subject: [PATCH] Rename files

---
 .../{resolve => evaluate}/ConstantExpressionEvaluator.java     | 3 ++-
 .../src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java | 1 +
 ...eTest.java => AbstractAnnotationDescriptorResolveTest.java} | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename compiler/frontend/src/org/jetbrains/jet/lang/{resolve => evaluate}/ConstantExpressionEvaluator.java (98%)
 rename compiler/tests/org/jetbrains/jet/resolve/annotation/{AnnotationDescriptorResolveTest.java => AbstractAnnotationDescriptorResolveTest.java} (99%)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ConstantExpressionEvaluator.java b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.java
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ConstantExpressionEvaluator.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.java
index ada0b5ab2b8..d14b8465c66 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ConstantExpressionEvaluator.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve;
+package org.jetbrains.jet.lang.evaluate;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument;
 import org.jetbrains.jet.lang.resolve.constants.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
index 2d9d8507322..759f06ee0d2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl;
 import org.jetbrains.jet.lang.diagnostics.Errors;
+import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.calls.CallResolver;
 import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java
rename to compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
index e4def39223a..6e3b2e00eec 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
@@ -41,7 +41,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-public class AnnotationDescriptorResolveTest extends JetLiteFixture {
+public class AbstractAnnotationDescriptorResolveTest extends JetLiteFixture {
     private static final String PATH = "compiler/testData/resolveAnnotations/testFile.kt";
 
     private static final FqName NAMESPACE = new FqName("test");