Merge pull request #337 from drpayyne/issue-303

Changed validator for OverrideClassByAPreferenceDialog

Author: coderimus

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

@@ -12,7 +12,11 @@
 import com.magento.idea.magento2plugin.actions.generation.OverrideClassByAPreferenceAction;
 import com.magento.idea.magento2plugin.actions.generation.data.PreferenceDiXmFileData;
 import com.magento.idea.magento2plugin.actions.generation.data.PreferenceFileData;
-import com.magento.idea.magento2plugin.actions.generation.dialog.validator.OverrideClassByAPreferenceDialogValidator;
+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.DirectoryRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
 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;
@@ -23,7 +27,6 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -44,23 +47,37 @@ public class OverrideClassByAPreferenceDialog extends AbstractDialog { //NOPMD
     @NotNull
     private final Project project;
     private final PhpClass targetClass;
-    @NotNull
-    private final OverrideClassByAPreferenceDialogValidator validator;
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JTextField preferenceClassName;
-    private JTextField preferenceDirectory;
     private final CommonBundle commonBundle;
     private final ValidatorBundle validatorBundle;
-    private FilteredComboBox preferenceModule;
     private JLabel inheritClassLabel;
     private JComboBox preferenceArea;
     private JCheckBox inheritClass;
     private JLabel preferenceAreaLabel;//NOPMD
     private JLabel selectPreferenceModule;//NOPMD
     private JLabel preferenceDirectoryLabel;//NOPMD
     private JLabel preferenceClassNameLabel;//NOPMD
+    private static final String MODULE = "target module";
+    private static final String CLASS = "class name";
+    private static final String DIRECTORY = "directory";
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, MODULE})
+    private FilteredComboBox preferenceModule;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, CLASS})
+    @FieldValidation(rule = RuleRegistry.PHP_CLASS,
+            message = {PhpClassRule.MESSAGE, CLASS})
+    private JTextField preferenceClassName;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, DIRECTORY})
+    @FieldValidation(rule = RuleRegistry.DIRECTORY,
+            message = {DirectoryRule.MESSAGE, DIRECTORY})
+    private JTextField preferenceDirectory;
 
     /**
      * Constructor.
@@ -76,7 +93,6 @@ public OverrideClassByAPreferenceDialog(
 
         this.project = project;
         this.targetClass = targetClass;
-        this.validator = OverrideClassByAPreferenceDialogValidator.getInstance(this);
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
 
@@ -91,19 +107,8 @@ public OverrideClassByAPreferenceDialog(
         suggestPreferenceClassName(targetClass);
         suggestPreferenceDirectory(targetClass);
 
-        buttonOK.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent event) {
-                onOK();
-            }
-        });
-
-        buttonCancel.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent event) {
-                onCancel();
-            }
-        });
+        buttonOK.addActionListener((final ActionEvent event) -> onOK());
+        buttonCancel.addActionListener((final ActionEvent event) -> onCancel());
 
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
@@ -113,13 +118,11 @@ public void windowClosing(final WindowEvent event) {
             }
         });
 
-        contentPane.registerKeyboardAction(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent event) {
-                onCancel();
-            }
-        }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
-                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        contentPane.registerKeyboardAction(
+                (final ActionEvent event) -> onCancel(),
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+        );
     }
 
     private void suggestPreferenceDirectory(final PhpClass targetClass) {
@@ -148,7 +151,7 @@ private void fillTargetAreaOptions() {
     }
 
     protected void onOK() {
-        if (!validator.validate(project)) {
+        if (!validateFormFields()) {
             return;
         }
         final PsiFile diXml = new PreferenceDiXmlGenerator(new PreferenceDiXmFileData(
@@ -184,7 +187,6 @@ protected void onOK() {
                 isInheritClass()
         ), project).generate(OverrideClassByAPreferenceAction.ACTION_NAME, true);
 
-
         this.setVisible(false);
     }