Skip to content

Commit 0ecbee9

Browse files
authored
Add deprecation message for 2019.3 (#2162)
1 parent 1a5ff43 commit 0ecbee9

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "deprecation",
3+
"description" : "2019.3 support will be removed in the next release"
4+
}

jetbrains-core/src/software/aws/toolkits/jetbrains/core/notification/JetBrainsMinimumVersionChange.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33

44
package software.aws.toolkits.jetbrains.core.notification
55

6+
import com.intellij.notification.NotificationType
67
import com.intellij.openapi.application.ApplicationInfo
78
import com.intellij.openapi.application.ApplicationNamesInfo
89
import software.aws.toolkits.resources.message
910

1011
class JetBrainsMinimumVersionChange : NoticeType {
11-
override val id: String = "JetBrainsMinimumVersion_193"
12+
override val id: String = "JetBrainsMinimumVersion_201"
1213
private val noticeContents = NoticeContents(
1314
message("notice.title.jetbrains.minimum.version"),
1415
message(
1516
"notice.message.jetbrains.minimum.version",
1617
ApplicationInfo.getInstance().fullVersion,
1718
ApplicationNamesInfo.getInstance().fullProductName,
18-
"2019.3"
19+
"2020.1"
1920
)
2021
)
2122

@@ -31,16 +32,14 @@ class JetBrainsMinimumVersionChange : NoticeType {
3132
override fun isNotificationRequired(): Boolean {
3233
val appInfo = ApplicationInfo.getInstance()
3334
val majorVersion = appInfo.majorVersion.toIntOrNull()
34-
val minorVersion = appInfo.minorVersion.toFloatOrNull()
3535

3636
majorVersion?.let {
37-
minorVersion?.let {
38-
return majorVersion < 2019 || (majorVersion == 2019 && minorVersion < 3)
39-
}
37+
return majorVersion < 2020
4038
}
4139

4240
return true
4341
}
4442

4543
override fun getNoticeContents(): NoticeContents = noticeContents
44+
override fun getNoticeType(): NotificationType = NotificationType.WARNING
4645
}

jetbrains-core/src/software/aws/toolkits/jetbrains/core/notification/NoticeManager.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import com.intellij.notification.NotificationDisplayType
77
import com.intellij.notification.NotificationGroup
88
import com.intellij.notification.NotificationType
99
import com.intellij.notification.Notifications
10-
import com.intellij.openapi.actionSystem.AnAction
1110
import com.intellij.openapi.actionSystem.AnActionEvent
1211
import com.intellij.openapi.components.PersistentStateComponent
1312
import com.intellij.openapi.components.ServiceManager
1413
import com.intellij.openapi.components.State
1514
import com.intellij.openapi.components.Storage
15+
import com.intellij.openapi.project.DumbAwareAction
1616
import com.intellij.openapi.project.Project
17+
import org.jetbrains.annotations.TestOnly
1718
import software.aws.toolkits.resources.message
1819

1920
interface NoticeManager {
@@ -71,7 +72,7 @@ class DefaultNoticeManager :
7172
)
7273

7374
notification.addAction(
74-
object : AnAction(message("notice.suppress")) {
75+
object : DumbAwareAction(message("notice.suppress")) {
7576
override fun actionPerformed(e: AnActionEvent) {
7677
suppressNotification(notice)
7778
notification.hideBalloon()
@@ -86,6 +87,7 @@ class DefaultNoticeManager :
8687
internalState[notice.id] = NoticeState(notice.id, notice.getSuppressNotificationValue())
8788
}
8889

90+
@TestOnly
8991
fun resetAllNotifications() {
9092
internalState.clear()
9193
}

jetbrains-core/src/software/aws/toolkits/jetbrains/core/notification/NoticeStartupActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import com.intellij.openapi.startup.StartupActivity
1010

1111
class NoticeStartupActivity : StartupActivity, DumbAware {
1212
override fun runActivity(project: Project) {
13-
val noticeManager =
14-
ServiceManager.getService(NoticeManager::class.java)
13+
val noticeManager = ServiceManager.getService(NoticeManager::class.java)
1514

1615
val notices = noticeManager.getRequiredNotices(NoticeType.notices(), project)
1716
noticeManager.notify(notices, project)

jetbrains-core/src/software/aws/toolkits/jetbrains/core/notification/NoticeType.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package software.aws.toolkits.jetbrains.core.notification
55

6+
import com.intellij.notification.NotificationType
67
import com.intellij.openapi.extensions.ExtensionPointName
78

89
interface NoticeType {
@@ -19,6 +20,11 @@ interface NoticeType {
1920
// Notification Title/Message
2021
fun getNoticeContents(): NoticeContents
2122

23+
/*
24+
* Allow setting different warning levels depending on the type of notification
25+
*/
26+
open fun getNoticeType(): NotificationType = NotificationType.INFORMATION
27+
2228
companion object {
2329
val EP_NAME = ExtensionPointName<NoticeType>("aws.toolkit.notice")
2430

0 commit comments

Comments
 (0)