872: Code refactoring

Author: bohdan-harniuk

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

@@ -17,33 +17,33 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewCLICommandDialog;
 import org.jetbrains.annotations.NotNull;
 
-@SuppressWarnings({"PMD.FieldNamingConventions", "PMD.OnlyOneReturn"})
 public class NewCLICommandAction extends AnAction {
-    public static String ACTION_NAME = "Magento 2 CLI Command";
-    public static String ACTION_DESCRIPTION = "Create a new Magento 2 CLI Command";
+
+    public static final String ACTION_NAME = "Magento 2 CLI Command";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 CLI Command";
 
     public NewCLICommandAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
-    public void actionPerformed(@NotNull final AnActionEvent event) {
+    public void actionPerformed(final @NotNull AnActionEvent event) {
         final DataContext context = event.getDataContext();
         final IdeView view = LangDataKeys.IDE_VIEW.getData(context);
+
         if (view == null) {
             return;
         }
-
         final Project project = CommonDataKeys.PROJECT.getData(context);
+
         if (project == null) {
             return;
         }
-
         final PsiDirectory directory = view.getOrChooseDirectory();
+
         if (directory == null) {
             return;
         }
-
         NewCLICommandDialog.open(project, directory);
     }
 

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

@@ -35,17 +35,20 @@
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
+import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({"PMD.MissingSerialVersionUID", "PMD.ExcessiveImports"})
 public class NewCLICommandDialog extends AbstractDialog {
-    private JPanel contentPane;
-    private JButton buttonCancel;
-    private JButton buttonOK;
+
     private static final String CLASS_NAME = "class name";
     private static final String PARENT_DIRECTORY = "parent directory";
     private static final String COMMAND_NAME = "command name";
     private static final String COMMAND_DESCRIPTION = "description";
 
+    private JPanel contentPane;
+    private JButton buttonCancel;
+    private JButton buttonOK;
+
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, CLASS_NAME})
     @FieldValidation(rule = RuleRegistry.PHP_CLASS,
@@ -79,7 +82,10 @@ public class NewCLICommandDialog extends AbstractDialog {
      * @param project Project
      * @param directory PsiDirectory
      */
-    public NewCLICommandDialog(final Project project, final PsiDirectory directory) {
+    public NewCLICommandDialog(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         super();
         this.project = project;
         this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
@@ -181,8 +187,8 @@ public String getCLICommandClassFqn() {
     private void onOK() {
         if (validateFormFields() && isPHPClassValid()) {
             this.generate();
+            exit();
         }
-        exit();
     }
 
     private Boolean isPHPClassValid() {