From 67492ad5dd7d74bb21ce09134b2f5988e79ab809 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 15 Jul 2015 22:05:53 +0300 Subject: [PATCH] Disable kotlin sdk annotation check #KT-7517 Fixed --- idea/src/META-INF/plugin.xml | 5 +---- .../idea/configuration/ConfigureKotlinNotificationManager.kt | 1 + .../idea/configuration/ui/AbsentJdkAnnotationsComponent.java | 4 ++++ .../ui/notifications/AbsentSdkAnnotationsNotification.kt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index d3edb629a19..c800597d000 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -34,11 +34,8 @@ org.jetbrains.kotlin.idea.ktSignature.KotlinSignatureInJavaMarkerUpdater - org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent + org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager - - org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager - diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt index 2964160cc6c..a0907626655 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt @@ -28,6 +28,7 @@ object ConfigureKotlinNotificationManager: KotlinSingleNotificationManager { fun notify(project: Project, sdks: Collection) { notify(project, AbsentSdkAnnotationsNotification(sdks, getNotificationTitle(sdks), getNotificationString(sdks))) diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java index ead2a3b9047..c24a1586937 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java @@ -46,6 +46,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +/** + * Deprecated after moving to platform types. + */ +@Deprecated public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent { public static final String EXTERNAL_ANNOTATIONS_GROUP_ID = "Kotlin External annotations"; private volatile Alarm notificationAlarm; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt index 13737e4f4a5..8794b72870f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt @@ -20,9 +20,9 @@ import com.intellij.notification.Notification import com.intellij.notification.NotificationListener import com.intellij.notification.NotificationType import com.intellij.openapi.projectRoots.Sdk +import org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtil import javax.swing.event.HyperlinkEvent -import org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent public class AbsentSdkAnnotationsNotification(sdks: Collection, title: String, val text: String) : Notification(