Skip to content

Commit 6084b1e

Browse files
piotrkwiecinskipiotrkwiecinski
committed
fix actionUpdateThread.OLD_EDT deprecation
1 parent f3efc91 commit 6084b1e

27 files changed

+168
-83
lines changed

‎src/com/magento/idea/magento2plugin/actions/comparator/CompareTemplateAction.java

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.intellij.diff.DiffDialogHints;
99
import com.intellij.diff.DiffManager;
1010
import com.intellij.diff.chains.DiffRequestChain;
11+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1112
import com.intellij.openapi.actionSystem.AnAction;
1213
import com.intellij.openapi.actionSystem.AnActionEvent;
1314
import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -143,4 +144,9 @@ private void setStatus(final AnActionEvent event, final boolean status) {
143144
event.getPresentation().setVisible(status);
144145
event.getPresentation().setEnabled(status);
145146
}
147+
148+
@Override
149+
public @NotNull ActionUpdateThread getActionUpdateThread() {
150+
return ActionUpdateThread.BGT;
151+
}
146152
}

‎src/com/magento/idea/magento2plugin/actions/context/AbstractContextAction.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import com.intellij.ide.fileTemplates.FileTemplateManager;
1010
import com.intellij.ide.fileTemplates.actions.AttributesDefaults;
1111
import com.intellij.ide.fileTemplates.actions.CreateFromTemplateActionBase;
12-
import com.intellij.openapi.actionSystem.AnActionEvent;
13-
import com.intellij.openapi.actionSystem.DataContext;
14-
import com.intellij.openapi.actionSystem.DataKey;
15-
import com.intellij.openapi.actionSystem.LangDataKeys;
12+
import com.intellij.openapi.actionSystem.*;
1613
import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
1714
import com.intellij.openapi.project.Project;
1815
import com.intellij.psi.PsiDirectory;
@@ -70,6 +67,11 @@ public AbstractContextAction(
7067
this.moduleFile = moduleFile;
7168
}
7269

