Added field validator annotations

Author: drpayyne

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

@@ -12,6 +12,11 @@
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleComposerJsonData;
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleRegistrationPhpData;
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleXmlData;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.AlphanumericRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.StartWithNumberOrCapitalLetterRule;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleComposerJsonGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleRegistrationPhpGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleXmlGenerator;
@@ -44,32 +49,64 @@
 
 @SuppressWarnings({"PMD.TooManyFields", "PMD.DataClass", "PMD.UnusedPrivateMethod"})
 public class NewModuleDialog extends AbstractDialog implements ListSelectionListener { //NOPMD
-    @NotNull
-    private final Project project;
-    @NotNull
-    private final PsiDirectory initialBaseDir;
-    private final CamelCaseToHyphen camelCaseToHyphen;
-    private JPanel contentPane;
-    private JButton buttonOK;
-    private JButton buttonCancel;
+    private static final String MODULE_DESCRIPTION = "module description";
+    private static final String MODULE_VERSION = "module version";
+    private static final String MODULE_NAME = "module name";
+    private static final String PACKAGE_NAME = "package name";
+
+    @FieldValidation(rule = RuleRegistry.ALPHANUMERIC,
+            message = {AlphanumericRule.MESSAGE, MODULE_NAME})
+    @FieldValidation(rule = RuleRegistry.START_WITH_NUMBER_OR_CAPITAL_LETTER,
+            message = {StartWithNumberOrCapitalLetterRule.MESSAGE, PACKAGE_NAME})
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, PACKAGE_NAME})
     private JTextField packageName;
-    private JLabel packageNameLabel;
+
+
+    /* TODO: module name !== package name */
+    @FieldValidation(rule = RuleRegistry.ALPHANUMERIC,
+            message = {AlphanumericRule.MESSAGE, MODULE_NAME})
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, MODULE_NAME})
+    @FieldValidation(rule = RuleRegistry.START_WITH_NUMBER_OR_CAPITAL_LETTER,
+            message = {StartWithNumberOrCapitalLetterRule.MESSAGE, MODULE_NAME})
     private JTextField moduleName;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, MODULE_DESCRIPTION})
     private JTextArea moduleDescription;
-    private final ModuleIndex moduleIndex;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, MODULE_VERSION})
     private JTextField moduleVersion;
-    private String detectedPackageName;
+
+    private JTextField moduleLicenseCustom;
+
     private JList moduleDependencies;
     private JList moduleLicense;
-    private JTextField moduleLicenseCustom;
-    private JLabel moduleLicenseLabel;//NOPMD
+
     private JScrollPane moduleLicenseScrollPanel;//NOPMD
+    private JScrollPane moduleDependenciesScrollPanel;//NOPMD
+
+    private JLabel moduleLicenseLabel;//NOPMD
     private JLabel moduleVersionLabel;//NOPMD
     private JLabel moduleDependenciesLabel;//NOPMD
-    private JScrollPane moduleDependenciesScrollPanel;//NOPMD
     private JLabel moduleDescriptionLabel;//NOPMD
     private JLabel moduleNameLabel;//NOPMD
+    private JLabel packageNameLabel;
 
+    private JPanel contentPane;
+
+    private JButton buttonOK;
+    private JButton buttonCancel;
+
+    @NotNull
+    private final Project project;
+    @NotNull
+    private final PsiDirectory initialBaseDir;
+    private String detectedPackageName;
+    private final ModuleIndex moduleIndex;
+    private final CamelCaseToHyphen camelCaseToHyphen;
     private static final String MAGENTO_BEFORE_DECLARATIVE_SCHEMA_VERSION = "2.2.11";
 
     /**