J2K: generate 'interface' keyword instead of 'trait'

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

@@ -27,7 +27,7 @@ class Trait(
 ) : Class(name, annotations, modifiers, typeParameterList, extendsTypes, null, implementsTypes, body) {
 
     override val keyword: String
-        get() = "trait"
+        get() = "interface"
 
     override fun presentationModifiers(): Modifiers
             = modifiers.filter { it in ACCESS_MODIFIERS }

j2k/testData/fileOrElement/annotations/annotationInterface3.kt

@@ -13,7 +13,7 @@ annotation class Anon(public val value: String) {
 }
 
 Anon("a")
-trait I {
+interface I {
     companion object {
         public val e: Anon.E = Anon.field
     }

j2k/testData/fileOrElement/annotations/annotationInterface4.kt

@@ -1,13 +1,13 @@
 annotation class Anon(public vararg val value: String, public val x: Int = 1)
 
 Anon("a", "b")
-trait I1
+interface I1
 
 Anon("c", "d", x = 1)
-trait I2
+interface I2
 
 Anon("c", "d", x = 1)
-trait I3
+interface I3
 
 Anon(value = *array("c", "d"))
-trait I4
+interface I4

j2k/testData/fileOrElement/class/innerClassInInterface.kt

@@ -1,3 +1,3 @@
-trait A {
+interface A {
     public class B
 }

j2k/testData/fileOrElement/class/innerInterface.kt

@@ -1,3 +1,3 @@
 class A {
-    trait I
+    interface I
 }

j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun getX(): Int
     public fun setX(x: Int)
 }

j2k/testData/fileOrElement/equals/Equals1.kt

@@ -1,4 +1,4 @@
-trait I
+interface I
 
 class C {
     fun foo1(i1: I, i2: I): Boolean {

j2k/testData/fileOrElement/equals/ObjectsEquals.kt

@@ -1,6 +1,6 @@
 import java.util.Objects
 
-trait I
+interface I
 
 class C {
     fun foo1(i1: I, i2: I): Boolean {

j2k/testData/fileOrElement/inheritance/openModifier.kt

@@ -23,7 +23,7 @@ class C : B() {
     }
 }
 
-trait I {
+interface I {
     public fun f()
 }
 

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun getString(): String?
 }
 

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun getString(): String?
 }
 

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun getString(): String?
 }
 

j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun getString(): String
 }
 

j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt

@@ -1,5 +1,5 @@
 // ERROR: Return type of 'get' is not a subtype of the return type of overridden member public abstract fun get(): kotlin.String defined in Getter
-trait Getter {
+interface Getter {
     public fun get(): String
 }
 

j2k/testData/fileOrElement/nullability/Overrides.kt

@@ -12,7 +12,7 @@ open class Base {
     }
 }
 
-trait I {
+interface I {
     public fun zoo(o: Any?): String?
 }
 

j2k/testData/fileOrElement/objectLiteral/MyFrame.kt

@@ -1,6 +1,6 @@
 package demo
 
-trait WindowListener {
+interface WindowListener {
     public fun windowClosing()
 }
 

j2k/testData/fileOrElement/overloads/Override.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun foo(i: Int, c: Char, s: String)
     public fun bar()
 }

j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt

@@ -1,4 +1,4 @@
-trait I {
+interface I {
     public fun getInt(): Int
 }
 

j2k/testData/fileOrElement/settings/openByDefault.kt

@@ -20,7 +20,7 @@ abstract class C {
     abstract fun foo()
 }
 
-trait I {
+interface I {
     public fun foo()
 }
 

j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt

@@ -1,5 +1,5 @@
 import java.util.*
 
-trait I<T : List<Iterator<String>>>
+interface I<T : List<Iterator<String>>>
 
 class C : I<ArrayList<Iterator<String>>>

j2k/testData/fileOrElement/trait/abstactInterface.kt

@@ -1 +1 @@
-trait I
+interface I

j2k/testData/fileOrElement/trait/emptyInterface.kt

@@ -1 +1 @@
-trait A
+interface A

j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1 +1 @@
-trait A : I0, I1, I2
+interface A : I0, I1, I2

j2k/testData/fileOrElement/trait/extendsOneInterface.kt

@@ -1 +1 @@
-trait A : I
+interface A : I

j2k/testData/fileOrElement/trait/interfaceWithFields.kt

@@ -1,4 +1,4 @@
-trait INode {
+interface INode {
     companion object {
         public val IN: String = "in"
         public val AT: String = "@"

j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt

@@ -1,4 +1,4 @@
-trait INode {
+interface INode {
     public fun getTag(): Tag
     public fun toKotlin(): String
 }

j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt

@@ -1,4 +1,4 @@
-public trait INode {
+public interface INode {
     companion object {
         public val IN: String = "in"
         public val AT: String = "@"

j2k/testData/fileOrElement/trait/internalInterface.kt

@@ -1 +1 @@
-trait Test
+interface Test

j2k/testData/fileOrElement/trait/privateInterface.kt

@@ -1 +1 @@
-private trait Test
+private interface Test

j2k/testData/fileOrElement/trait/protectedInterface.kt

@@ -1 +1 @@
-protected trait Test
+protected interface Test

j2k/testData/fileOrElement/trait/publicInterface.kt

@@ -1 +1 @@
-public trait Test
+public interface Test

j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt

@@ -1,6 +1,6 @@
 import java.io.*
 
-trait I {
+interface I {
     throws(IOException::class)
     public fun doIt(stream: InputStream): Int
 }

j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt

@@ -1,6 +1,6 @@
 import java.io.*
 
-trait I {
+interface I {
     throws(IOException::class)
     public fun doIt(stream: InputStream): Int
 }

j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt

@@ -1 +1 @@
-trait CommandHandler<T : Command>
+interface CommandHandler<T : Command>

j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt

@@ -1 +1 @@
-trait CommandHandler<T : INode, String>
+interface CommandHandler<T : INode, String>

j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1 @@
-trait I<T : INode, K : Node> : II where T : Comparable<T>, K : Collection<in K>
+interface I<T : INode, K : Node> : II where T : Comparable<T>, K : Collection<in K>