From 2acb5bb4e52d78aefb7c71c9507105eca61e7dca Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 9 Apr 2016 16:28:58 +0100
Subject: Extract code to get receiver

---
 .../frontends/java/JavaExpressionReader.java       | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
index 74de3e0..4a86fc0 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
@@ -215,27 +215,25 @@ public class JavaExpressionReader {
         Type returnType = typeOf(expression);
         MethodSignature signature = JavaMethods.signature(expression.resolveMethodBinding().getMethodDeclaration());
 
+        return methodCall(
+            getReceiver(expression),
+            methodName,
+            typeParameters,
+            arguments,
+            returnType,
+            signature);
+    }
+
+    private Receiver getReceiver(MethodInvocation expression) {
         IMethodBinding methodBinding = expression.resolveMethodBinding();
         Type receiverType = typeOf(methodBinding.getDeclaringClass());
         if ((Modifier.isStatic(methodBinding.getModifiers()))) {
-            return methodCall(
-                staticReceiver(erasure(receiverType)),
-                methodName,
-                typeParameters,
-                arguments,
-                returnType,
-                signature);
+            return staticReceiver(erasure(receiverType));
         } else {
             ExpressionNode receiver = expression.getExpression() == null
                 ? thisReference(receiverType)
                 : readExpressionWithoutBoxing(expression.getExpression());
-            return methodCall(
-                instanceReceiver(receiver),
-                methodName,
-                typeParameters,
-                arguments,
-                returnType,
-                signature);
+            return instanceReceiver(receiver);
         }
     }
 
-- 
cgit v1.2.3