Use common bundle for the NewCLICommandValidator

Author: coderimus

resources/magento2/common.properties

@@ -28,9 +28,9 @@ common.classInheritance=Inherit Class
 common.license.proprietary=Proprietary
 common.description=Description
 common.cli.class.name=Class Name
-common.cli.cli.description=CLI Description
-common.cli.cli.name=CLI Name
 common.cli.parent.directory=Parent Directory
+common.cli.cli.description=CLI Command Description
+common.cli.cli.name=CLI Command Name
 common.cli.create.new.cli.command.title=Create a new Magento 2 CLI Command
 common.cli.generate.error=New CLI Command Generation Error
 common.cli.class.title=CLI Command Class

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

@@ -13,7 +13,6 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 
-
 import javax.swing.*;
 import java.awt.event.*;
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewCLICommandValidator.java

@@ -7,14 +7,15 @@
 import com.intellij.openapi.project.Project;
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewCLICommandDialog;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
-import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 
 import javax.swing.*;
 
 public class NewCLICommandValidator {
     private static NewCLICommandValidator INSTANCE = null;
-    private ValidatorBundle validatorBundle;
+    private final ValidatorBundle validatorBundle;
+    private final CommonBundle commonBundle;
 
     public static NewCLICommandValidator getInstance() {
         if (null == INSTANCE) {
@@ -26,6 +27,7 @@ public static NewCLICommandValidator getInstance() {
 
     public NewCLICommandValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate(Project project, NewCLICommandDialog dialog) {
@@ -36,61 +38,76 @@ public boolean validate(Project project, NewCLICommandDialog dialog) {
         String cliCommandDescription = dialog.getCLICommandDescription();
 
         if (cliCommandClassName.length() == 0) {
-            String errorMessage = validatorBundle.message("validator.notEmpty", "CLI Command Class Name");
+            String errorMessage = validatorBundle.message(
+                    "validator.notEmpty",
+                    this.commonBundle.message("common.cli.class.name")
+            );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
         if (!cliCommandClassName.matches(RegExUtil.ALPHANUMERIC)) {
             String errorMessage = validatorBundle.message(
-                "validator.alphaNumericCharacters",
-                "CLI Command Class Name"
+                    "validator.alphaNumericCharacters",
+                    this.commonBundle.message("common.cli.class.name")
             );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
         if (!Character.isUpperCase(cliCommandClassName.charAt(0)) && !Character.isDigit(cliCommandClassName.charAt(0))) {
             String errorMessage = validatorBundle.message(
-                "validator.startWithNumberOrCapitalLetter",
-                "CLI Command Class Name"
+                    "validator.startWithNumberOrCapitalLetter",
+                    this.commonBundle.message("common.cli.class.name")
             );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
 
         if (cliCommandParentDirectory.length() == 0) {
-            String errorMessage = validatorBundle.message("validator.notEmpty", "CLI Command Parent Directory");
+            String errorMessage = validatorBundle.message(
+                    "validator.notEmpty",
+                    this.commonBundle.message("common.cli.parent.directory")
+            );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
         if (!cliCommandParentDirectory.matches(RegExUtil.DIRECTORY)) {
             String errorMessage = validatorBundle.message(
                     "validator.directory.isNotValid",
-                    "CLI Command Parent Directory"
+                    this.commonBundle.message("common.cli.parent.directory")
             );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
 
         if (cliCommandName.length() == 0) {
-            String errorMessage = validatorBundle.message("validator.notEmpty", "CLI Command Name");
+            String errorMessage = validatorBundle.message(
+                    "validator.notEmpty",
+                    this.commonBundle.message("common.cli.cli.name")
+            );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
         if (!cliCommandName.matches(RegExUtil.CLI_COMMAND_NAME)) {
-            String errorMessage = validatorBundle.message("validator.identifier", "CLI Command Name");
+            String errorMessage = validatorBundle.message(
+                    "validator.identifier",
+                    this.commonBundle.message("common.cli.cli.name")
+            );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;
         }
 
         if (cliCommandDescription.length() == 0) {
-            String errorMessage = validatorBundle.message("validator.notEmpty", "CLI Command Description");
+            String errorMessage = validatorBundle.message(
+                    "validator.notEmpty",
+                    this.commonBundle.message("common.cli.cli.description")
+            );
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return false;