870: Code refactoring

Author: bohdan-harniuk

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

@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation;
 
 import com.intellij.ide.IdeView;
@@ -13,31 +14,32 @@
 import org.jetbrains.annotations.NotNull;
 
 public class NewViewModelAction extends AnAction {
-    public static String ACTION_NAME = "Magento 2 View Model";
-    public static String ACTION_DESCRIPTION = "Create a new Magento 2 View Model";
 
-    NewViewModelAction() {
+    public static final String ACTION_NAME = "Magento 2 View Model";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 View Model";
+
+    public NewViewModelAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
-    public void actionPerformed(@NotNull AnActionEvent e) {
-        DataContext dataContext = e.getDataContext();
-        IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+    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);
 
-        Project project = CommonDataKeys.PROJECT.getData(dataContext);
         if (project == null) {
             return;
         }
+        final PsiDirectory directory = view.getOrChooseDirectory();
 
-        PsiDirectory directory = view.getOrChooseDirectory();
         if (directory == null) {
             return;
         }
-
         NewViewModelDialog.open(project, directory);
     }
 

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

@@ -33,6 +33,7 @@
 import javax.swing.KeyStroke;
 
 public class NewViewModelDialog extends AbstractDialog {
+
     private static final String VIEW_MODEL_NAME = "View Model Name";
     private static final String VIEW_MODEL_DIR = "View Model Directory";
     private final PsiDirectory baseDir;
@@ -119,12 +120,12 @@ public static void open(final Project project, final PsiDirectory directory) {
     protected void onOK() {
         if (validateFormFields()) {
             generateFile();
+            exit();
         }
-        exit();
     }
 
-    private PsiFile generateFile() {
-        return new ModuleViewModelClassGenerator(new ViewModelFileData(
+    private void generateFile() {
+        new ModuleViewModelClassGenerator(new ViewModelFileData(
                 getViewModelDirectory(),
                 getViewModelName(),
                 getModuleName(),
@@ -185,10 +186,4 @@ private String getNamespace() {
         );
         return parts[0] + Package.fqnSeparator + parts[1] + Package.fqnSeparator + directoryPart;
     }
-
-    @Override
-    public void onCancel() {
-        // add your code here if necessary
-        dispose();
-    }
 }