Merge branch '2.1.0-develop' of github.com:magento/magento2-phpstorm-plugin into issue-297

� Conflicts:
�	src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/PhpDirectoryRule.java

Author: Vitaliy Boyko

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

@@ -10,14 +10,17 @@
 import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.actions.generation.NewBlockAction;
 import com.magento.idea.magento2plugin.actions.generation.data.BlockFileData;
-import com.magento.idea.magento2plugin.actions.generation.dialog.validator.NewBlockValidator;
+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.NotEmptyRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpDirectoryRule;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleBlockClassGenerator;
 import com.magento.idea.magento2plugin.magento.files.BlockPhp;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 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;
@@ -30,17 +33,28 @@
 import javax.swing.KeyStroke;
 
 public class NewBlockDialog extends AbstractDialog {
-    private final NewBlockValidator validator;
     private final PsiDirectory baseDir;
     private final String moduleName;
     private JPanel contentPanel;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JTextField blockName;
-    private JTextField blockParentDir;
     private final Project project;
     private JTextPane warning;//NOPMD
     private JRadioButton adminhtmlRadioButton;//NOPMD
+    private static final String NAME = "name";
+    private static final String DIRECTORY = "directory";
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, NAME})
+    @FieldValidation(rule = RuleRegistry.PHP_CLASS,
+            message = {PhpClassRule.MESSAGE, NAME})
+    private JTextField blockName;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, DIRECTORY})
+    @FieldValidation(rule = RuleRegistry.PHP_DIRECTORY,
+            message = {PhpDirectoryRule.MESSAGE, DIRECTORY})
+    private JTextField blockParentDir;
 
     /**
      * Constructor.
@@ -54,25 +68,15 @@ public NewBlockDialog(final Project project, final PsiDirectory directory) {
         this.project = project;
         this.baseDir = directory;
         this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
-        this.validator = NewBlockValidator.getInstance(this);
 
         setContentPane(contentPanel);
         setModal(true);
         setTitle("Create a new Magento 2 block..");
         getRootPane().setDefaultButton(buttonOK);
         suggestBlockDirectory();
 
-        buttonOK.addActionListener(new ActionListener() {
-            public void actionPerformed(final ActionEvent event) {
-                onOK();
-            }
-        });
-
-        buttonCancel.addActionListener(new ActionListener() {
-            public void actionPerformed(final ActionEvent event) {
-                onCancel();
-            }
-        });
+        buttonOK.addActionListener((final ActionEvent event) -> onOK());
+        buttonCancel.addActionListener((final ActionEvent event) -> onCancel());
 
         // call onCancel() when cross is clicked
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -83,12 +87,11 @@ public void windowClosing(final WindowEvent event) {
         });
 
         // call onCancel() on ESCAPE
-        contentPanel.registerKeyboardAction(new ActionListener() {
-            public void actionPerformed(final ActionEvent event) {
-                onCancel();
-            }
-        }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
-                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        contentPanel.registerKeyboardAction(
+                (final ActionEvent event) -> onCancel(),
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+        );
     }
 
     /**
@@ -105,7 +108,7 @@ public static void open(final Project project, final PsiDirectory directory) {
     }
 
     protected void onOK() {
-        if (!validator.validate()) {
+        if (!validateFormFields()) {
             return;
         }
         generateFile();
@@ -174,6 +177,7 @@ private String getNamespace() {
         return parts[0] + Package.fqnSeparator + parts[1] + Package.fqnSeparator + directoryPart;
     }
 
+    @Override
     public void onCancel() {
         // add your code here if necessary
         dispose();