Extracting the static text to Common Bundle

eduard13 · eduard13 · commit 49c76878c54e · 2020-04-23T07:51:02.000+03:00
diff --git a/resources/magento2/common.properties b/resources/magento2/common.properties
@@ -6,3 +6,4 @@ common.module.dependencies=Module Dependencies
 common.module.description=Module Description
 common.ok=OK
 common.cancel=Cancel
+common.error=Error
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java b/src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java
@@ -34,6 +34,7 @@
 import com.magento.idea.magento2plugin.actions.generation.util.CodeStyleSettings;
 import com.magento.idea.magento2plugin.actions.generation.util.CollectInsertedMethods;
 import com.magento.idea.magento2plugin.actions.generation.util.FillTextBufferWithPluginMethods;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.magento.files.Plugin;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
@@ -49,6 +50,7 @@
 public abstract class PluginGenerateMethodHandlerBase implements LanguageCodeInsightActionHandler {
     private CollectInsertedMethods collectInsertedMethods;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     public String type;
     public FillTextBufferWithPluginMethods fillTextBuffer;
 
@@ -57,6 +59,7 @@ public PluginGenerateMethodHandlerBase(Plugin.PluginType type) {
         this.fillTextBuffer = FillTextBufferWithPluginMethods.getInstance();
         this.collectInsertedMethods = CollectInsertedMethods.getInstance();
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean isValidFor(Editor editor, PsiFile file) {
@@ -165,7 +168,7 @@ protected PhpNamedElementNode[] targetMethods(@NotNull PhpClass phpClass, Key<Ob
 
             if (targetClass == null) {
                 String errorMessage = validatorBundle.message("validator.class.targetClassNotFound");
-                JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(null, errorMessage, commonBundle.message("common.error"), JOptionPane.ERROR_MESSAGE);
                 continue;
             }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java
@@ -14,6 +14,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.OverrideClassByAPreferenceDialogValidator;
 import com.magento.idea.magento2plugin.actions.generation.generator.PreferenceClassGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.PreferenceDiXmlGenerator;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
@@ -44,12 +45,14 @@ public class OverrideClassByAPreferenceDialog extends AbstractDialog {
     private JLabel inheritClassLabel;
     private JLabel preferenceDirectoryLabel;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
 
     public OverrideClassByAPreferenceDialog(@NotNull Project project, PhpClass targetClass) {
         this.project = project;
         this.targetClass = targetClass;
         this.validator = OverrideClassByAPreferenceDialogValidator.getInstance(this);
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
 
         setContentPane(contentPane);
         setModal(true);
@@ -127,7 +130,8 @@ private void onOK() {
         ), project).generate(OverrideClassByAPreferenceAction.ACTION_NAME);
         if (diXml == null) {
             String errorMessage = validatorBundle.message("validator.class.alreadyDeclared", "Preference");
-            JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+            String errorTitle = commonBundle.message("common.error");
+            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return;
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/CreateAPluginDialogValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/CreateAPluginDialogValidator.java
@@ -6,6 +6,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.magento.idea.magento2plugin.actions.generation.dialog.CreateAPluginDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
@@ -15,6 +16,7 @@
 public class CreateAPluginDialogValidator {
     private static CreateAPluginDialogValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private CreateAPluginDialog dialog;
 
     public static CreateAPluginDialogValidator getInstance(CreateAPluginDialog dialog) {
@@ -28,11 +30,12 @@ public static CreateAPluginDialogValidator getInstance(CreateAPluginDialog dialo
 
     public CreateAPluginDialogValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate(Project project)
     {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
         String pluginClassName = dialog.getPluginClassName();
 
         if (pluginClassName.length() == 0) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/CreateAnObserverDialogValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/CreateAnObserverDialogValidator.java
@@ -6,6 +6,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.magento.idea.magento2plugin.actions.generation.dialog.CreateAnObserverDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
@@ -15,6 +16,7 @@
 public class CreateAnObserverDialogValidator {
     private static CreateAnObserverDialogValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private CreateAnObserverDialog dialog;
 
     public static CreateAnObserverDialogValidator getInstance(CreateAnObserverDialog dialog) {
@@ -27,11 +29,12 @@ public static CreateAnObserverDialogValidator getInstance(CreateAnObserverDialog
 
     public CreateAnObserverDialogValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate(Project project)
     {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
         String observerClassName = dialog.getObserverClassName();
         if (observerClassName.length() == 0) {
             String errorMessage = validatorBundle.message("validator.notEmpty", "Observer Class Name");
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewBlockValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewBlockValidator.java
@@ -5,13 +5,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator;
 
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewBlockDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import javax.swing.*;
 
 public class NewBlockValidator {
     private static NewBlockValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private NewBlockDialog dialog;
 
     public static NewBlockValidator getInstance(NewBlockDialog dialog) {
@@ -24,11 +26,12 @@ public static NewBlockValidator getInstance(NewBlockDialog dialog) {
 
     public NewBlockValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate()
     {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
 
         String moduleName = dialog.getBlockName();
         if (moduleName.length() == 0) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewGraphQlResolverValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewGraphQlResolverValidator.java
@@ -5,6 +5,7 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator;
 
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewGraphQlResolverDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 
@@ -13,6 +14,8 @@
 public class NewGraphQlResolverValidator {
     private static NewGraphQlResolverValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
+
     private NewGraphQlResolverDialog dialog;
 
     public static NewGraphQlResolverValidator getInstance(NewGraphQlResolverDialog dialog) {
@@ -25,11 +28,12 @@ public static NewGraphQlResolverValidator getInstance(NewGraphQlResolverDialog d
 
     public NewGraphQlResolverValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate()
     {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
 
         String resolverClassName = dialog.getGraphQlResolverClassName();
         if (resolverClassName.length() == 0) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewModuleDialogValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewModuleDialogValidator.java
@@ -5,13 +5,15 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator;
 
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewModuleDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import javax.swing.*;
 
 public class NewModuleDialogValidator {
     private static NewModuleDialogValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private NewModuleDialog dialog;
 
     public static NewModuleDialogValidator getInstance(NewModuleDialog dialog) {
@@ -24,11 +26,12 @@ public static NewModuleDialogValidator getInstance(NewModuleDialog dialog) {
 
     public NewModuleDialogValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate()
     {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
         String packageName = dialog.getPackageName();
         if (packageName.length() == 0) {
             String errorMessage = validatorBundle.message("validator.notEmpty", "Package Name");
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewViewModelValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewViewModelValidator.java
@@ -5,6 +5,7 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator;
 
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewViewModelDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 
@@ -13,6 +14,7 @@
 public class NewViewModelValidator {
     private static NewViewModelValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private NewViewModelDialog dialog;
 
     public static NewViewModelValidator getInstance(NewViewModelDialog dialog) {
@@ -25,11 +27,12 @@ public static NewViewModelValidator getInstance(NewViewModelDialog dialog) {
 
     public NewViewModelValidator() {
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate()
     {
-        String errorTitle = "Error";
+        String errorTitle =commonBundle.message("common.error");
 
         String moduleName = dialog.getViewModelName();
         if (moduleName.length() == 0) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/OverrideClassByAPreferenceDialogValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/OverrideClassByAPreferenceDialogValidator.java
@@ -6,6 +6,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.magento.idea.magento2plugin.actions.generation.dialog.OverrideClassByAPreferenceDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
@@ -15,6 +16,7 @@
 public class OverrideClassByAPreferenceDialogValidator {
     private static OverrideClassByAPreferenceDialogValidator INSTANCE = null;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private OverrideClassByAPreferenceDialog dialog;
 
     public static OverrideClassByAPreferenceDialogValidator getInstance(OverrideClassByAPreferenceDialog dialog) {
@@ -27,11 +29,12 @@ public static OverrideClassByAPreferenceDialogValidator getInstance(OverrideClas
 
     public OverrideClassByAPreferenceDialogValidator() {
         validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public boolean validate(Project project)
     {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
         String preferenceClassName = dialog.getPreferenceClassName();
         if (preferenceClassName.length() == 0) {
             String errorMessage = validatorBundle.message("validator.notEmpty", "Preference Class Name");
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java
@@ -18,6 +18,7 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.util.Properties;
@@ -26,6 +27,7 @@ public class ModuleBlockClassGenerator extends FileGenerator {
     private BlockFileData blockFileData;
     private Project project;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private final DirectoryGenerator directoryGenerator;
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
 
@@ -36,10 +38,11 @@ public ModuleBlockClassGenerator(@NotNull BlockFileData blockFileData, Project p
         this.blockFileData = blockFileData;
         this.project = project;
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public PsiFile generate(String actionName) {
-        String errorTitle = "Error";
+        String errorTitle = commonBundle.message("common.error");
         PhpClass block = GetPhpClassByFQN.getInstance(project).execute(getBlockFqn());
 
         if (block != null) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java
@@ -20,6 +20,7 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.util.CodeStyleSettings;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.files.GraphQlResolverPhp;
 import com.magento.idea.magento2plugin.magento.packages.MagentoPhpClass;
@@ -34,6 +35,7 @@ public class ModuleGraphQlResolverClassGenerator extends FileGenerator {
     private GraphQlResolverFileData graphQlResolverFileData;
     private Project project;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private final DirectoryGenerator directoryGenerator;
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
     private final GetFirstClassOfFile getFirstClassOfFile;
@@ -46,6 +48,7 @@ public ModuleGraphQlResolverClassGenerator(@NotNull GraphQlResolverFileData grap
         this.graphQlResolverFileData = graphQlResolverFileData;
         this.project = project;
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     @Override
@@ -63,7 +66,7 @@ public PsiFile generate(String actionName) {
                 JOptionPane.showMessageDialog(
                         null,
                         errorMessage,
-                        "Error",
+                        commonBundle.message("common.error"),
                         JOptionPane.ERROR_MESSAGE
                 );
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java
@@ -12,6 +12,7 @@
 import com.magento.idea.magento2plugin.actions.generation.data.ViewModelFileData;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.files.ViewModelPhp;
 import com.magento.idea.magento2plugin.magento.packages.Package;
@@ -25,6 +26,7 @@ public class ModuleViewModelClassGenerator extends FileGenerator {
     private ViewModelFileData viewModelFileData;
     private Project project;
     private ValidatorBundle validatorBundle;
+    private CommonBundle commonBundle;
     private final DirectoryGenerator directoryGenerator;
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
 
@@ -35,21 +37,24 @@ public ModuleViewModelClassGenerator(@NotNull ViewModelFileData viewModelFileDat
         this.viewModelFileData = viewModelFileData;
         this.project = project;
         this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
     }
 
     public PsiFile generate(String actionName) {
         PhpClass block = GetPhpClassByFQN.getInstance(project).execute(getViewModelFqn());
+        String errorTitle = commonBundle.message("common.error");
+
         if (block != null) {
             String errorMessage = validatorBundle.message("validator.file.alreadyExists", "View Model");
-            JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return null;
         }
 
         PhpFile viewModelFile = createViewModelClass(actionName);
         if (viewModelFile == null) {
             String errorMessage = validatorBundle.message("validator.file.cantBeCreated", "View Model");
-            JOptionPane.showMessageDialog(null, errorMessage, "Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
 
             return null;
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java
diff --git a/src/com/magento/idea/magento2plugin/bundles/CommonBundle.java b/src/com/magento/idea/magento2plugin/bundles/CommonBundle.java
