From fc2636572d5ab40b379a53d26738600b141cebc5 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 16 Oct 2013 18:25:26 +0400 Subject: [PATCH] Do not hide kotlin configuration notifications --- .../configuration/ui/AbsentJdkAnnotationsComponent.java | 6 ++++++ .../ui/NonConfiguredKotlinProjectNotification.java | 6 ++++++ .../ui/notifications/AbsentSdkAnnotationsNotification.kt | 5 ++--- .../ui/notifications/ConfigureKotlinNotification.java | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java b/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java index cec45198828..244de54c41b 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java @@ -18,6 +18,8 @@ package org.jetbrains.jet.plugin.configuration.ui; import com.google.common.collect.Sets; import com.intellij.ProjectTopics; +import com.intellij.notification.NotificationDisplayType; +import com.intellij.notification.NotificationsConfiguration; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.module.Module; @@ -41,9 +43,13 @@ import java.util.Collection; import java.util.Set; public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent { + public static final String EXTERNAL_ANNOTATIONS_GROUP_ID = "Kotlin External annotations"; protected AbsentJdkAnnotationsComponent(Project project) { super(project); + + NotificationsConfiguration.getNotificationsConfiguration(). + register(EXTERNAL_ANNOTATIONS_GROUP_ID, NotificationDisplayType.STICKY_BALLOON, true); } @Override diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectNotification.java b/idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectNotification.java index acb2cb690f8..8590fcc9922 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectNotification.java @@ -16,6 +16,8 @@ package org.jetbrains.jet.plugin.configuration.ui; +import com.intellij.notification.NotificationDisplayType; +import com.intellij.notification.NotificationsConfiguration; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -23,9 +25,13 @@ import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; public class NonConfiguredKotlinProjectNotification extends AbstractProjectComponent { + public static final String CONFIGURE_NOTIFICATION_GROUP_ID = "Configure Kotlin in Project"; protected NonConfiguredKotlinProjectNotification(Project project) { super(project); + + NotificationsConfiguration.getNotificationsConfiguration(). + register(CONFIGURE_NOTIFICATION_GROUP_ID, NotificationDisplayType.STICKY_BALLOON, true); } @Override diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt b/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt index 6f1faff5721..ba70c3036c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt +++ b/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt @@ -22,12 +22,11 @@ import com.intellij.notification.NotificationType import com.intellij.openapi.projectRoots.Sdk import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil import javax.swing.event.HyperlinkEvent - -private val GROUP_ID = "Configure Kotlin: absent sdk annotations" +import org.jetbrains.jet.plugin.configuration.ui.AbsentJdkAnnotationsComponent public class AbsentSdkAnnotationsNotification(sdks: Collection, val title: String, val text: String) : Notification( - GROUP_ID, + AbsentJdkAnnotationsComponent.EXTERNAL_ANNOTATIONS_GROUP_ID, title, text, NotificationType.WARNING, AbsentAnnotationsListener(sdks) // Workaround for KT-4086 diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java b/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java index 0e94895c710..53a3b0d2cd3 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java @@ -26,12 +26,12 @@ import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator; +import org.jetbrains.jet.plugin.configuration.ui.NonConfiguredKotlinProjectNotification; import javax.swing.event.HyperlinkEvent; import java.util.Collection; public class ConfigureKotlinNotification extends Notification { - private static final String GROUP_ID = "Configure Kotlin: balloon"; private static final String TITLE = "Configure Kotlin"; @NotNull private final String notificationText; @@ -40,7 +40,7 @@ public class ConfigureKotlinNotification extends Notification { @NotNull final Project project, @NotNull String notificationText ) { - super(GROUP_ID, TITLE, notificationText, NotificationType.WARNING, new NotificationListener() { + super(NonConfiguredKotlinProjectNotification.CONFIGURE_NOTIFICATION_GROUP_ID, TITLE, notificationText, NotificationType.WARNING, new NotificationListener() { @Override public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {