From d45e69b5386341932dfd8cd152f0278a1680f13c Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Tue, 15 Nov 2011 16:51:29 +0400
Subject: [PATCH] move isEmpty() from Expression to Element

---
 src/org/jetbrains/jet/j2k/ast/Element.java       | 9 +++++++++
 src/org/jetbrains/jet/j2k/ast/Expression.java    | 4 ----
 src/org/jetbrains/jet/j2k/ast/Field.java         | 2 +-
 src/org/jetbrains/jet/j2k/ast/LocalVariable.java | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/ast/Element.java b/src/org/jetbrains/jet/j2k/ast/Element.java
index 0d2f640ea4d..16683fbdca3 100644
--- a/src/org/jetbrains/jet/j2k/ast/Element.java
+++ b/src/org/jetbrains/jet/j2k/ast/Element.java
@@ -8,6 +8,10 @@ import org.jetbrains.annotations.NotNull;
 public abstract class Element extends Node {
   public static final Element EMPTY_ELEMENT = new EmptyElement();
 
+  public boolean isEmpty() {
+    return false;
+  }
+
   /**
    * @author ignatov
    */
@@ -17,5 +21,10 @@ public abstract class Element extends Node {
     public String toKotlin() {
       return EMPTY;
     }
+
+    @Override
+    public boolean isEmpty() {
+      return true;
+    }
   }
 }
diff --git a/src/org/jetbrains/jet/j2k/ast/Expression.java b/src/org/jetbrains/jet/j2k/ast/Expression.java
index c5cc6f79413..7b2528b6232 100644
--- a/src/org/jetbrains/jet/j2k/ast/Expression.java
+++ b/src/org/jetbrains/jet/j2k/ast/Expression.java
@@ -27,8 +27,4 @@ public abstract class Expression extends Statement {
   boolean isNullable() {
     return false;
   }
-
-  public boolean isEmpty() {
-    return false;
-  }
 }
diff --git a/src/org/jetbrains/jet/j2k/ast/Field.java b/src/org/jetbrains/jet/j2k/ast/Field.java
index 02542a35ef9..897d25867e6 100644
--- a/src/org/jetbrains/jet/j2k/ast/Field.java
+++ b/src/org/jetbrains/jet/j2k/ast/Field.java
@@ -64,7 +64,7 @@ public class Field extends Member {
   public String toKotlin() {
     String modifier = modifiersToKotlin();
 
-    if (myInitializer.toKotlin().isEmpty()) // TODO: remove
+    if (myInitializer.isEmpty())
       return modifier + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin();
 
     return modifier + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin() + SPACE +
diff --git a/src/org/jetbrains/jet/j2k/ast/LocalVariable.java b/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
index 442930b66fd..0c561827a18 100644
--- a/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
+++ b/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
@@ -27,7 +27,7 @@ public class LocalVariable extends Expression {
   @NotNull
   @Override
   public String toKotlin() {
-    if (myInitializer.toKotlin().isEmpty()) // TODO: remove
+    if (myInitializer.isEmpty())
       return myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin();
 
     return myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin() + SPACE +