Skip to content

Commit 692fd58

Browse files
authored
Merge pull request #2072 from piotrkwiecinski/fix-action-update-thread-deprecation
Fix action update thread deprecation
2 parents 93fed17 + a0fbecd commit 692fd58

28 files changed

+173
-0
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
66

77
## 5.2.0
88

9+
### Fixed
10+
11+
- Fixed action update thread deprecation [#2072](https://github.com/magento/magento2-phpstorm-plugin/pull/2072)
12+
- Fixed compatibility with 2024.1 [#2071](https://github.com/magento/magento2-phpstorm-plugin/pull/2071)
13+
914
## 5.1.0
1015

1116
### Fixed

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

Lines changed: 6 additions & 0 deletions
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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +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.ActionUpdateThread;
1213
import com.intellij.openapi.actionSystem.AnActionEvent;
1314
import com.intellij.openapi.actionSystem.DataContext;
1415
import com.intellij.openapi.actionSystem.DataKey;
@@ -70,6 +71,11 @@ public AbstractContextAction(
7071
this.moduleFile = moduleFile;
7172
}
7273

74+
@Override
75+
public @NotNull ActionUpdateThread getActionUpdateThread() {
76+
return ActionUpdateThread.BGT;
77+
}
78+
7379
@Override
7480
@SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
7581
public void update(final @NotNull AnActionEvent event) {

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

Lines changed: 6 additions & 0 deletions
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

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

66
package com.magento.idea.magento2plugin.actions.context.xml;
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.actionSystem.DataContext;
@@ -94,6 +95,11 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
9495
NewLayoutTemplateDialog.open(event.getProject(), targetDirectory);
9596
}
9697

98+
@Override
99+
public @NotNull ActionUpdateThread getActionUpdateThread() {
100+
return ActionUpdateThread.BGT;
101+
}
102+
97103
/**
98104
* Set is action available for event.
99105
*

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

Lines changed: 6 additions & 0 deletions
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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
910
import com.intellij.openapi.actionSystem.AnAction;
1011
import com.intellij.openapi.actionSystem.AnActionEvent;
1112
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -52,4 +53,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5253
public boolean isDumbAware() {
5354
return false;
5455
}
56+
57+
@Override
58+
public @NotNull ActionUpdateThread getActionUpdateThread() {
59+
return ActionUpdateThread.BGT;
60+
}
5561
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
910
import com.intellij.openapi.actionSystem.AnAction;
1011
import com.intellij.openapi.actionSystem.AnActionEvent;
1112
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -51,4 +52,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5152
public boolean isDumbAware() {
5253
return false;
5354
}
55+
56+
@Override
57+
public @NotNull ActionUpdateThread getActionUpdateThread() {
58+
return ActionUpdateThread.BGT;
59+
}
5460
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
910
import com.intellij.openapi.actionSystem.AnAction;
1011
import com.intellij.openapi.actionSystem.AnActionEvent;
1112
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -15,6 +16,7 @@
1516
import com.intellij.psi.PsiDirectory;
1617
import com.magento.idea.magento2plugin.MagentoIcons;
1718
import com.magento.idea.magento2plugin.actions.generation.dialog.NewControllerDialog;
19+
import org.jetbrains.annotations.NotNull;
1820

1921
public class NewControllerAction extends AnAction {
2022

@@ -54,4 +56,9 @@ public void actionPerformed(final AnActionEvent event) {
5456
public boolean isDumbAware() {
5557
return false;
5658
}
59+
60+
@Override
61+
public @NotNull ActionUpdateThread getActionUpdateThread() {
62+
return ActionUpdateThread.BGT;
63+
}
5764
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
910
import com.intellij.openapi.actionSystem.AnAction;
1011
import com.intellij.openapi.actionSystem.AnActionEvent;
1112
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -51,4 +52,9 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
5152
public boolean isDumbAware() {
5253
return false;
5354
}
55+
56+
@Override
57+
public @NotNull ActionUpdateThread getActionUpdateThread() {
58+
return ActionUpdateThread.BGT;
59+
}
5460
}

0 commit comments

Comments
 (0)