878: Code refactoring

Author: bohdan-harniuk

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

@@ -16,8 +16,8 @@
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewUiComponentGridDialog;
 
-@SuppressWarnings({"PMD.OnlyOneReturn"})
 public class NewUiComponentGridAction extends AnAction {
+
     public static final String ACTION_NAME = "Magento 2 UI Component Grid";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 UI Component Grid";
 
@@ -41,18 +41,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;
         }
-
         NewUiComponentGridDialog.open(project, directory);
     }
 

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

@@ -79,6 +79,7 @@
         "PMD.GodClass"
 })
 public class NewUiComponentGridDialog extends AbstractDialog {
+
     private static final String ACTION_NAME = "Action Name";
     private static final String DATA_PROVIDER_CLASS_NAME = "Data Provider Class Name";
     private static final String DATA_PROVIDER_DIRECTORY = "Data Provider Directory";
@@ -91,25 +92,24 @@ public class NewUiComponentGridDialog extends AbstractDialog {
     private JButton buttonOK;
     private JButton buttonCancel;
 
-    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, NAME})
-    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, NAME})
-    private JTextField uiComponentName;
-
-    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, NAME})
-    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, NAME})
-    private JTextField idField;
-
     private JCheckBox addToolBar;
     private JCheckBox addBookmarksCheckBox;
     private JCheckBox addColumnsControlCheckBox;
     private JCheckBox addFullTextSearchCheckBox;
     private JCheckBox addListingFiltersCheckBox;
     private JCheckBox addListingPagingCheckBox;
-
     private FilteredComboBox collection;
     private FilteredComboBox dataProviderType;
     private FilteredComboBox areaSelect;
 
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, NAME})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, NAME})
+    private JTextField uiComponentName;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, NAME})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, NAME})
+    private JTextField idField;
+
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, DATA_PROVIDER_CLASS_NAME})
     @FieldValidation(rule = RuleRegistry.PHP_CLASS,
@@ -194,7 +194,10 @@ public class NewUiComponentGridDialog extends AbstractDialog {
      * @param project Project
      * @param directory PsiDirectory
      */
-    public NewUiComponentGridDialog(final Project project, final PsiDirectory directory) {
+    public NewUiComponentGridDialog(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         super();
         this.project = project;
         this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
@@ -244,7 +247,10 @@ public void windowClosing(final WindowEvent event) {
      * @param project Project
      * @param directory PsiDirectory
      */
-    public static void open(final Project project, final PsiDirectory directory) {
+    public static void open(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         final NewUiComponentGridDialog dialog = new NewUiComponentGridDialog(project, directory);
         dialog.pack();
         dialog.centerDialog(dialog);
@@ -312,8 +318,8 @@ private void onOK() {
             generateDataProviderClass();
             generateDataProviderDeclaration();
             generateUiComponentFile();
+            exit();
         }
-        exit();
     }
 
     private void setDefaultValues() {
@@ -352,7 +358,7 @@ private void generateUiComponentFile() {
      * Generate data provider class.
      */
     private void generateDataProviderClass() {
-        if (getDataProviderType().equals(UiComponentDataProviderFile.CUSTOM_TYPE)) {
+        if (UiComponentDataProviderFile.CUSTOM_TYPE.equals(getDataProviderType())) {
             final UiComponentDataProviderGenerator dataProviderGenerator;
             dataProviderGenerator = new UiComponentDataProviderGenerator(
                 getGridDataProviderData(),
@@ -367,7 +373,7 @@ private void generateDataProviderClass() {
      * Generate data provider declaration.
      */
     private void generateDataProviderDeclaration() {
-        if (getDataProviderType().equals(UiComponentDataProviderFile.COLLECTION_TYPE)) {
+        if (UiComponentDataProviderFile.COLLECTION_TYPE.equals(getDataProviderType())) {
             final DataProviderDeclarationGenerator dataProviderGenerator;
             dataProviderGenerator = new DataProviderDeclarationGenerator(
                 new DataProviderDeclarationData(
@@ -463,8 +469,8 @@ private void onAreaChange() {
     }
 
     private void onDataProviderTypeChange() {
-        final boolean visible = getDataProviderType().equals(
-                UiComponentDataProviderFile.COLLECTION_TYPE
+        final boolean visible = UiComponentDataProviderFile.COLLECTION_TYPE.equals(
+                getDataProviderType()
         );
 
         collection.setVisible(visible);
@@ -554,7 +560,7 @@ private String getDataProviderNamespace() {
     }
 
     private String getDataProviderClassFqn() {
-        if (!getDataProviderType().equals(UiComponentDataProviderFile.CUSTOM_TYPE)) {
+        if (!UiComponentDataProviderFile.CUSTOM_TYPE.equals(getDataProviderType())) {
             return UiComponentDataProviderFile.DEFAULT_DATA_PROVIDER;
         }
         return String.format(