JavaFrameworkType: J2K

idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt

@@ -53,14 +53,14 @@ class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
                 FrameworksCompatibilityUtils.suggestRemoveIncompatibleFramework(
                         rootModel,
                         JavaRuntimeLibraryDescription.SUITABLE_LIBRARY_KINDS,
-                        JavaFrameworkType.getInstance())
+                        JavaFrameworkType.instance)
 
                 description.finishLibConfiguration(module, rootModel)
             }
 
             override fun onFrameworkSelectionChanged(selected: Boolean) {
                 if (selected) {
-                    val providerId = JavaFrameworkType.getInstance().id
+                    val providerId = JavaFrameworkType.instance.id
                     if (model.isFrameworkSelected(providerId)) {
                         model.setFrameworkComponentEnabled(providerId, false)
                     }

idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt

@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import javax.swing.JComponent
 
 internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
-    override fun getFrameworkType(): FrameworkTypeEx = JavaFrameworkType.getInstance()
+    override fun getFrameworkType(): FrameworkTypeEx = JavaFrameworkType.instance
 
     override fun createConfigurable(model: FrameworkSupportModel): FrameworkSupportInModuleConfigurable {
         return object : FrameworkSupportInModuleConfigurable() {

idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.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 JavaFrameworkType : FrameworkTypeEx("kotlin-java-framework-id") {
 
-public class JavaFrameworkType extends FrameworkTypeEx {
-    public static JavaFrameworkType getInstance() {
-        return FrameworkTypeEx.EP_NAME.findExtension(JavaFrameworkType.class);
-    }
+    override fun createProvider(): FrameworkSupportInModuleProvider = JavaFrameworkSupportProvider()
 
-    public JavaFrameworkType() {
-        super("kotlin-java-framework-id");
-    }
+    override fun getPresentableName() = "Kotlin (Java)"
 
-    @NotNull
-    @Override
-    public FrameworkSupportInModuleProvider createProvider() {
-        return new JavaFrameworkSupportProvider();
-    }
+    override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO
 
-    @NotNull
-    @Override
-    public String getPresentableName() {
-        return "Kotlin (Java)";
-    }
-
-    @NotNull
-    @Override
-    public Icon getIcon() {
-        return KotlinIcons.SMALL_LOGO;
+    companion object {
+        val instance: JavaFrameworkType
+            get() = FrameworkTypeEx.EP_NAME.findExtension(JavaFrameworkType::class.java)
     }
 }