869: Code refactoring

Author: bohdan-harniuk

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

@@ -15,8 +15,8 @@
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewCronGroupDialog;
 
-@SuppressWarnings({"PMD.OnlyOneReturn"})
 public class NewCronGroupAction extends com.intellij.openapi.actionSystem.AnAction {
+
     public static final String ACTION_NAME = "Magento 2 Cron Group";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Cron Group";
 
@@ -35,18 +35,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;
         }
-
         NewCronGroupDialog.open(project, directory);
     }
 

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

@@ -37,17 +37,16 @@
         "PMD.ExcessiveImports,"
 })
 public class NewCronGroupDialog extends AbstractDialog {
+
     private final String moduleName;
     private final Project project;
     private JPanel contentPanel;
     private JButton buttonOK;
     private JButton buttonCancel;
     private static final String NAME = "name";
 
-    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
-            message = {NotEmptyRule.MESSAGE, NAME})
-    @FieldValidation(rule = RuleRegistry.IDENTIFIER,
-            message = {IdentifierRule.MESSAGE, NAME})
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, NAME})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, NAME})
     private JTextField cronGroupName;
 
     private JSpinner scheduleGenerateEvery;
@@ -142,13 +141,8 @@ public static void open(final Project project, final PsiDirectory directory) {
     private void onOK() {
         if (validateFormFields()) {
             generateFile();
+            exit();
         }
-        exit();
-    }
-
-    @Override
-    protected void onCancel() {
-        dispose();
     }
 
     private void generateFile() {