70+
@Override
71+
public @NotNull ActionUpdateThread getActionUpdateThread() {
72+
return ActionUpdateThread.BGT;
73+
}
74+
7375
@Override
7476
@SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
7577
public void update(final @NotNull AnActionEvent event) {

‎src/com/magento/idea/magento2plugin/actions/context/CustomGeneratorContextAction.java

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package com.magento.idea.magento2plugin.actions.context;
77

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.project.Project;
@@ -82,6 +83,11 @@ public void update(final @NotNull AnActionEvent event) {
8283
return file;
8384
}
8485

86+
@Override
87+
public @NotNull ActionUpdateThread getActionUpdateThread() {
88+
return ActionUpdateThread.BGT;
89+
}
90+
8591
/**
8692
* Implement check if an action should be shown in the context defined by the module,
8793
* target directory or target file.

‎src/com/magento/idea/magento2plugin/actions/context/xml/NewLayoutXmlAction.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55

66
package com.magento.idea.magento2plugin.actions.context.xml;
77

8-
import com.intellij.openapi.actionSystem.AnAction;
9-
import com.intellij.openapi.actionSystem.AnActionEvent;
10-
import com.intellij.openapi.actionSystem.DataContext;
11-
import com.intellij.openapi.actionSystem.LangDataKeys;
8+
import com.intellij.openapi.actionSystem.*;
129
import com.intellij.openapi.project.Project;
1310
import com.intellij.psi.PsiDirectory;
1411
import com.intellij.psi.PsiElement;
@@ -94,6 +91,11 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
9491
NewLayoutTemplateDialog.open(event.getProject(), targetDirectory);
9592
}
9693

94+
@Override
95+
public @NotNull ActionUpdateThread getActionUpdateThread() {
96+
return ActionUpdateThread.BGT;
97+
}
98+
9799
/**
98100
* Set is action available for event.
99101
*

‎src/com/magento/idea/magento2plugin/actions/generation/InjectConstructorArgumentAction.java

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package com.magento.idea.magento2plugin.actions.generation;
77

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.project.Project;
@@ -92,6 +93,11 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
9293
);
9394
}
9495

96+
@Override
97+
public @NotNull ActionUpdateThread getActionUpdateThread() {
98+
return ActionUpdateThread.BGT;
99+
}
100+
95101
/**
96102
* Set is action available for event.
97103
*

‎src/com/magento/idea/magento2plugin/actions/generation/NewBlockAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -52,4 +48,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5248
public boolean isDumbAware() {
5349
return false;
5450
}
51+
52+
@Override
53+
public @NotNull ActionUpdateThread getActionUpdateThread() {
54+
return ActionUpdateThread.BGT;
55+
}
5556
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewCLICommandAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -51,4 +47,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5147
public boolean isDumbAware() {
5248
return false;
5349
}
50+
51+
@Override
52+
public @NotNull ActionUpdateThread getActionUpdateThread() {
53+
return ActionUpdateThread.BGT;
54+
}
5455
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewControllerAction.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
1713
import com.magento.idea.magento2plugin.actions.generation.dialog.NewControllerDialog;
14+
import org.jetbrains.annotations.NotNull;
1815

1916
public class NewControllerAction extends AnAction {
2017

@@ -54,4 +51,9 @@ public void actionPerformed(final AnActionEvent event) {
5451
public boolean isDumbAware() {
5552
return false;
5653
}
54+
55+
@Override
56+
public @NotNull ActionUpdateThread getActionUpdateThread() {
57+
return ActionUpdateThread.BGT;
58+
}
5759
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewCronjobAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -51,4 +47,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5147
public boolean isDumbAware() {
5248
return false;
5349
}
50+
51+
@Override
52+
public @NotNull ActionUpdateThread getActionUpdateThread() {
53+
return ActionUpdateThread.BGT;
54+
}
5455
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewDbSchemaAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -54,4 +50,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5450
public boolean isDumbAware() {
5551
return false;
5652
}
53+
54+
@Override
55+
public @NotNull ActionUpdateThread getActionUpdateThread() {
56+
return ActionUpdateThread.BGT;
57+
}
5758
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewEmailTemplateAction.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
1713
import com.magento.idea.magento2plugin.actions.generation.dialog.NewEmailTemplateDialog;
14+
import org.jetbrains.annotations.NotNull;
1815

1916
public class NewEmailTemplateAction extends AnAction {
2017

@@ -53,4 +50,9 @@ public void actionPerformed(final AnActionEvent event) {
5350
public boolean isDumbAware() {
5451
return false;
5552
}
53+
54+
@Override
55+
public @NotNull ActionUpdateThread getActionUpdateThread() {
56+
return ActionUpdateThread.BGT;
57+
}
5658
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewEntityAction.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
1713
import com.magento.idea.magento2plugin.actions.generation.dialog.NewEntityDialog;
14+
import org.jetbrains.annotations.NotNull;
1815

1916
public class NewEntityAction extends AnAction {
2017
public static final String ACTION_NAME = "Magento 2 Entity";
@@ -53,4 +50,9 @@ public void actionPerformed(final AnActionEvent event) {
5350
public boolean isDumbAware() {
5451
return false;
5552
}
53+
54+
@Override
55+
public @NotNull ActionUpdateThread getActionUpdateThread() {
56+
return ActionUpdateThread.BGT;
57+
}
5658
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewGraphQlResolverAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -51,5 +47,10 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5147
public boolean isDumbAware() {
5248
return false;
5349
}
50+
51+
@Override
52+
public @NotNull ActionUpdateThread getActionUpdateThread() {
53+
return ActionUpdateThread.BGT;
54+
}
5455
}
5556

‎src/com/magento/idea/magento2plugin/actions/generation/NewMessageQueueAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -54,4 +50,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5450
public boolean isDumbAware() {
5551
return false;
5652
}
53+
54+
@Override
55+
public @NotNull ActionUpdateThread getActionUpdateThread() {
56+
return ActionUpdateThread.BGT;
57+
}
5758
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewModelsAction.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnAction;
10-
import com.intellij.openapi.actionSystem.AnActionEvent;
11-
import com.intellij.openapi.actionSystem.CommonDataKeys;
12-
import com.intellij.openapi.actionSystem.DataContext;
13-
import com.intellij.openapi.actionSystem.LangDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.magento.idea.magento2plugin.MagentoIcons;
1713
import com.magento.idea.magento2plugin.actions.generation.dialog.NewModelsDialog;
14+
import org.jetbrains.annotations.NotNull;
1815

1916
public class NewModelsAction extends AnAction {
2017

@@ -53,4 +50,9 @@ public void actionPerformed(final AnActionEvent event) {
5350
public boolean isDumbAware() {
5451
return false;
5552
}
53+
54+
@Override
55+
public @NotNull ActionUpdateThread getActionUpdateThread() {
56+
return ActionUpdateThread.BGT;
57+
}
5658
}

‎src/com/magento/idea/magento2plugin/actions/generation/NewModuleAction.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.AnActionEvent;
10-
import com.intellij.openapi.actionSystem.CommonDataKeys;
11-
import com.intellij.openapi.actionSystem.DataContext;
12-
import com.intellij.openapi.actionSystem.LangDataKeys;
13-
import com.intellij.openapi.actionSystem.PlatformDataKeys;
9+
import com.intellij.openapi.actionSystem.*;
1410
import com.intellij.openapi.project.Project;
1511
import com.intellij.psi.PsiDirectory;
1612
import com.intellij.psi.PsiElement;
@@ -111,4 +107,9 @@ public void update(final AnActionEvent event) {
111107

112108
event.getPresentation().setVisible(false);
113109
}
110+
111+
@Override
112+
public @NotNull ActionUpdateThread getActionUpdateThread() {
113+
return ActionUpdateThread.BGT;
114+
}
114115
}

0 commit comments

Comments
 (0)