Do not hide kotlin configuration notifications
This commit is contained in:
@@ -18,6 +18,8 @@ package org.jetbrains.jet.plugin.configuration.ui;
|
|||||||
|
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
import com.intellij.ProjectTopics;
|
import com.intellij.ProjectTopics;
|
||||||
|
import com.intellij.notification.NotificationDisplayType;
|
||||||
|
import com.intellij.notification.NotificationsConfiguration;
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.components.AbstractProjectComponent;
|
import com.intellij.openapi.components.AbstractProjectComponent;
|
||||||
import com.intellij.openapi.module.Module;
|
import com.intellij.openapi.module.Module;
|
||||||
@@ -41,9 +43,13 @@ import java.util.Collection;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
|
public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
|
||||||
|
public static final String EXTERNAL_ANNOTATIONS_GROUP_ID = "Kotlin External annotations";
|
||||||
|
|
||||||
protected AbsentJdkAnnotationsComponent(Project project) {
|
protected AbsentJdkAnnotationsComponent(Project project) {
|
||||||
super(project);
|
super(project);
|
||||||
|
|
||||||
|
NotificationsConfiguration.getNotificationsConfiguration().
|
||||||
|
register(EXTERNAL_ANNOTATIONS_GROUP_ID, NotificationDisplayType.STICKY_BALLOON, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+6
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.plugin.configuration.ui;
|
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.components.AbstractProjectComponent;
|
||||||
import com.intellij.openapi.project.DumbService;
|
import com.intellij.openapi.project.DumbService;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
@@ -23,9 +25,13 @@ import com.intellij.util.messages.MessageBusConnection;
|
|||||||
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
|
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
|
||||||
|
|
||||||
public class NonConfiguredKotlinProjectNotification extends AbstractProjectComponent {
|
public class NonConfiguredKotlinProjectNotification extends AbstractProjectComponent {
|
||||||
|
public static final String CONFIGURE_NOTIFICATION_GROUP_ID = "Configure Kotlin in Project";
|
||||||
|
|
||||||
protected NonConfiguredKotlinProjectNotification(Project project) {
|
protected NonConfiguredKotlinProjectNotification(Project project) {
|
||||||
super(project);
|
super(project);
|
||||||
|
|
||||||
|
NotificationsConfiguration.getNotificationsConfiguration().
|
||||||
|
register(CONFIGURE_NOTIFICATION_GROUP_ID, NotificationDisplayType.STICKY_BALLOON, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+2
-3
@@ -22,12 +22,11 @@ import com.intellij.notification.NotificationType
|
|||||||
import com.intellij.openapi.projectRoots.Sdk
|
import com.intellij.openapi.projectRoots.Sdk
|
||||||
import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil
|
import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil
|
||||||
import javax.swing.event.HyperlinkEvent
|
import javax.swing.event.HyperlinkEvent
|
||||||
|
import org.jetbrains.jet.plugin.configuration.ui.AbsentJdkAnnotationsComponent
|
||||||
private val GROUP_ID = "Configure Kotlin: absent sdk annotations"
|
|
||||||
|
|
||||||
public class AbsentSdkAnnotationsNotification(sdks: Collection<Sdk>, val title: String, val text: String) :
|
public class AbsentSdkAnnotationsNotification(sdks: Collection<Sdk>, val title: String, val text: String) :
|
||||||
Notification(
|
Notification(
|
||||||
GROUP_ID,
|
AbsentJdkAnnotationsComponent.EXTERNAL_ANNOTATIONS_GROUP_ID,
|
||||||
title, text,
|
title, text,
|
||||||
NotificationType.WARNING,
|
NotificationType.WARNING,
|
||||||
AbsentAnnotationsListener(sdks) // Workaround for KT-4086
|
AbsentAnnotationsListener(sdks) // Workaround for KT-4086
|
||||||
|
|||||||
+2
-2
@@ -26,12 +26,12 @@ import com.intellij.util.Function;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
|
import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
|
||||||
import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator;
|
import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator;
|
||||||
|
import org.jetbrains.jet.plugin.configuration.ui.NonConfiguredKotlinProjectNotification;
|
||||||
|
|
||||||
import javax.swing.event.HyperlinkEvent;
|
import javax.swing.event.HyperlinkEvent;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
public class ConfigureKotlinNotification extends Notification {
|
public class ConfigureKotlinNotification extends Notification {
|
||||||
private static final String GROUP_ID = "Configure Kotlin: balloon";
|
|
||||||
private static final String TITLE = "Configure Kotlin";
|
private static final String TITLE = "Configure Kotlin";
|
||||||
|
|
||||||
@NotNull private final String notificationText;
|
@NotNull private final String notificationText;
|
||||||
@@ -40,7 +40,7 @@ public class ConfigureKotlinNotification extends Notification {
|
|||||||
@NotNull final Project project,
|
@NotNull final Project project,
|
||||||
@NotNull String notificationText
|
@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
|
@Override
|
||||||
public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) {
|
public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) {
|
||||||
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
|
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
|
||||||
|
|||||||
Reference in New Issue
Block a user