Skip to content

Commit 0b5a218

Browse files
Merge pull request #1150 from SilinMykola/1142-fix-bug-illegal-argument-exception
1142 fix bug IllegalArgumentException in NewModuleAction class
2 parents 53f7725 + 568a70a commit 0b5a218

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import org.jetbrains.annotations.NotNull;
2424

2525
public class NewModuleAction extends com.intellij.openapi.actionSystem.AnAction {
26-
public static String actionName = "Magento 2 Module";
27-
public static String actionDescription = "Create a new Magento 2 Module";
26+
public static final String ACTION_NAME = "Magento 2 Module";
27+
public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Module";
2828

2929
/**
3030
* Constructor.
3131
*/
3232
public NewModuleAction() {
33-
super(actionName, actionDescription, MagentoIcons.MODULE);
33+
super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
3434
}
3535

3636
@Override
@@ -67,6 +67,10 @@ public boolean isDumbAware() {
6767
public void update(final AnActionEvent event) {
6868
final Project project = event.getData(PlatformDataKeys.PROJECT);
6969

70+
if (project == null) {
71+
return;
72+
}
73+
7074
if (Settings.isEnabled(project)) {
7175
final String magentoPath = Settings.getMagentoPath(project);
7276
if (magentoPath == null) {

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public NewModuleDialog(
133133
detectPackageName(initialBaseDir);
134134
setContentPane(contentPane);
135135
setModal(true);
136-
setTitle(NewModuleAction.actionDescription);
136+
setTitle(NewModuleAction.ACTION_DESCRIPTION);
137137
getRootPane().setDefaultButton(buttonOK);
138138
setLicenses();
139139
setModuleDependencies();
@@ -214,7 +214,7 @@ private PsiFile generateComposerJson() {
214214
getModuleLicense(),
215215
getModuleDependencies(),
216216
true
217-
), project).generate(NewModuleAction.actionName);
217+
), project).generate(NewModuleAction.ACTION_NAME);
218218
}
219219

220220
private PsiFile generateRegistrationPhp() {
@@ -223,7 +223,7 @@ private PsiFile generateRegistrationPhp() {
223223
getModuleName(),
224224
getBaseDir(),
225225
true
226-
), project).generate(NewModuleAction.actionName);
226+
), project).generate(NewModuleAction.ACTION_NAME);
227227
}
228228

229229
private void generateModuleXml() {
@@ -234,15 +234,15 @@ private void generateModuleXml() {
234234
getBaseDir(),
235235
getModuleDependencies(),
236236
true
237-
), project).generate(NewModuleAction.actionName, true);
237+
), project).generate(NewModuleAction.ACTION_NAME, true);
238238
}
239239

240240
private void generateReadmeMd() {
241241
new ModuleReadmeMdGenerator(new ModuleReadmeMdData(
242242
getPackageName(),
243243
getModuleName(),
244244
getBaseDir()
245-
), project).generate(NewModuleAction.actionName);
245+
), project).generate(NewModuleAction.ACTION_NAME);
246246
}
247247

248248
private PsiDirectory getBaseDir() {

0 commit comments

Comments
 (0)