Merge branch '4.4.0-develop' of github.com:magento/magento2-phpstorm-plugin into 1152-bug-fix-uct-invalid-report-file-name-os-windows

Author: bohdan-harniuk

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

@@ -23,14 +23,14 @@
 import org.jetbrains.annotations.NotNull;
 
 public class NewModuleAction extends com.intellij.openapi.actionSystem.AnAction {
-    public static String actionName = "Magento 2 Module";
-    public static String actionDescription = "Create a new Magento 2 Module";
+    public static final String ACTION_NAME = "Magento 2 Module";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Module";
 
     /**
      * Constructor.
      */
     public NewModuleAction() {
-        super(actionName, actionDescription, MagentoIcons.MODULE);
+        super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
@@ -67,6 +67,10 @@ public boolean isDumbAware() {
     public void update(final AnActionEvent event) {
         final Project project = event.getData(PlatformDataKeys.PROJECT);
 
+        if (project == null) {
+            return;
+        }
+
         if (Settings.isEnabled(project)) {
             final String magentoPath = Settings.getMagentoPath(project);
             if (magentoPath == null) {

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

@@ -133,7 +133,7 @@ public NewModuleDialog(
         detectPackageName(initialBaseDir);
         setContentPane(contentPane);
         setModal(true);
-        setTitle(NewModuleAction.actionDescription);
+        setTitle(NewModuleAction.ACTION_DESCRIPTION);
         getRootPane().setDefaultButton(buttonOK);
         setLicenses();
         setModuleDependencies();
@@ -214,7 +214,7 @@ private PsiFile generateComposerJson() {
                 getModuleLicense(),
                 getModuleDependencies(),
                 true
-        ), project).generate(NewModuleAction.actionName);
+        ), project).generate(NewModuleAction.ACTION_NAME);
     }
 
     private PsiFile generateRegistrationPhp() {
@@ -223,7 +223,7 @@ private PsiFile generateRegistrationPhp() {
                     getModuleName(),
                     getBaseDir(),
                     true
-            ), project).generate(NewModuleAction.actionName);
+            ), project).generate(NewModuleAction.ACTION_NAME);
     }
 
     private void generateModuleXml() {
@@ -234,15 +234,15 @@ private void generateModuleXml() {
                 getBaseDir(),
                 getModuleDependencies(),
                 true
-        ), project).generate(NewModuleAction.actionName, true);
+        ), project).generate(NewModuleAction.ACTION_NAME, true);
     }
 
     private void generateReadmeMd() {
         new ModuleReadmeMdGenerator(new ModuleReadmeMdData(
                 getPackageName(),
                 getModuleName(),
                 getBaseDir()
-        ), project).generate(NewModuleAction.actionName);
+        ), project).generate(NewModuleAction.ACTION_NAME);
     }
 
     private PsiDirectory getBaseDir() {