Implementing the validation logic to all generators

Author: eduard13

resources/messages/magento2.properties

@@ -1,6 +1,8 @@
 validator.notEmpty={0} must not be empty
-validator.package.validPath=Please specify a valid Magento 2 installation path!
+validator.package.validPath=Please specify a valid Magento 2 installation path
 validator.alphaNumericCharacters={0} must contain letters and numbers only
 validator.startWithNumberOrCapitalLetter={0} must start from a number or a capital letter
 validator.directory.isNotValid={0} is not valid
-validator.module.noSuchModule=No such module {0}.
+validator.module.noSuchModule=No such module {0}
+validator.file.alreadyExists={0} already exists
+validator.file.cantBeCreated={0} can't be created

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java

@@ -17,6 +17,7 @@
 import com.magento.idea.magento2plugin.magento.files.PhpPreference;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.validators.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.io.File;
@@ -37,14 +38,21 @@ public ModuleBlockClassGenerator(@NotNull BlockFileData blockFileData, Project p
     }
 
     public PsiFile generate(String actionName) {
+        String errorTitle = "Error";
         PhpClass block = GetPhpClassByFQN.getInstance(project).execute(getBlockFqn());
+
         if (block != null) {
-            JOptionPane.showMessageDialog(null, "Block Class already exist!", "Error", JOptionPane.ERROR_MESSAGE);
+            String errorMessage = ValidatorBundle.message("validator.file.alreadyExists", "Block Class");
+            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
+
             return null;
         }
+
         PhpFile blockFile = createBlockClass(actionName);
         if (blockFile == null) {
-            JOptionPane.showMessageDialog(null, "Block Class cant be created!", "Error", JOptionPane.ERROR_MESSAGE);
+            String errorMessage = ValidatorBundle.message("validator.file.cantBeCreated", "Block Class");
+            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
+
             return null;
         }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java

@@ -25,6 +25,7 @@
 import com.magento.idea.magento2plugin.magento.packages.MagentoPhpClass;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.validators.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -58,12 +59,14 @@ public PsiFile generate(String actionName) {
             }
 
             if (graphQlResolverClass == null) {
+                String errorMessage = ValidatorBundle.message("validator.file.cantBeCreated", "GraphQL Resolver Class");
                 JOptionPane.showMessageDialog(
                         null,
-                        "GraphQL Resolver Class can't be created!",
+                        errorMessage,
                         "Error",
                         JOptionPane.ERROR_MESSAGE
                 );
+
                 return;
             }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java

@@ -16,6 +16,7 @@
 import com.magento.idea.magento2plugin.magento.files.ViewModelPhp;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.validators.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.io.File;
@@ -38,12 +39,17 @@ public ModuleViewModelClassGenerator(@NotNull ViewModelFileData viewModelFileDat
     public PsiFile generate(String actionName) {
         PhpClass block = GetPhpClassByFQN.getInstance(project).execute(getViewModelFqn());
         if (block != null) {
-            JOptionPane.showMessageDialog(null, "View Model already exist!", "Error", JOptionPane.ERROR_MESSAGE);
+            String errorMessage = ValidatorBundle.message("validator.file.alreadyExists", "View Model");
+            JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+
             return null;
         }
+
         PhpFile viewModelFile = createViewModelClass(actionName);
         if (viewModelFile == null) {
-            JOptionPane.showMessageDialog(null, "View Model can't be created!", "Error", JOptionPane.ERROR_MESSAGE);
+            String errorMessage = ValidatorBundle.message("validator.file.cantBeCreated", "View Model");
+            JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+
             return null;
         }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java

@@ -21,6 +21,7 @@
 import com.magento.idea.magento2plugin.magento.packages.MagentoPhpClass;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.validators.ValidatorBundle;
 import javax.swing.*;
 import java.io.File;
 import java.util.Properties;
@@ -54,12 +55,14 @@ public PsiFile generate(String actionName) {
             }
 
             if (observerClass == null) {
+                String errorMessage = ValidatorBundle.message("validator.file.cantBeCreated", "Observer Class");
                 JOptionPane.showMessageDialog(
                         null,
-                        "Observer Class can't be created!",
+                        errorMessage,
                         "Error",
                         JOptionPane.ERROR_MESSAGE
                 );
+
                 return;
             }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java

@@ -34,6 +34,7 @@
 import com.magento.idea.magento2plugin.magento.packages.MagentoPhpClass;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.validators.ValidatorBundle;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
@@ -72,7 +73,9 @@ public PsiFile generate(String actionName)
                 pluginClass = createPluginClass(actionName);
             }
             if (pluginClass == null) {
-                JOptionPane.showMessageDialog(null, "Plugin Class cant be created!", "Error", JOptionPane.ERROR_MESSAGE);
+                String errorMessage = ValidatorBundle.message("validator.file.cantBeCreated", "Plugin Class");
+                JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+
                 return;
             }
 
@@ -82,8 +85,10 @@ public PsiFile generate(String actionName)
             PluginMethodsGenerator pluginGenerator = new PluginMethodsGenerator(pluginClass, targetMethod, targetClassKey);
 
             PluginMethodData[] pluginMethodData = pluginGenerator.createPluginMethods(getPluginType());
-            if (checkIfMethodExist(pluginClass, pluginMethodData)){
-                JOptionPane.showMessageDialog(null, "Plugin method already exist!", "Error", JOptionPane.ERROR_MESSAGE);
+            if (checkIfMethodExist(pluginClass, pluginMethodData)) {
+                String errorMessage = ValidatorBundle.message("validator.file.alreadyExists", "Plugin Class");
+                JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+
                 return;
             }
 
@@ -116,6 +121,7 @@ public PsiFile generate(String actionName)
             }
             codeStyleSettings.restore();
         });
+
         return pluginFile[0];
     }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java

@@ -16,6 +16,7 @@
 import com.magento.idea.magento2plugin.magento.files.PhpPreference;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import com.magento.idea.magento2plugin.validators.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.io.File;
@@ -39,11 +40,15 @@ public PreferenceClassGenerator(@NotNull PreferenceFileData preferenceFileData,
 
     public PsiFile generate(String actionName) {
         PhpClass pluginClass = GetPhpClassByFQN.getInstance(project).execute(preferenceFileData.getPreferenceFqn());
+
         if (pluginClass == null) {
             pluginClass = createPluginClass(actionName);
         }
+
         if (pluginClass == null) {
-            JOptionPane.showMessageDialog(null, "Preference Class cant be created!", "Error", JOptionPane.ERROR_MESSAGE);
+            String errorMessage = ValidatorBundle.message("validator.file.cantBeCreated", "Preference Class");
+            JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+
             return null;
         }