diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
index 09d87b3f4c5..f78884616b5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
@@ -14,81 +14,58 @@
  * 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.FrameworkSupportInModuleConfigurable;
-import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider;
-import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel;
-import com.intellij.openapi.module.JavaModuleType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleType;
-import com.intellij.openapi.roots.ModifiableModelsProvider;
-import com.intellij.openapi.roots.ModifiableRootModel;
-import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.framework.FrameworkTypeEx
+import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable
+import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
+import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel
+import com.intellij.openapi.module.JavaModuleType
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.module.ModuleType
+import com.intellij.openapi.roots.ModifiableModelsProvider
+import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription
+import javax.swing.JComponent
 
-import javax.swing.*;
+internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
+    override fun getFrameworkType(): FrameworkTypeEx = JavaFrameworkType.getInstance()
 
-class JavaFrameworkSupportProvider extends FrameworkSupportInModuleProvider {
-    @NotNull
-    @Override
-    public FrameworkTypeEx getFrameworkType() {
-        return JavaFrameworkType.getInstance();
-    }
+    override fun createConfigurable(model: FrameworkSupportModel): FrameworkSupportInModuleConfigurable {
+        return object : FrameworkSupportInModuleConfigurable() {
+            private var description: JavaRuntimeLibraryDescription? = null
 
-    @NotNull
-    @Override
-    public FrameworkSupportInModuleConfigurable createConfigurable(@NotNull final FrameworkSupportModel model) {
-        return new FrameworkSupportInModuleConfigurable() {
-            private JavaRuntimeLibraryDescription description = null;
-
-            @Nullable
-            @Override
-            public CustomLibraryDescription createLibraryDescription() {
-                description = new JavaRuntimeLibraryDescription(model.getProject());
-                return description;
+            override fun createLibraryDescription(): CustomLibraryDescription? {
+                description = JavaRuntimeLibraryDescription(model.project)
+                return description
             }
 
-            @Nullable
-            @Override
-            public JComponent createComponent() {
-                return null;
-            }
+            override fun createComponent(): JComponent? = null
 
-            @Override
-            public boolean isOnlyLibraryAdded() {
-                return true;
-            }
+            override fun isOnlyLibraryAdded(): Boolean = true
 
-            @Override
-            public void addSupport(
-                    @NotNull Module module,
-                    @NotNull ModifiableRootModel rootModel,
-                    @NotNull ModifiableModelsProvider modifiableModelsProvider) {
+            override fun addSupport(
+                    module: Module,
+                    rootModel: ModifiableRootModel,
+                    modifiableModelsProvider: ModifiableModelsProvider) {
                 FrameworksCompatibilityUtils.suggestRemoveIncompatibleFramework(
                         rootModel,
                         JSLibraryStdDescription.SUITABLE_LIBRARY_KINDS,
-                        JSFrameworkType.getInstance());
+                        JSFrameworkType.getInstance())
 
-                description.finishLibConfiguration(module, rootModel);
+                description!!.finishLibConfiguration(module, rootModel)
             }
 
-            @Override
-            public void onFrameworkSelectionChanged(boolean selected) {
+            override fun onFrameworkSelectionChanged(selected: Boolean) {
                 if (selected) {
-                    String providerId = JSFrameworkType.getInstance().getId();
+                    val providerId = JSFrameworkType.getInstance().id
                     if (model.isFrameworkSelected(providerId)) {
-                        model.setFrameworkComponentEnabled(providerId, false);
+                        model.setFrameworkComponentEnabled(providerId, false)
                     }
                 }
             }
-        };
+        }
     }
 
-    @Override
-    public boolean isEnabledForModuleType(@NotNull ModuleType moduleType) {
-        return moduleType instanceof JavaModuleType;
-    }
+    override fun isEnabledForModuleType(moduleType: ModuleType<*>): Boolean = moduleType is JavaModuleType
 }