From f8673ceb7937412678a4e217f753ead86074dcf0 Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Wed, 29 Feb 2012 17:07:27 +0400
Subject: [PATCH] TODO fix: Remove dead code. Use util method in CallType

---
 .../k2js/translate/reference/CallType.java       |  9 ++++-----
 .../k2js/translate/utils/TranslationUtils.java   | 16 ----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallType.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallType.java
index 0076f2d4f07..a4f0fcc74a8 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallType.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallType.java
@@ -27,9 +27,9 @@ import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
 import org.jetbrains.jet.lang.psi.JetSafeQualifiedExpression;
 import org.jetbrains.k2js.translate.context.TemporaryVariable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
 import static com.google.dart.compiler.util.AstUtil.newSequence;
-import static org.jetbrains.k2js.translate.utils.JsAstUtils.inequality;
 
 /**
  * @author Pavel Talanov
@@ -42,11 +42,10 @@ public enum CallType {
                                    @NotNull TranslationContext context) {
             assert receiver != null;
             TemporaryVariable temporaryVariable = context.declareTemporary(receiver);
+            JsBinaryOperation notNullCheck = TranslationUtils.notNullCheck(context, temporaryVariable.reference());
             JsNullLiteral nullLiteral = context.program().getNullLiteral();
-            //TODO: find similar not null checks
-            JsBinaryOperation notNullCheck = inequality(temporaryVariable.reference(), nullLiteral);
-            JsConditional callMethodIfNotNullElseNull =
-                    new JsConditional(notNullCheck, constructor.construct(temporaryVariable.reference()), nullLiteral);
+            JsExpression methodCall = constructor.construct(temporaryVariable.reference());
+            JsConditional callMethodIfNotNullElseNull = new JsConditional(notNullCheck, methodCall, nullLiteral);
             return newSequence(temporaryVariable.assignmentExpression(), callMethodIfNotNullElseNull);
         }
     },
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
index 9b3125e8fed..676bf5e5a53 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
@@ -73,14 +73,6 @@ public final class TranslationUtils {
         return Translation.translateAsExpression(jetExpression, context);
     }
 
-    //TODO: refactor backing field reference generation to use the generic way
-    @NotNull
-    public static JsNameRef backingFieldReference(@NotNull TranslationContext context,
-                                                  @NotNull JetProperty expression) {
-        PropertyDescriptor propertyDescriptor = getPropertyDescriptor(context.bindingContext(), expression);
-        return backingFieldReference(context, propertyDescriptor);
-    }
-
     @NotNull
     public static JsNameRef backingFieldReference(@NotNull TranslationContext context,
                                                   @NotNull PropertyDescriptor descriptor) {
@@ -166,14 +158,6 @@ public final class TranslationUtils {
         return Translation.translateAsExpression(baseExpression, context);
     }
 
-    //TODO:
-    @NotNull
-    public static JsExpression translateReceiver(@NotNull TranslationContext context,
-                                                 @NotNull JetDotQualifiedExpression expression) {
-        return Translation.translateAsExpression(expression.getReceiverExpression(), context);
-    }
-
-
     @NotNull
     public static JsExpression translateLeftExpression(@NotNull TranslationContext context,
                                                        @NotNull JetBinaryExpression expression) {