875: Code refactoring

Author: bohdan-harniuk

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

@@ -18,6 +18,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class NewDataModelAction extends AnAction {
+
     public static final String ACTION_NAME = "Magento 2 Data Model";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Data Model";
 
@@ -29,24 +30,23 @@ public NewDataModelAction() {
     }
 
     @Override
-    public void actionPerformed(@NotNull final AnActionEvent event) {
+    public void actionPerformed(final @NotNull AnActionEvent event) {
         final DataContext dataContext = event.getDataContext();
-
         final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+
         if (view == null) {
             return;
         }
-
         final Project project = CommonDataKeys.PROJECT.getData(dataContext);
+
         if (project == null) {
             return;
         }
-
         final PsiDirectory directory = view.getOrChooseDirectory();
+
         if (directory == null) {
             return;
         }
-
         NewDataModelDialog.open(project, directory);
     }
 

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

@@ -47,41 +47,43 @@
 import javax.swing.KeyStroke;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
+import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({
         "PMD.ExcessiveImports"
 })
 public class NewDataModelDialog extends AbstractDialog {
 
-    private final Project project;
-    private final String moduleName;
-    private final ValidatorBundle validatorBundle;
-    private final CommonBundle commonBundle;
-    private final List<String> properties;
-
     private static final String MODEL_NAME = "Model Name";
     private static final String PROPERTY_NAME = "Name";
     private static final String PROPERTY_TYPE = "Type";
     private static final String PROPERTY_ACTION = "Action";
     private static final String PROPERTY_DELETE = "Delete";
 
+    private final Project project;
+    private final String moduleName;
+    private final ValidatorBundle validatorBundle;
+    private final CommonBundle commonBundle;
+    private final List<String> properties;
+
     private JPanel contentPanel;
     private JButton buttonOK;
     private JButton buttonCancel;
     private JTable propertyTable;
     private JButton addProperty;
     private JCheckBox createInterface;
 
-    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
-            message = {NotEmptyRule.MESSAGE, MODEL_NAME})
-    @FieldValidation(rule = RuleRegistry.PHP_CLASS,
-            message = {PhpClassRule.MESSAGE, MODEL_NAME})
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, MODEL_NAME})
+    @FieldValidation(rule = RuleRegistry.PHP_CLASS, message = {PhpClassRule.MESSAGE, MODEL_NAME})
     private JTextField modelName;
 
     /**
      * Constructor.
      */
-    public NewDataModelDialog(final Project project, final PsiDirectory directory) {
+    public NewDataModelDialog(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         super();
 
         this.project = project;
@@ -122,7 +124,10 @@ public void windowClosing(final WindowEvent event) {
     /**
      * Opens the dialog window.
      */
-    public static void open(final Project project, final PsiDirectory directory) {
+    public static void open(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         final NewDataModelDialog dialog = new NewDataModelDialog(project, directory);
         dialog.pack();
         dialog.centerDialog(dialog);
@@ -145,8 +150,8 @@ private void onOK() {
                 generateDataModelInterfaceFile();
                 generatePreferenceForInterface();
             }
+            exit();
         }
-        exit();
     }
 
     @Override
@@ -190,11 +195,6 @@ protected boolean validateFormFields() {
         return valid;
     }
 
-    @Override
-    public void onCancel() {
-        dispose();
-    }
-
     /**
      * Generate DTO interface file.
      */