From 6dcb3cc8f7e5918a4b2ef13f2da8ff05fc72920f Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Wed, 31 Oct 2012 20:16:14 +0400
Subject: [PATCH] Refactor JavaPropertyResolver#getReceiverType

---
 .../resolve/java/resolver/JavaPropertyResolver.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
index f26466e98f3..1d5cd3e4268 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
@@ -334,17 +334,13 @@ public final class JavaPropertyResolver {
             PropertyPsiDataElement characteristicMember,
             TypeVariableResolver typeVariableResolverForPropertyInternals
     ) {
-        JetType receiverType;
         if (characteristicMember.getReceiverType() == null) {
-            receiverType = null;
+            return null;
         }
-        else if (characteristicMember.getReceiverType().getTypeString().length() > 0) {
-            receiverType = semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getTypeString(), typeVariableResolverForPropertyInternals);
+        if (!characteristicMember.getReceiverType().getTypeString().isEmpty()) {
+            return semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getTypeString(), typeVariableResolverForPropertyInternals);
         }
-        else {
-            receiverType = semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getPsiType(), typeVariableResolverForPropertyInternals);
-        }
-        return receiverType;
+        return semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getPsiType(), typeVariableResolverForPropertyInternals);
     }
 
     private static int getNumberOfNonExtensionProperties(@NotNull Collection<PropertyPsiData> propertyPsiDataCollection) {