Skip to content

Commit 29d70d7

Browse files
authored
Fix ActionUpdateThread.OLD_EDT errors (#4162)
1 parent 95ae074 commit 29d70d7

File tree

37 files changed

+127
-4
lines changed

37 files changed

+127
-4
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix 'ActionUpdateThread.OLD_EDT' deprecation errors in 2024.1"
4+
}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilder.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.core.credentials
55

66
import com.intellij.icons.AllIcons
77
import com.intellij.openapi.actionSystem.ActionManager
8+
import com.intellij.openapi.actionSystem.ActionUpdateThread
89
import com.intellij.openapi.actionSystem.AnAction
910
import com.intellij.openapi.actionSystem.AnActionEvent
1011
import com.intellij.openapi.actionSystem.DefaultActionGroup
@@ -202,6 +203,8 @@ class ConnectionSettingsMenuBuilder private constructor() {
202203
private val selected: Boolean,
203204
private val onSelect: (T) -> Unit
204205
) : ToggleAction(title), DumbAware {
206+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
207+
205208
override fun isSelected(e: AnActionEvent): Boolean = selected
206209

207210
override fun setSelected(e: AnActionEvent, state: Boolean) {

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenus.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.core.credentials
55

66
import com.intellij.ide.DataManager
77
import com.intellij.openapi.actionSystem.ActionManager
8+
import com.intellij.openapi.actionSystem.ActionUpdateThread
89
import com.intellij.openapi.actionSystem.AnAction
910
import com.intellij.openapi.actionSystem.AnActionEvent
1011
import com.intellij.openapi.actionSystem.DataContext
@@ -169,6 +170,7 @@ open class ProjectLevelSettingSelector(private val project: Project, settingsMod
169170
}
170171

171172
class ToolkitConnectionComboBoxAction(private val project: Project) : ComboBoxAction(), DumbAware {
173+
172174
private val logic = object : ProjectLevelSettingSelector(project, CREDENTIALS) {
173175
override fun currentCredentials(): CredentialIdentifier? {
174176
val active = ToolkitConnectionManager.getInstance(project).activeConnection()
@@ -191,7 +193,9 @@ class ToolkitConnectionComboBoxAction(private val project: Project) : ComboBoxAc
191193
}
192194
}
193195

194-
override fun createPopupActionGroup(button: JComponent?) = logic.selectionMenuActions()
196+
override fun createPopupActionGroup(button: JComponent, dataContext: DataContext) = logic.selectionMenuActions()
197+
198+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
195199

196200
override fun update(e: AnActionEvent) {
197201
val active = ToolkitConnectionManager.getInstance(project).activeConnection()
@@ -209,7 +213,9 @@ class ToolkitConnectionComboBoxAction(private val project: Project) : ComboBoxAc
209213
}
210214

211215
class SettingsSelectorComboBoxAction(private val selectorLogic: SettingsSelectorLogicBase) : ComboBoxAction(), DumbAware {
212-
override fun createPopupActionGroup(button: JComponent?) = selectorLogic.selectionMenuActions()
216+
override fun createPopupActionGroup(button: JComponent, dataContext: DataContext) = selectorLogic.selectionMenuActions()
217+
218+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
213219

214220
override fun update(e: AnActionEvent) {
215221
updatePresentation(e.presentation)

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/RefreshConnectionAction.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package software.aws.toolkits.jetbrains.core.credentials
55

66
import com.intellij.icons.AllIcons
7+
import com.intellij.openapi.actionSystem.ActionUpdateThread
78
import com.intellij.openapi.actionSystem.AnAction
89
import com.intellij.openapi.actionSystem.AnActionEvent
910
import com.intellij.openapi.project.DumbAware
@@ -16,6 +17,9 @@ import software.aws.toolkits.telemetry.AwsTelemetry
1617
class RefreshConnectionAction(text: String = message("settings.refresh.description")) :
1718
AnAction(text, null, AllIcons.Actions.Refresh),
1819
DumbAware {
20+
21+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
22+
1923
override fun update(e: AnActionEvent) {
2024
val project = e.project ?: return
2125
e.presentation.isEnabled = when (val state = AwsConnectionManager.getInstance(project).connectionState) {

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/actions/MoreConnectionActionsAction.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.core.credentials.actions
66
import com.intellij.icons.AllIcons
77
import com.intellij.openapi.actionSystem.ActionGroup
88
import com.intellij.openapi.actionSystem.ActionManager
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread
910
import com.intellij.openapi.actionSystem.AnActionEvent
1011
import com.intellij.openapi.actionSystem.DefaultActionGroup
1112
import com.intellij.openapi.project.DumbAwareAction
@@ -19,6 +20,8 @@ import software.aws.toolkits.jetbrains.core.utils.buildList
1920
import software.aws.toolkits.resources.message
2021

2122
class MoreConnectionActionsAction : DumbAwareAction(AllIcons.Actions.MoreHorizontal) {
23+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
24+
2225
override fun update(e: AnActionEvent) {
2326
e.presentation.icon = if (lazyGetUnauthedBearerConnections().isEmpty()) AllIcons.Actions.MoreHorizontal else AllIcons.General.Warning
2427
}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/sono/SonoLogoutAction.kt

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

44
package software.aws.toolkits.jetbrains.core.credentials.sono
55

6+
import com.intellij.openapi.actionSystem.ActionUpdateThread
67
import com.intellij.openapi.actionSystem.AnActionEvent
78
import com.intellij.openapi.project.DumbAwareAction
89
import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
910

1011
class SonoLogoutAction : DumbAwareAction() {
12+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
13+
1114
override fun update(e: AnActionEvent) {
1215
e.presentation.isEnabledAndVisible = provider(e)?.supportsLogout() ?: false
1316
}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/experiments/ExperimentsActionGroup.kt

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

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

6+
import com.intellij.openapi.actionSystem.ActionUpdateThread
67
import com.intellij.openapi.actionSystem.AnAction
78
import com.intellij.openapi.actionSystem.AnActionEvent
89
import com.intellij.openapi.actionSystem.DefaultActionGroup
@@ -11,6 +12,8 @@ import com.intellij.openapi.project.DumbAware
1112
import software.aws.toolkits.resources.message
1213

1314
class ExperimentsActionGroup : DefaultActionGroup(message("aws.toolkit.experimental.title"), true), DumbAware {
15+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
16+
1417
override fun getChildren(e: AnActionEvent?): Array<AnAction> =
1518
ToolkitExperimentManager.visibleExperiments().map { EnableExperimentAction(it) }.toTypedArray()
1619

@@ -20,6 +23,8 @@ class ExperimentsActionGroup : DefaultActionGroup(message("aws.toolkit.experimen
2023
}
2124

2225
class EnableExperimentAction(private val experiment: ToolkitExperiment) : ToggleAction(experiment.title, experiment.description, null), DumbAware {
26+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
27+
2328
override fun isSelected(e: AnActionEvent): Boolean = experiment.isEnabled()
2429
override fun setSelected(e: AnActionEvent, state: Boolean) = experiment.setState(state)
2530
}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AbstractActions.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package software.aws.toolkits.jetbrains.core.explorer.actions
55

66
import com.intellij.openapi.actionSystem.ActionGroup
7+
import com.intellij.openapi.actionSystem.ActionUpdateThread
78
import com.intellij.openapi.actionSystem.AnAction
89
import com.intellij.openapi.actionSystem.AnActionEvent
910
import software.aws.toolkits.jetbrains.core.explorer.ExplorerDataKeys
@@ -68,6 +69,8 @@ abstract class ExplorerNodeAction<in T : AwsExplorerNode<*>> : AnAction {
6869
constructor() : super()
6970
constructor(text: String, description: String? = null, icon: Icon? = null) : super(text, description, icon)
7071

72+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
73+
7174
/**
7275
* Invoked periodically with the selected items of type [T].
7376
*

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/nodes/actions/UnpinConnectionAction.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33

44
package software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.actions
55

6+
import com.intellij.openapi.actionSystem.ActionUpdateThread
67
import com.intellij.openapi.actionSystem.AnAction
78
import com.intellij.openapi.actionSystem.AnActionEvent
8-
import com.intellij.openapi.actionSystem.UpdateInBackground
99
import com.intellij.openapi.project.DumbAware
1010
import software.aws.toolkits.jetbrains.core.credentials.pinning.ConnectionPinningManager
1111
import software.aws.toolkits.jetbrains.core.credentials.pinning.FeatureWithPinnedConnection
1212
import software.aws.toolkits.jetbrains.core.explorer.ExplorerTreeToolWindowDataKeys
1313
import software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.PinnedConnectionNode
1414
import software.aws.toolkits.resources.message
1515

16-
class UnpinConnectionAction : AnAction(), DumbAware, UpdateInBackground {
16+
class UnpinConnectionAction : AnAction(), DumbAware {
17+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
18+
1719
override fun update(e: AnActionEvent) {
1820
val project = e.project
1921
val feature = feature(e)

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/OpenAwsLocalTerminal.kt

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

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

6+
import com.intellij.openapi.actionSystem.ActionUpdateThread
67
import com.intellij.openapi.actionSystem.AnActionEvent
78
import com.intellij.openapi.actionSystem.LangDataKeys
89
import com.intellij.openapi.application.ApplicationManager
@@ -32,6 +33,7 @@ class OpenAwsLocalTerminal : DumbAwareAction(
3233
{ message("aws.terminal.action.tooltip") },
3334
TerminalIcons.OpenTerminal_13x13
3435
) {
36+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
3537

3638
override fun update(e: AnActionEvent) {
3739
if (AwsLocalTerminalExperiment.isEnabled()) {

0 commit comments

Comments
 (0)