Skip to content

Commit 5852f9a

Browse files
authored
Merge pull request #544 from anzin/fix-bugs-tables-editing
Fixed bugs tables editing
2 parents 38f5c25 + 102fba2 commit 5852f9a

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ public static void open(final Project project, final PsiDirectory directory) {
131131
* Proceed with generation.
132132
*/
133133
private void onOK() {
134+
if (propertyTable.isEditing()) {
135+
propertyTable.getCellEditor().stopCellEditing();
136+
}
137+
134138
if (validateFormFields()) {
135139
formatProperties();
136140
generateDataModelFile();

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,14 @@ public void windowClosing(final WindowEvent event) {
129129
* On buttonOK action listener.
130130
*/
131131
private void onOK() {
132+
if (columnsTable.isEditing()) {
133+
columnsTable.getCellEditor().stopCellEditing();
134+
}
135+
132136
if (!validateFormFields()) {
133137
return;
134138
}
139+
135140
final DbSchemaXmlData dbSchemaXmlData = new DbSchemaXmlData(
136141
getTableName(),
137142
getTableResource(),

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,18 @@ public static void open(final Project project, final PsiDirectory directory) {
402402
}
403403

404404
private void onOK() {
405+
if (formButtons.isEditing()) {
406+
formButtons.getCellEditor().stopCellEditing();
407+
}
408+
409+
if (fieldsets.isEditing()) {
410+
fieldsets.getCellEditor().stopCellEditing();
411+
}
412+
413+
if (fields.isEditing()) {
414+
fields.getCellEditor().stopCellEditing();
415+
}
416+
405417
if (!validateFormFields()) {
406418
return;
407419
}

0 commit comments

Comments
 (0)