From 93baf78779fb0fe19cc77bbebb6be8fe35ccf7e0 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 1 Oct 2012 13:46:15 +0400
Subject: [PATCH] Refactoring: Tune isPropertyFinal()

---
 .../JavaDescriptorPropertiesResolver.java     | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
index 681e46f6e43..4f8ea1ee054 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
@@ -326,24 +326,20 @@ public final class JavaDescriptorPropertiesResolver {
         return members.setter != null;
     }
 
-    private static boolean isPropertyFinal(ResolverScopeData scopeData, GroupingValue propertyGrouping) {
-        boolean isFinal;
+    private static boolean isPropertyFinal(ResolverScopeData scopeData, GroupingValue members) {
         if (!scopeData.kotlin) {
-            isFinal = true;
+            return true;
         }
-        else if (propertyGrouping.setter == null && propertyGrouping.getter == null) {
-            isFinal = false;
+
+        if (members.getter != null) {
+            return members.getter.getMember().isFinal();
         }
-        else if (propertyGrouping.getter != null) {
-            isFinal = propertyGrouping.getter.getMember().isFinal();
+
+        if (members.setter != null) {
+            return members.setter.getMember().isFinal();
         }
-        else if (propertyGrouping.setter != null) {
-            isFinal = propertyGrouping.setter.getMember().isFinal();
-        }
-        else {
-            isFinal = false;
-        }
-        return isFinal;
+
+        return false;
     }
 
     private static Set<PropertyDescriptor> getPropertiesFromSupertypes(ResolverScopeData scopeData, Name propertyName) {