From 7463da8fe0e6faa3c8c610d660aaaea37edecdf7 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 16 Jun 2014 20:26:51 +0400
Subject: [PATCH] Java to Kotlin: dropped Node interface

---
 j2k/src/org/jetbrains/jet/j2k/ast/Element.kt |  5 +++--
 j2k/src/org/jetbrains/jet/j2k/ast/Node.kt    | 22 --------------------
 j2k/src/org/jetbrains/jet/j2k/ast/Util.kt    |  2 +-
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 j2k/src/org/jetbrains/jet/j2k/ast/Node.kt

diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt
index 4e4f0f2bed5..07a5282cf70 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt
@@ -16,9 +16,10 @@
 
 package org.jetbrains.jet.j2k.ast
 
+trait Element {
+    public fun toKotlin(): String
 
-trait Element : Node {
-    val isEmpty: Boolean get() = false
+    public val isEmpty: Boolean get() = false
 
     object Empty : Element {
         override fun toKotlin() = ""
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Node.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Node.kt
deleted file mode 100644
index 39e27714dab..00000000000
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Node.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.j2k.ast
-
-
-trait Node {
-    public fun toKotlin(): String
-}
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt
index 739fecfb8a5..1df00b18f67 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt
@@ -18,7 +18,7 @@ package org.jetbrains.jet.j2k.ast
 
 import java.util.ArrayList
 
-fun List<Node>.toKotlin(separator: String, prefix: String = "", postfix: String = ""): String
+fun List<Element>.toKotlin(separator: String, prefix: String = "", postfix: String = ""): String
         = if (isNotEmpty()) map { it.toKotlin() }.makeString(separator, prefix, postfix) else ""
 
 fun String.withSuffix(suffix: String): String = if (isEmpty()) "" else this + suffix