"trait" -> "interface"

j2k/src/org/jetbrains/kotlin/j2k/Converter.kt

@@ -172,7 +172,7 @@ class Converter private(
         return when {
             psiClass.isInterface() -> {
                 val classBody = ClassBodyConverter(psiClass, this, isOpenClass = false, isObject = false).convertBody()
-                Trait(name, annotations, modifiers, typeParameters, extendsTypes, implementsTypes, classBody)
+                Interface(name, annotations, modifiers, typeParameters, extendsTypes, implementsTypes, classBody)
             }
 
             psiClass.isEnum() -> {

j2k/src/org/jetbrains/kotlin/j2k/ast/AnonymousClassBody.kt

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.j2k.ast
 
 import org.jetbrains.kotlin.j2k.CodeBuilder
 
-class AnonymousClassBody(body: ClassBody, val extendsTrait: Boolean)
+class AnonymousClassBody(body: ClassBody, val extendsInterface: Boolean)
 : Class(Identifier.Empty, Annotations.Empty, Modifiers.Empty, TypeParameterList.Empty, listOf(), null, listOf(), body) {
     override fun generateCode(builder: CodeBuilder) {
         body.append(builder)

j2k/src/org/jetbrains/kotlin/j2k/ast/Function.kt

@@ -33,12 +33,12 @@ class Function(
         val typeParameterList: TypeParameterList,
         parameterList: ParameterList,
         body: DeferredElement<Block>?,
-        val isInTrait: Boolean
+        val isInInterface: Boolean
 ) : FunctionLike(annotations, modifiers, parameterList, body) {
 
     private fun presentationModifiers(): Modifiers {
         var modifiers = this.modifiers
-        if (isInTrait) {
+        if (isInInterface) {
             modifiers = modifiers.without(Modifier.ABSTRACT)
         }
 

j2k/src/org/jetbrains/kotlin/j2k/ast/Interface.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.j2k.ast
 
-class Trait(
+class Interface(
         name: Identifier,
         annotations: Annotations,
         modifiers: Modifiers,

j2k/src/org/jetbrains/kotlin/j2k/ast/NewClassExpression.kt

@@ -38,7 +38,7 @@ class NewClassExpression(
             builder.append(name)
         }
 
-        if (anonymousClass == null || !anonymousClass.extendsTrait) {
+        if (anonymousClass == null || !anonymousClass.extendsInterface) {
             builder.append("(").append(arguments, ", ").append(")")
         }