876: Code refactoring

Author: bohdan-harniuk

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

@@ -18,6 +18,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class NewMessageQueueAction extends AnAction {
+
     public static final String ACTION_NAME = "Magento 2 Message Queue";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Message Queue";
 
@@ -29,24 +30,23 @@ public NewMessageQueueAction() {
     }
 
     @Override
-    public void actionPerformed(@NotNull final AnActionEvent event) {
+    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);
+
         if (project == null) {
             return;
         }
-
         final PsiDirectory directory = view.getOrChooseDirectory();
+
         if (directory == null) {
             return;
         }
-
         NewMessageQueueDialog.open(project, directory);
     }
 

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

@@ -52,6 +52,7 @@
         "PMD.ExcessiveImports",
 })
 public class NewMessageQueueDialog extends AbstractDialog {
+
     private static final String TOPIC_NAME = "Topic Name";
     private static final String HANDLER_NAME = "Handler Name";
     private static final String HANDLER_TYPE = "Handler Type";
@@ -64,6 +65,8 @@ public class NewMessageQueueDialog extends AbstractDialog {
     private static final String BINDING_TOPIC = "Binding Topic";
 
     private JComboBox connectionName;
+    private final Project project;
+    private final String moduleName;
 
     /* TODO: Improve validation */
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
@@ -146,13 +149,16 @@ public class NewMessageQueueDialog extends AbstractDialog {
     private JLabel consumerNameLabel;//NOPMD
     private JLabel handlerDirectoryLabel;//NOPMD
 
-    private final Project project;
-    private final String moduleName;
-
     /**
      * Constructor.
+     *
+     * @param project Project
+     * @param directory PsiDirectory
      */
-    public NewMessageQueueDialog(final Project project, final PsiDirectory directory) {
+    public NewMessageQueueDialog(
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory
+    ) {
         super();
 
         this.project = project;
@@ -224,19 +230,20 @@ private void toggleConsumer() {
 
     /**
      * Opens the dialog window.
+     *
+     * @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 NewMessageQueueDialog dialog = new NewMessageQueueDialog(project, directory);
         dialog.pack();
         dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 
-    @Override
-    public void onCancel() {
-        dispose();
-    }
-
     private void onOK() {
         if (validateFormFields()) {
             generateCommunication();
@@ -248,8 +255,8 @@ private void onOK() {
             if (getConnectionName().equals(MessageQueueConnections.DB.getType())) {
                 generateConsumerClass();
             }
+            exit();
         }
-        exit();
     }
 
     private void generateCommunication() {