879: Code refactoring

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/actions/generation/NewUiComponentFormAction.java

@@ -17,6 +17,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewUiComponentFormDialog;
 
 public class NewUiComponentFormAction extends AnAction {
+
     public static final String ACTION_NAME = "Magento 2 UI Component Form";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 UI Component Form";
 
@@ -35,17 +36,16 @@ public void actionPerformed(final AnActionEvent event) {
         if (view == null) {
             return;
         }
-
         final Project project = CommonDataKeys.PROJECT.getData(dataContext);
+
         if (project == null) {
             return;
         }
-
         final PsiDirectory directory = view.getOrChooseDirectory();
+
         if (directory == null) {
             return;
         }
-
         NewUiComponentFormDialog.open(project, directory);
     }
 

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

@@ -71,6 +71,7 @@
 import javax.swing.KeyStroke;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
+import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({
         "PMD.TooManyFields",
@@ -80,6 +81,25 @@
         "PMD.GodClass"
 })
 public class NewUiComponentFormDialog extends AbstractDialog {
+
+    private static final String VIEW_ACTION_NAME = "View Action Name";
+    private static final String SUBMIT_ACTION_NAME = "Submit Action Name";
+    private static final String DATA_PROVIDER_CLASS_NAME = "Data Provider Class Name";
+    private static final String DATA_PROVIDER_DIRECTORY = "Data Provider Directory";
+
+    private static final String CLASS_COLUMN = "Class";
+    private static final String DIRECTORY_COLUMN = "Directory";
+    private static final String TYPE_COLUMN = "Type";
+    private static final String LABEL_COLUMN = "Label";
+    private static final String SORT_ORDER_COLUMN = "Sort Order";
+    private static final String ACTION_COLUMN = "Action";
+    private static final String DELETE_COLUMN = "Delete";
+    private static final String NAME_COLUMN = "Name";
+    private static final String FIELDSET_COLUMN = "Fieldset";
+    private static final String FORM_ELEMENT_TYPE_COLUMN = "Form Element Type";
+    private static final String DATA_TYPE_COLUMN = "Data Type";
+    private static final String SOURCE_COLUMN = "Source";
+
     private final FormButtonsValidator formButtonsValidator;
     private final FormFieldsetsValidator formFieldsetsValidator;
     private final FormFieldsValidator formFieldsValidator;
@@ -90,11 +110,6 @@ public class NewUiComponentFormDialog extends AbstractDialog {
     private JButton buttonCancel;
     private FilteredComboBox formAreaSelect;
 
-    private static final String VIEW_ACTION_NAME = "View Action Name";
-    private static final String SUBMIT_ACTION_NAME = "Submit Action Name";
-    private static final String DATA_PROVIDER_CLASS_NAME = "Data Provider Class Name";
-    private static final String DATA_PROVIDER_DIRECTORY = "Data Provider Directory";
-
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, "Name"})
     @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, "Name"})
     private JTextField formName;
@@ -181,26 +196,16 @@ public class NewUiComponentFormDialog extends AbstractDialog {
     private JLabel dataProviderClassNameLabel;//NOPMD
     private JLabel dataProviderDirectoryLabel;//NOPMD
 
-    private static final String CLASS_COLUMN = "Class";
-    private static final String DIRECTORY_COLUMN = "Directory";
-    private static final String TYPE_COLUMN = "Type";
-    private static final String LABEL_COLUMN = "Label";
-    private static final String SORT_ORDER_COLUMN = "Sort Order";
-    private static final String ACTION_COLUMN = "Action";
-    private static final String DELETE_COLUMN = "Delete";
-    private static final String NAME_COLUMN = "Name";
-    private static final String FIELDSET_COLUMN = "Fieldset";
-    private static final String FORM_ELEMENT_TYPE_COLUMN = "Form Element Type";
-    private static final String DATA_TYPE_COLUMN = "Data Type";
-    private static final String SOURCE_COLUMN = "Source";
-
     /**
      * Open new dialog for adding new controller.
      *
      * @param project Project
      * @param directory PsiDirectory
      */
-    public NewUiComponentFormDialog(final Project project, final PsiDirectory directory) {
+    public NewUiComponentFormDialog(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         super();
         this.project = project;
         formButtonsValidator = new FormButtonsValidator(this);
@@ -396,7 +401,10 @@ public String getArea() {
      * @param project Project
      * @param directory PsiDirectory
      */
-    public static void open(final Project project, final PsiDirectory directory) {
+    public static void open(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         final NewUiComponentFormDialog dialog = new NewUiComponentFormDialog(project, directory);
         dialog.pack();
         dialog.centerDialog(dialog);
@@ -424,8 +432,8 @@ private void onOK() {
             generateLayoutFile();
             generateFormFile();
             generateAclXmlFile();
+            exit();
         }
-        exit();
     }
 
     /**
@@ -536,11 +544,6 @@ private void generateAclXmlFile() {
         ), getModuleName(), project).generate(NewUiComponentFormAction.ACTION_NAME, false);
     }
 
-    @Override
-    protected void onCancel() {
-        dispose();
-    }
-
     private List<String> getAreaList() {
         return new ArrayList<>(
                 Arrays.asList(