From 3ac3a8b80e0beb67ee6b56f33a8ed8d0c1bd5c37 Mon Sep 17 00:00:00 2001
From: "andrii.zinkevych" <a.zinkevych@atwix.com>
Date: Wed, 14 Apr 2021 15:56:25 +0300
Subject: [PATCH] Fixed bugs tables editing

---
 .../generation/dialog/NewDataModelDialog.java        |  4 ++++
 .../actions/generation/dialog/NewDbSchemaDialog.java |  5 +++++
 .../generation/dialog/NewUiComponentFormDialog.java  | 12 ++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDataModelDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDataModelDialog.java
index 40d85a588..c5063e6fc 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDataModelDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDataModelDialog.java
@@ -131,6 +131,10 @@ public static void open(final Project project, final PsiDirectory directory) {
      * Proceed with generation.
      */
     private void onOK() {
+        if (propertyTable.isEditing()) {
+            propertyTable.getCellEditor().stopCellEditing();
+        }
+
         if (validateFormFields()) {
             formatProperties();
             generateDataModelFile();
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java
index f2dda4aa8..9965b523a 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java
@@ -129,9 +129,14 @@ public void windowClosing(final WindowEvent event) {
      * On buttonOK action listener.
      */
     private void onOK() {
+        if (columnsTable.isEditing()) {
+            columnsTable.getCellEditor().stopCellEditing();
+        }
+
         if (!validateFormFields()) {
             return;
         }
+
         final DbSchemaXmlData dbSchemaXmlData = new DbSchemaXmlData(
                 getTableName(),
                 getTableResource(),
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
index b1a4f0617..a1ea8ac0e 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
@@ -402,6 +402,18 @@ public static void open(final Project project, final PsiDirectory directory) {
     }
 
     private void onOK() {
+        if (formButtons.isEditing()) {
+            formButtons.getCellEditor().stopCellEditing();
+        }
+
+        if (fieldsets.isEditing()) {
+            fieldsets.getCellEditor().stopCellEditing();
+        }
+
+        if (fields.isEditing()) {
+            fields.getCellEditor().stopCellEditing();
+        }
+
         if (!validateFormFields()) {
             return;
         }