From 3b8167a8c3a80028171d6069ad23869b943c5138 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 27 Apr 2015 14:07:11 +0200
Subject: [PATCH] rename "Kotlin Trait" file template to "Kotlin Interface"

---
 .../internal/{Kotlin Trait.kt.ft => Kotlin Interface.kt.ft}     | 2 +-
 .../internal/{Kotlin Trait.kt.html => Kotlin Interface.kt.html} | 2 +-
 .../org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename idea/resources/fileTemplates/internal/{Kotlin Trait.kt.ft => Kotlin Interface.kt.ft} (79%)
 rename idea/resources/fileTemplates/internal/{Kotlin Trait.kt.html => Kotlin Interface.kt.html} (92%)

diff --git a/idea/resources/fileTemplates/internal/Kotlin Trait.kt.ft b/idea/resources/fileTemplates/internal/Kotlin Interface.kt.ft
similarity index 79%
rename from idea/resources/fileTemplates/internal/Kotlin Trait.kt.ft
rename to idea/resources/fileTemplates/internal/Kotlin Interface.kt.ft
index 2ed0a5ab51c..b8cd39ae9d6 100644
--- a/idea/resources/fileTemplates/internal/Kotlin Trait.kt.ft	
+++ b/idea/resources/fileTemplates/internal/Kotlin Interface.kt.ft	
@@ -2,5 +2,5 @@
 
 #end
 #parse("File Header.java")
-public trait ${NAME} {
+public interface ${NAME} {
 }
\ No newline at end of file
diff --git a/idea/resources/fileTemplates/internal/Kotlin Trait.kt.html b/idea/resources/fileTemplates/internal/Kotlin Interface.kt.html
similarity index 92%
rename from idea/resources/fileTemplates/internal/Kotlin Trait.kt.html
rename to idea/resources/fileTemplates/internal/Kotlin Interface.kt.html
index dbe296ac17c..9659e2d311b 100644
--- a/idea/resources/fileTemplates/internal/Kotlin Trait.kt.html	
+++ b/idea/resources/fileTemplates/internal/Kotlin Interface.kt.html	
@@ -5,7 +5,7 @@
     <td colspan="3">
       <font face="verdana" size="-1">
         This is a built-in template used by <b>IDEA</b> each time you create a
-        Kotlin trait
+        Kotlin interface
       </font>
     </td>
   </tr>
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
index 7ab42c86c19..2028eeaa738 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
@@ -58,7 +58,7 @@ public class NewKotlinFileAction extends CreateFileFromTemplateAction implements
                 .setTitle(JetBundle.message("new.kotlin.file.action"))
                 .addKind("Kotlin file", JetFileType.INSTANCE.getIcon(), "Kotlin File")
                 .addKind("Class", JetIcons.CLASS, "Kotlin Class")
-                .addKind("Trait", JetIcons.TRAIT, "Kotlin Trait")
+                .addKind("Interface", JetIcons.TRAIT, "Kotlin Interface")
                 .addKind("Enum class", JetIcons.ENUM, "Kotlin Enum")
                 .addKind("Object", JetIcons.OBJECT, "Kotlin Object");
     }