871: Code refactoring

Author: bohdan-harniuk

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

@@ -2,42 +2,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation;
 
 import com.intellij.ide.IdeView;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewGraphQlResolverDialog;
 import org.jetbrains.annotations.NotNull;
 
 public class NewGraphQlResolverAction extends AnAction {
-    public static String ACTION_NAME = "Magento 2 GraphQL Resolver";
-    public static String ACTION_DESCRIPTION = "Create a new Magento 2 GraphQL Resolver";
 
-    NewGraphQlResolverAction() {
+    public static final String ACTION_NAME = "Magento 2 GraphQL Resolver";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 GraphQL Resolver";
+
+    public NewGraphQlResolverAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
-    public void actionPerformed(@NotNull AnActionEvent e) {
-        DataContext dataContext = e.getDataContext();
+    public void actionPerformed(final @NotNull AnActionEvent event) {
+        DataContext dataContext = event.getDataContext();
         IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+
         if (view == null) {
             return;
         }
-
         Project project = CommonDataKeys.PROJECT.getData(dataContext);
+
         if (project == null) {
             return;
         }
-
         PsiDirectory directory = view.getOrChooseDirectory();
+
         if (directory == null) {
             return;
         }
-
         NewGraphQlResolverDialog.open(project, directory);
     }
 

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

@@ -29,8 +29,10 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
+import org.jetbrains.annotations.NotNull;
 
 public class NewGraphQlResolverDialog extends AbstractDialog {
+
     private final PsiDirectory baseDir;
     private final String moduleName;
     private JPanel contentPanel;
@@ -58,7 +60,10 @@ public class NewGraphQlResolverDialog extends AbstractDialog {
      * @param project Project
      * @param directory PsiDirectory
      */
-    public NewGraphQlResolverDialog(final Project project, final PsiDirectory directory) {
+    public NewGraphQlResolverDialog(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         super();
 
         this.project = project;
@@ -111,12 +116,12 @@ public static void open(final Project project, final PsiDirectory directory) {
     protected void onOK() {
         if (validateFormFields()) {
             generateFile();
+            exit();
         }
-        exit();
     }
 
-    private PsiFile generateFile() {
-        return new ModuleGraphQlResolverClassGenerator(new GraphQlResolverFileData(
+    private void generateFile() {
+        new ModuleGraphQlResolverClassGenerator(new GraphQlResolverFileData(
                 getGraphQlResolverDirectory(),
                 getGraphQlResolverClassName(),
                 getModuleName(),
@@ -182,10 +187,4 @@ private String getNamespace() {
     private String getGraphQlResolverClassFqn() {
         return getNamespace().concat(Package.fqnSeparator).concat(getGraphQlResolverClassName());
     }
-
-    @Override
-    public void onCancel() {
-        // add your code here if necessary
-        dispose();
-    }
 }