From 688359de45042bc5ff36dbf731a2ea9a2e878f6c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 19 Feb 2013 18:05:43 +0400 Subject: [PATCH] Use standard framework support dialog for configuring Kotlin from editor --- .../KotlinLibrariesNotificationProvider.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java index 2cbd34f4036..6d8905bf023 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.versions; import com.intellij.ProjectTopics; import com.intellij.icons.AllIcons; +import com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.fileEditor.FileEditor; @@ -44,7 +45,6 @@ import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.framework.JetFrameworkConfigurator; import javax.swing.*; import java.awt.*; @@ -118,24 +118,17 @@ public class KotlinLibrariesNotificationProvider extends EditorNotifications.Pro return null; } - private EditorNotificationPanel createConfigureRuntimeLibraryNotificationPanel(final Module module) { + private static EditorNotificationPanel createConfigureRuntimeLibraryNotificationPanel(final Module module) { EditorNotificationPanel answer = new EditorNotificationPanel(); answer.setText("Kotlin is not configured for module '" + module.getName() + "'"); - answer.createActionLabel("Set up module '" + module.getName() + "' as JVM Kotlin module", new Runnable() { + answer.createActionLabel("Set up Kotlin framework", new Runnable() { @Override public void run() { - if (JetFrameworkConfigurator.configureAsJavaModule(module)) { - updateNotifications(); - } - } - }); - - answer.createActionLabel("Set up module '" + module.getName() + "' as JavaScript Kotlin module", new Runnable() { - @Override - public void run() { - if (JetFrameworkConfigurator.configureAsJavaScriptModule(module)) { - updateNotifications(); + // TODO: make choose only from Kotlin frameworks + AddFrameworkSupportDialog dialog = AddFrameworkSupportDialog.createDialog(module); + if (dialog != null) { + dialog.show(); } } });