From aeb297d417a91db47cc7e887476b5ce95930831b Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 22 Aug 2012 12:59:18 +0400
Subject: [PATCH] Move isEnumClassObject from JavaDescriptorResolver to
 DescriptorUtils

---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java     | 8 +-------
 .../org/jetbrains/jet/lang/resolve/DescriptorUtils.java   | 6 ++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index b80d22e39e3..18eef0db322 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -1364,7 +1364,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
 
         functions.addAll(functionsFromCurrent);
 
-        if (isEnumClassObject(owner)) {
+        if (DescriptorUtils.isEnumClassObject(owner)) {
             for (FunctionDescriptor functionDescriptor : Lists.newArrayList(functions)) {
                 if (isEnumSpecialMethod(functionDescriptor)) {
                     functions.remove(functionDescriptor);
@@ -1545,12 +1545,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         return (methodName.equals("values") && methodTypeParameters.isEmpty());
     }
 
-    private static boolean isEnumClassObject(@NotNull DeclarationDescriptor classObjectDescriptor) {
-        DeclarationDescriptor containingDeclaration = classObjectDescriptor.getContainingDeclaration();
-        return ((containingDeclaration instanceof ClassDescriptor) &&
-                ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.ENUM_CLASS);
-    }
-
     private List<AnnotationDescriptor> resolveAnnotations(PsiModifierListOwner owner, @NotNull List<Runnable> tasks) {
         PsiAnnotation[] psiAnnotations = getAllAnnotations(owner);
         List<AnnotationDescriptor> r = Lists.newArrayListWithCapacity(psiAnnotations.length);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
index dcbf8bc4d0f..78f5df9739e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
@@ -375,4 +375,10 @@ public class DescriptorUtils {
     public static Name getClassObjectName(@NotNull String className) {
         return Name.special("<class-object-for-" + className + ">");
     }
+
+    public static boolean isEnumClassObject(@NotNull DeclarationDescriptor classObjectDescriptor) {
+        DeclarationDescriptor containingDeclaration = classObjectDescriptor.getContainingDeclaration();
+        return ((containingDeclaration instanceof ClassDescriptor) &&
+                ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.ENUM_CLASS);
+    }
 }