Remove StaticMethodCallNode

2 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java
index ab78bdb..545b1c0 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java
@@ -11,8 +11,8 @@ import org.zwobble.couscous.ast.sugar.Lambda;
 import java.util.List;
 
 import static org.zwobble.couscous.ast.MethodCallNode.methodCall;
+import static org.zwobble.couscous.ast.MethodCallNode.staticMethodCall;
 import static org.zwobble.couscous.ast.ReturnNode.returns;
-import static org.zwobble.couscous.ast.StaticMethodCallNode.staticMethodCall;
 import static org.zwobble.couscous.ast.sugar.Lambda.lambda;
 import static org.zwobble.couscous.frontends.java.JavaTypes.typeOf;
 import static org.zwobble.couscous.util.ExtraLists.eagerMap;
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 21d7112..4200a98 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
@@ -12,6 +12,7 @@ import java.util.stream.IntStream;
 
 import static org.zwobble.couscous.ast.ConstructorCallNode.constructorCall;
 import static org.zwobble.couscous.ast.LiteralNode.literal;
+import static org.zwobble.couscous.ast.MethodCallNode.staticMethodCall;
 import static org.zwobble.couscous.ast.Operations.not;
 import static org.zwobble.couscous.ast.TypeCoercionNode.typeCoercion;
 import static org.zwobble.couscous.frontends.java.JavaOperators.readOperator;
@@ -158,7 +159,7 @@ public class JavaExpressionReader {
         IMethodBinding methodBinding = expression.resolveMethodBinding();
         TypeName receiverType = typeOf(methodBinding.getDeclaringClass());
         if ((Modifier.isStatic(methodBinding.getModifiers()))) {
-            return StaticMethodCallNode.staticMethodCall(
+            return staticMethodCall(
                 receiverType,
                 methodName,
                 arguments,
@@ -229,9 +230,9 @@ public class JavaExpressionReader {
             ExpressionNode left = readExpression(ObjectValues.OBJECT, expression.getLeftOperand());
             ExpressionNode right = readExpression(ObjectValues.OBJECT, expression.getRightOperand());
             if (expression.getOperator() == InfixExpression.Operator.EQUALS) {
-                return StaticMethodCallNode.same(left, right);
+                return Operations.same(left, right);
             } else if (expression.getOperator() == InfixExpression.Operator.NOT_EQUALS) {
-                return not(StaticMethodCallNode.same(left, right));
+                return not(Operations.same(left, right));
             } else {
                 throw new IllegalArgumentException("Unsupported operator: " + expression.getOperator());
             }