Merge branch '4.0.0-develop' into entity-web-api-generation

Author: Vitaliy

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();

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(),

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;
         }