From 6eff8c7b4b42d670f6e69013c00e4e1b887ed03b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 19 Jul 2017 15:21:32 +0200
Subject: [PATCH] JSFrameworkType: J2K

---
 .../framework/JSFrameworkSupportProvider.kt   |  2 +-
 .../kotlin/idea/framework/JSFrameworkType.kt  | 40 ++++++-------------
 .../framework/JavaFrameworkSupportProvider.kt |  4 +-
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt
index 7d425250abb..a5726e9742d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import javax.swing.JComponent
 
 class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
-    override fun getFrameworkType(): FrameworkTypeEx = JSFrameworkType.getInstance()
+    override fun getFrameworkType(): FrameworkTypeEx = JSFrameworkType.instance
 
     override fun createConfigurable(model: FrameworkSupportModel): FrameworkSupportInModuleConfigurable {
         return object : FrameworkSupportInModuleConfigurable() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.kt b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.kt
index 23f35b12f36..b231bed8df4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.kt
@@ -14,39 +14,23 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.framework;
+package org.jetbrains.kotlin.idea.framework
 
-import com.intellij.framework.FrameworkTypeEx;
-import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.KotlinIcons;
+import com.intellij.framework.FrameworkTypeEx
+import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
+import org.jetbrains.kotlin.idea.KotlinIcons
+import javax.swing.Icon
 
-import javax.swing.*;
+class JSFrameworkType : FrameworkTypeEx("kotlin-js-framework-id") {
 
-public class JSFrameworkType extends FrameworkTypeEx {
-    public static JSFrameworkType getInstance() {
-        return FrameworkTypeEx.EP_NAME.findExtension(JSFrameworkType.class);
-    }
+    override fun createProvider(): FrameworkSupportInModuleProvider = JSFrameworkSupportProvider()
 
-    public JSFrameworkType() {
-        super("kotlin-js-framework-id");
-    }
+    override fun getPresentableName() = "Kotlin (JavaScript)"
 
-    @NotNull
-    @Override
-    public FrameworkSupportInModuleProvider createProvider() {
-        return new JSFrameworkSupportProvider();
-    }
+    override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO
 
-    @NotNull
-    @Override
-    public String getPresentableName() {
-        return "Kotlin (JavaScript)";
-    }
-
-    @NotNull
-    @Override
-    public Icon getIcon() {
-        return KotlinIcons.SMALL_LOGO;
+    companion object {
+        val instance: JSFrameworkType
+            get() = FrameworkTypeEx.EP_NAME.findExtension(JSFrameworkType::class.java)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
index a9cfcb7d571..defd9d8cfc6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
@@ -53,14 +53,14 @@ internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider()
                 FrameworksCompatibilityUtils.suggestRemoveIncompatibleFramework(
                         rootModel,
                         JSLibraryStdDescription.SUITABLE_LIBRARY_KINDS,
-                        JSFrameworkType.getInstance())
+                        JSFrameworkType.instance)
 
                 description!!.finishLibConfiguration(module, rootModel)
             }
 
             override fun onFrameworkSelectionChanged(selected: Boolean) {
                 if (selected) {
-                    val providerId = JSFrameworkType.getInstance().id
+                    val providerId = JSFrameworkType.instance.id
                     if (model.isFrameworkSelected(providerId)) {
                         model.setFrameworkComponentEnabled(providerId, false)
                     }