From 734a9a02ef244b73005d5d17b9fe0952c494f868 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 15 Aug 2012 13:39:20 +0400
Subject: [PATCH] Extract method for clarification

---
 .../resolve/lazy/LazyClassMemberScope.java    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
index 22ac9394235..9bf1da1269a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassMemberScope.java
@@ -143,11 +143,9 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
     }
 
     private void generateEnumClassObjectMethods(@NotNull Collection<? super FunctionDescriptor> result, @NotNull Name name) {
-        DeclarationDescriptor containingDeclaration = thisDescriptor.getContainingDeclaration();
-        if (!(containingDeclaration instanceof ClassDescriptor)) return;
-        ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;
-        if (classDescriptor.getClassObjectDescriptor() != thisDescriptor) return;
-        if (classDescriptor.getKind() != ClassKind.ENUM_CLASS) return;
+        if (!isEnumClassObject()) return;
+
+        ClassDescriptor classDescriptor = (ClassDescriptor) thisDescriptor.getContainingDeclaration();
 
         if (name.equals(DescriptorResolver.VALUES_METHOD_NAME)) {
             SimpleFunctionDescriptor valuesMethod = DescriptorResolver
@@ -155,12 +153,21 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
             result.add(valuesMethod);
         }
         else if (name.equals(DescriptorResolver.VALUE_OF_METHOD_NAME)) {
-            SimpleFunctionDescriptor valueOfMethod = DescriptorResolver.createEnumClassObjectValueOfMethod(classDescriptor,
-                                                                                                    resolveSession.getTrace());
+            SimpleFunctionDescriptor valueOfMethod = DescriptorResolver
+                    .createEnumClassObjectValueOfMethod(classDescriptor, resolveSession.getTrace());
             result.add(valueOfMethod);
         }
     }
 
+    private boolean isEnumClassObject() {
+        DeclarationDescriptor containingDeclaration = thisDescriptor.getContainingDeclaration();
+        if (!(containingDeclaration instanceof ClassDescriptor)) return false;
+        ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;
+        if (classDescriptor.getKind() != ClassKind.ENUM_CLASS) return false;
+        if (classDescriptor.getClassObjectDescriptor() != thisDescriptor) return false;
+        return true;
+    }
+
     @NotNull
     @Override
     public Set<VariableDescriptor> getProperties(@NotNull Name name) {